[mojo] Clean up OnInterfaceRequestFromFrame overrides

This change removes OnInterfaceRequestFromFrame overrides from the
following WebContentsObserver subclasses:

- AwRenderViewHostExt
- PaymentRequestBrowserTestBase
- ExtensionWebContentsObserver

These overrides are no longer used after the BrowserInterfaceBroker
migration.

Also marks WebContentsObserver::OnInterfaceRequestFromFrame
as deprecated.

Bug: 1035522
Change-Id: Ie870ecf28e27dd28af18480a38b01ab56927742f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2107700Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751431}

android_webview/browser/renderer_host/aw_render_view_host_ext.cc

@@ -16,7 +16,6 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
 
 namespace android_webview {
 
@@ -204,13 +203,6 @@ bool AwRenderViewHostExt::OnMessageReceived(
   return handled;
 }
 
-void AwRenderViewHostExt::OnInterfaceRequestFromFrame(
-    content::RenderFrameHost* render_frame_host,
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle* interface_pipe) {
-  registry_.TryBindInterface(interface_name, interface_pipe);
-}
-
 void AwRenderViewHostExt::OnDocumentHasImagesResponse(
     content::RenderFrameHost* render_frame_host,
     int msg_id,

android_webview/browser/renderer_host/aw_render_view_host_ext.h

@@ -11,7 +11,6 @@
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/sequence_checker.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/size.h"
@@ -90,10 +89,6 @@ class AwRenderViewHostExt : public content::WebContentsObserver {
   void OnPageScaleFactorChanged(float page_scale_factor) override;
   bool OnMessageReceived(const IPC::Message& message,
                          content::RenderFrameHost* render_frame_host) override;
-  void OnInterfaceRequestFromFrame(
-      content::RenderFrameHost* render_frame_host,
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle* interface_pipe) override;
 
   void OnDocumentHasImagesResponse(content::RenderFrameHost* render_frame_host,
                                    int msg_id,
@@ -121,8 +116,6 @@ class AwRenderViewHostExt : public content::WebContentsObserver {
 
   bool has_new_hit_test_data_;
 
-  service_manager::BinderRegistry registry_;
-
   // Some WebView users might want to show their own error pages / logic.
   bool will_suppress_error_page_ = false;
 

chrome/browser/ui/views/payments/payment_request_browsertest_base.cc

@@ -42,7 +42,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/dns/mock_host_resolver.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/events/base_event_utils.h"
@@ -259,13 +258,6 @@ void PaymentRequestBrowserTestBase::OnProcessingSpinnerHidden() {
     event_waiter_->OnEvent(DialogEvent::PROCESSING_SPINNER_HIDDEN);
 }
 
-void PaymentRequestBrowserTestBase::OnInterfaceRequestFromFrame(
-    content::RenderFrameHost* render_frame_host,
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle* interface_pipe) {
-  registry_.TryBindInterface(interface_name, interface_pipe, render_frame_host);
-}
-
 void PaymentRequestBrowserTestBase::InvokePaymentRequestUI() {
   ResetEventWaiterForDialogOpened();
 

chrome/browser/ui/views/payments/payment_request_browsertest_base.h

@@ -27,7 +27,6 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/blink/public/mojom/payments/payment_request.mojom-forward.h"
 
@@ -139,12 +138,6 @@ class PaymentRequestBrowserTestBase
   void OnProcessingSpinnerShown() override;
   void OnProcessingSpinnerHidden() override;
 
-  // content::WebContentsObserver implementation.
-  void OnInterfaceRequestFromFrame(
-      content::RenderFrameHost* render_frame_host,
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle* interface_pipe) override;
-
   // Will call JavaScript to invoke the PaymentRequest dialog and verify that
   // it's open and ready for input.
   void InvokePaymentRequestUI();
@@ -285,8 +278,6 @@ class PaymentRequestBrowserTestBase
   bool is_browser_window_active_ = true;
   bool skip_ui_for_basic_card_ = false;
 
-  service_manager::BinderRegistryWithArgs<content::RenderFrameHost*> registry_;
-
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestBrowserTestBase);
 };
 

content/public/browser/web_contents_observer.h

@@ -589,6 +589,8 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
   virtual void DidUpdateWebManifestURL(
       const base::Optional<GURL>& manifest_url) {}
 
+  // DEPRECATED. Please register interface binders with BrowserInterfaceBroker
+  // instead (see 'Interface-Brokers' section in //docs/mojo_and_services.md).
   // Called to give the embedder an opportunity to bind an interface request
   // from a frame. If the request can be bound, |interface_pipe| will be taken.
   virtual void OnInterfaceRequestFromFrame(

extensions/browser/extension_web_contents_observer.cc

@@ -176,14 +176,6 @@ void ExtensionWebContentsObserver::DidFinishNavigation(
   }
 }
 
-void ExtensionWebContentsObserver::OnInterfaceRequestFromFrame(
-    content::RenderFrameHost* render_frame_host,
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle* interface_pipe) {
-  DCHECK(initialized_);
-  registry_.TryBindInterface(interface_name, interface_pipe, render_frame_host);
-}
-
 void ExtensionWebContentsObserver::MediaPictureInPictureChanged(
     bool is_picture_in_picture) {
   DCHECK(initialized_);

extensions/browser/extension_web_contents_observer.h

@@ -11,7 +11,6 @@
 #include "base/macros.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/browser/extension_function_dispatcher.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
 
 namespace content {
 class BrowserContext;
@@ -95,11 +94,6 @@ class ExtensionWebContentsObserver
       content::NavigationHandle* navigation_handle) override;
   void MediaPictureInPictureChanged(bool is_picture_in_picture) override;
 
-  void OnInterfaceRequestFromFrame(
-      content::RenderFrameHost* render_frame_host,
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle* interface_pipe) override;
-
   // Subclasses should call this first before doing their own message handling.
   bool OnMessageReceived(const IPC::Message& message,
                          content::RenderFrameHost* render_frame_host) override;
@@ -126,8 +120,6 @@ class ExtensionWebContentsObserver
   // Whether this object has been initialized.
   bool initialized_;
 
-  service_manager::BinderRegistryWithArgs<content::RenderFrameHost*> registry_;
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionWebContentsObserver);
 };