Consolidate RenderFrameObserver hierarchy (#8629)

The test RenderFrameObserver implementations, RenderFrameTestHelper
and ShellRenderFrameObserver, now inherit from CobaltRenderFrameObserver
instead of directly from content::RenderFrameObserver.

This change unifies the inheritance chain for Cobalt-specific
RenderFrameObservers, ensuring specialized observers build upon the
common Cobalt-specific observer. This simplifies the management of
renderer-side behavior and reduces potential inconsistencies. The
DidClearWindowObject override, previously specific to browser tests,
has been removed from CobaltRenderFrameObserver.

Bug: 446894035

Author: haozheng-cobalt

cobalt/renderer/cobalt_render_frame_observer.cc

@@ -20,10 +20,6 @@
 #include "starboard/extension/graphics.h"
 #include "starboard/system.h"
 
-#if defined(RUN_BROWSER_TESTS)
-#include "third_party/blink/public/web/web_testing_support.h"  // nogncheck
-#endif  // defined(RUN_BROWSER_TESTS)
-
 namespace cobalt {
 
 CobaltRenderFrameObserver::CobaltRenderFrameObserver(
@@ -36,20 +32,6 @@ void CobaltRenderFrameObserver::OnDestruct() {
   delete this;
 }
 
-#if defined(RUN_BROWSER_TESTS)
-void CobaltRenderFrameObserver::DidClearWindowObject() {
-  const auto& cmd = *base::CommandLine::ForCurrentProcess();
-  if (cmd.HasSwitch(switches::kExposeInternalsForTesting)) {
-    // The internals object is injected here so that window.internals is exposed
-    // to JavaScript at initial load of the web app, when the frame navigates
-    // from the initial empty document to the actual document. This approach is
-    // borrowed from content shell.
-    blink::WebTestingSupport::InjectInternalsObject(
-        render_frame()->GetWebFrame());
-  }
-}
-#endif  // defined(RUN_BROWSER_TESTS)
-
 void CobaltRenderFrameObserver::DidMeaningfulLayout(
     blink::WebMeaningfulLayout meaningful_layout) {
   if (meaningful_layout == blink::WebMeaningfulLayout::kVisuallyNonEmpty) {

cobalt/renderer/cobalt_render_frame_observer.h

@@ -39,13 +39,6 @@ class CobaltRenderFrameObserver : public content::RenderFrameObserver {
 
   // Overridden so that the observer has the same lifetime as the RenderFrame.
   void OnDestruct() override;
-
-#if defined(RUN_BROWSER_TESTS)
-  // Overridden for Cobalt-specific responses to this particular notification.
-  // See blink::WebLocalFrameClient.DidClearWindowObject() for details about
-  // when it's sent.
-  void DidClearWindowObject() override;
-#endif  // defined(RUN_BROWSER_TESTS)
 };
 
 }  // namespace cobalt

cobalt/testing/browser_tests/BUILD.gn

@@ -483,6 +483,7 @@ source_set("cobalt_browsertests_support") {
   public_deps = [
     ":cobalt_browsertests_support_mojom",
     ":shell_controller_mojom",
+    "//cobalt/renderer",
     "//components/custom_handlers:test_support",
     "//components/metrics:test_support",
     "//components/services/storage/test_api",

cobalt/testing/browser_tests/renderer/render_frame_test_helper.cc

@@ -43,7 +43,7 @@ void RenderFrameTestHelper::OnDestruct() {
 RenderFrameTestHelper::RenderFrameTestHelper(
     RenderFrame& render_frame,
     mojo::PendingReceiver<mojom::RenderFrameTestHelper> receiver)
-    : RenderFrameObserver(&render_frame),
+    : CobaltRenderFrameObserver(&render_frame),
       receiver_(this, std::move(receiver)) {}
 
 }  // namespace content

cobalt/testing/browser_tests/renderer/render_frame_test_helper.h

@@ -15,15 +15,15 @@
 #ifndef COBALT_TESTING_BROWSER_TESTS_RENDERER_RENDER_FRAME_TEST_HELPER_H_
 #define COBALT_TESTING_BROWSER_TESTS_RENDERER_RENDER_FRAME_TEST_HELPER_H_
 
+#include "cobalt/renderer/cobalt_render_frame_observer.h"
 #include "cobalt/testing/browser_tests/common/render_frame_test_helper.mojom.h"
-#include "content/public/renderer/render_frame_observer.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 
 namespace content {
 
 class RenderFrameTestHelper : public mojom::RenderFrameTestHelper,
-                              public RenderFrameObserver {
+                              public cobalt::CobaltRenderFrameObserver {
  public:
   // Creates a new instance that deletes itself when the RenderFrame is
   // destroyed.

cobalt/testing/browser_tests/renderer/shell_render_frame_observer.cc

@@ -19,13 +19,12 @@
 #include "cobalt/testing/browser_tests/common/shell_test_switches.h"
 #include "cobalt/testing/browser_tests/renderer/render_frame_test_helper.h"
 #include "content/public/renderer/render_frame.h"
-#include "content/public/renderer/render_frame_observer.h"
 #include "third_party/blink/public/web/web_testing_support.h"
 
 namespace content {
 
 ShellRenderFrameObserver::ShellRenderFrameObserver(RenderFrame* render_frame)
-    : RenderFrameObserver(render_frame) {}
+    : cobalt::CobaltRenderFrameObserver(render_frame) {}
 
 ShellRenderFrameObserver::~ShellRenderFrameObserver() = default;
 

cobalt/testing/browser_tests/renderer/shell_render_frame_observer.h

@@ -15,11 +15,11 @@
 #ifndef COBALT_TESTING_BROWSER_TESTS_RENDERER_SHELL_RENDER_FRAME_OBSERVER_H_
 #define COBALT_TESTING_BROWSER_TESTS_RENDERER_SHELL_RENDER_FRAME_OBSERVER_H_
 
-#include "content/public/renderer/render_frame_observer.h"
+#include "cobalt/renderer/cobalt_render_frame_observer.h"
 
 namespace content {
 
-class ShellRenderFrameObserver : public RenderFrameObserver {
+class ShellRenderFrameObserver : public cobalt::CobaltRenderFrameObserver {
  public:
   explicit ShellRenderFrameObserver(RenderFrame* frame);
   ~ShellRenderFrameObserver() override;