[Chromecast] Remove FakeWebContentsObserver

It is no longer needed now that not binding
ApplicationMediaCapabilities no longer fails a DCHECK.

Bug: internal b/73180315
Test: cast_shell_browsertests
Change-Id: I9ff2cc20525959caf9ab7287f594234cac756233
Reviewed-on: https://chromium-review.googlesource.com/950126Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Reviewed-by: Stephen Lanham <slan@chromium.org>
Commit-Queue: James West <jameswest@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541255}

chromecast/browser/BUILD.gn

@@ -316,8 +316,6 @@ cast_source_set("test_support") {
   sources = [
     "test/cast_browser_test.cc",
     "test/cast_browser_test.h",
-    "test/fake_web_contents_observer.cc",
-    "test/fake_web_contents_observer.h",
   ]
 
   public_deps = [
@@ -328,7 +326,6 @@ cast_source_set("test_support") {
   deps = [
     "//base",
     "//chromecast/base",
-    "//chromecast/common:interfaces",
     "//content/public/browser",
     "//content/public/common",
     "//testing/gtest",

chromecast/browser/cast_media_blocker_browsertest.cc

@@ -10,7 +10,6 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromecast/browser/cast_media_blocker.h"
 #include "chromecast/browser/test/cast_browser_test.h"
-#include "chromecast/browser/test/fake_web_contents_observer.h"
 #include "chromecast/chromecast_buildflags.h"
 #include "content/public/browser/media_session.h"
 #include "content/public/browser/web_contents.h"
@@ -43,10 +42,7 @@ class CastMediaBlockerBrowserTest : public CastBrowserTest {
     GURL gurl = content::GetFileUrlWithQuery(
         media::GetTestDataFilePath("player.html"), query);
 
-    web_contents_ = CreateWebView();
-    web_contents_observer_ =
-        std::make_unique<FakeWebContentsObserver>(web_contents_);
-    NavigateToURL(gurl);
+    web_contents_ = NavigateToURL(gurl);
     WaitForLoadStop(web_contents_);
 
     blocker_ = std::make_unique<CastMediaBlocker>(
@@ -85,7 +81,6 @@ class CastMediaBlockerBrowserTest : public CastBrowserTest {
 
  private:
   content::WebContents* web_contents_;
-  std::unique_ptr<FakeWebContentsObserver> web_contents_observer_;
   std::unique_ptr<CastMediaBlocker> blocker_;
 
   DISALLOW_COPY_AND_ASSIGN(CastMediaBlockerBrowserTest);

chromecast/browser/test/cast_navigation_browsertest.cc

@@ -6,7 +6,6 @@
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromecast/browser/test/cast_browser_test.h"
-#include "chromecast/browser/test/fake_web_contents_observer.h"
 #include "chromecast/chromecast_buildflags.h"
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/test_data_util.h"
@@ -26,9 +25,8 @@ class CastNavigationBrowserTest : public CastBrowserTest {
   CastNavigationBrowserTest() {}
 
   void LoadAboutBlank() {
-    content::WebContents* web_contents = CreateWebView();
-    FakeWebContentsObserver web_contents_observer(web_contents);
-    NavigateToURL(GURL(url::kAboutBlankURL));
+    content::WebContents* web_contents =
+        NavigateToURL(GURL(url::kAboutBlankURL));
     content::TitleWatcher title_watcher(
         web_contents, base::ASCIIToUTF16(url::kAboutBlankURL));
     base::string16 result = title_watcher.WaitAndGetTitle();
@@ -60,9 +58,7 @@ class CastNavigationBrowserTest : public CastBrowserTest {
   }
 
   std::string RunTest(const GURL& gurl, const std::string& expected_title) {
-    content::WebContents* web_contents = CreateWebView();
-    FakeWebContentsObserver web_contents_observer(web_contents);
-    NavigateToURL(gurl);
+    content::WebContents* web_contents = NavigateToURL(gurl);
     content::TitleWatcher title_watcher(web_contents,
                                         base::ASCIIToUTF16(expected_title));
     title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16(kEnded));

chromecast/browser/test/fake_web_contents_observer.cc

-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chromecast/browser/test/fake_web_contents_observer.h"
-
-#include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "chromecast/common/application_media_capabilities.mojom.h"
-
-namespace chromecast {
-namespace shell {
-
-FakeWebContentsObserver::FakeWebContentsObserver(
-    content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents) {
-  registry_.AddInterface<mojom::ApplicationMediaCapabilities>(
-      base::BindRepeating(&ApplicationMediaCapabilities::AddBinding,
-                          base::Unretained(&app_media_capabilities_)));
-}
-
-FakeWebContentsObserver::~FakeWebContentsObserver() = default;
-
-void FakeWebContentsObserver::DidFinishNavigation(
-    content::NavigationHandle* /* navigation_handle */) {}
-
-void FakeWebContentsObserver::DidFirstVisuallyNonEmptyPaint() {}
-
-void FakeWebContentsObserver::RenderViewCreated(
-    content::RenderViewHost* /* render_view_host */) {}
-
-void FakeWebContentsObserver::RenderViewReady() {}
-
-void FakeWebContentsObserver::OnInterfaceRequestFromFrame(
-    content::RenderFrameHost* /* render_frame_host */,
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle* interface_pipe) {
-  registry_.TryBindInterface(interface_name, interface_pipe);
-}
-
-}  // namespace shell
-}  // namespace chromecast

chromecast/browser/test/fake_web_contents_observer.h

-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROMECAST_BROWSER_TEST_FAKE_WEB_CONTENTS_OBSERVER_H_
-#define CHROMECAST_BROWSER_TEST_FAKE_WEB_CONTENTS_OBSERVER_H_
-
-#include <string>
-
-#include "chromecast/browser/application_media_capabilities.h"
-#include "content/public/browser/web_contents_observer.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
-
-namespace content {
-class NavigationHandle;
-class RenderFrameHost;
-class RenderViewHost;
-class WebContents;
-}  // namespace content
-
-namespace chromecast {
-namespace shell {
-
-class FakeWebContentsObserver : public content::WebContentsObserver {
- public:
-  explicit FakeWebContentsObserver(content::WebContents* web_contents);
-  ~FakeWebContentsObserver() override;
-
- private:
-  // content::WebContentsObserver implementation:
-  void DidFinishNavigation(
-      content::NavigationHandle* navigation_handle) override;
-  void DidFirstVisuallyNonEmptyPaint() override;
-  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
-  void RenderViewReady() override;
-  void OnInterfaceRequestFromFrame(
-      content::RenderFrameHost* render_frame_host,
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle* interface_pipe) override;
-
-  service_manager::BinderRegistry registry_;
-  ApplicationMediaCapabilities app_media_capabilities_;
-
-  DISALLOW_COPY_AND_ASSIGN(FakeWebContentsObserver);
-};
-
-}  // namespace shell
-}  // namespace chromecast
-
-#endif  // CHROMECAST_BROWSER_TEST_FAKE_WEB_CONTENTS_OBSERVER_H_