chore: clean up forward declarations (#29904)

shell/renderer/browser_exposed_renderer_interfaces.h

@@ -7,11 +7,11 @@
 
 namespace mojo {
 class BinderMap;
-}  // namespace mojo
+}
 
 namespace electron {
 class RendererClientBase;
-}  // namespace electron
+}
 
 class ChromeContentRendererClient;
 

shell/renderer/electron_render_frame_observer.cc

@@ -21,6 +21,7 @@
 #include "shell/common/gin_helper/microtasks_scope.h"
 #include "shell/common/options_switches.h"
 #include "shell/common/world_ids.h"
+#include "shell/renderer/renderer_client_base.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
 #include "third_party/blink/public/platform/web_isolated_world_info.h"

shell/renderer/electron_render_frame_observer.h

@@ -9,15 +9,12 @@
 
 #include "content/public/renderer/render_frame_observer.h"
 #include "ipc/ipc_platform_file.h"
-#include "shell/renderer/renderer_client_base.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 
-namespace base {
-class ListValue;
-}
-
 namespace electron {
 
+class RendererClientBase;
+
 // Helper class to forward the messages to the client.
 class ElectronRenderFrameObserver : public content::RenderFrameObserver {
  public:

shell/renderer/electron_renderer_client.h

@@ -13,7 +13,7 @@
 
 namespace node {
 class Environment;
-}  // namespace node
+}
 
 namespace electron {
 

shell/renderer/electron_sandboxed_renderer_client.cc

@@ -11,6 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/process/process_handle.h"
+#include "base/process/process_metrics.h"
 #include "content/public/renderer/render_frame.h"
 #include "electron/buildflags/buildflags.h"
 #include "shell/common/api/electron_bindings.h"

shell/renderer/electron_sandboxed_renderer_client.h

@@ -8,9 +8,16 @@
 #include <set>
 #include <string>
 
-#include "base/process/process_metrics.h"
 #include "shell/renderer/renderer_client_base.h"
 
+namespace base {
+class ProcessMetrics;
+}
+
+namespace blink {
+class WebLocalFrame;
+}
+
 namespace electron {
 
 class ElectronSandboxedRendererClient : public RendererClientBase {

shell/renderer/guest_view_container.cc

@@ -10,6 +10,7 @@
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "content/public/renderer/render_frame.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace electron {

shell/renderer/guest_view_container.h

@@ -6,7 +6,10 @@
 #define SHELL_RENDERER_GUEST_VIEW_CONTAINER_H_
 
 #include "base/callback.h"
-#include "content/public/renderer/render_frame.h"
+
+namespace content {
+class RenderFrame;
+}
 
 namespace gfx {
 class Size;

shell/renderer/renderer_client_base.cc

@@ -41,6 +41,7 @@
 #include "third_party/blink/public/web/blink.h"
 #include "third_party/blink/public/web/web_custom_element.h"  // NOLINT(build/include_alpha)
 #include "third_party/blink/public/web/web_frame_widget.h"
+#include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_plugin_params.h"
 #include "third_party/blink/public/web/web_script_source.h"
 #include "third_party/blink/public/web/web_security_policy.h"

shell/renderer/renderer_client_base.h

@@ -13,7 +13,6 @@
 #include "electron/buildflags/buildflags.h"
 #include "printing/buildflags/buildflags.h"
 #include "shell/common/gin_helper/dictionary.h"
-#include "third_party/blink/public/web/web_local_frame.h"
 // In SHARED_INTERMEDIATE_DIR.
 #include "widevine_cdm_version.h"  // NOLINT(build/include_directory)
 
@@ -32,19 +31,18 @@
 class SpellCheck;
 #endif
 
+namespace blink {
+class WebLocalFrame;
+}
+
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
 namespace extensions {
 class ExtensionsClient;
 }
-namespace content {
-struct WebPluginInfo;
-}
 #endif
 
 namespace electron {
 
-class ElectronApiServiceImpl;
-
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
 class ElectronExtensionsRendererClient;
 #endif