[mojo] Remove BindInterfaceRequestFromFrame overrides

This change removes ContentBrowserClient::BindInterfaceRequestFromFrame()
overrides from AwContentBrowserClient and ChromeContentBrowserClient.
This will allow us to remove
ContentBrowserClient::BindInterfaceRequestFromFrame() in a follow-up CL.

Bug: 1062403
Change-Id: Ic5c52f4e76fe964d547f24386366f5e3ac59f398
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134927Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Changwan Ryu <changwan@chromium.org>
Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756496}

android_webview/browser/aw_content_browser_client.cc

@@ -213,11 +213,6 @@ void AwContentsMessageFilter::OnSubFrameCreated(int parent_render_frame_id,
                                             child_render_frame_id);
 }
 
-// A dummy binder for mojo interface autofill::mojom::PasswordManagerDriver.
-void DummyBindPasswordManagerDriver(
-    mojo::PendingReceiver<autofill::mojom::PasswordManagerDriver> receiver,
-    content::RenderFrameHost* render_frame_host) {}
-
 void PassMojoCookieManagerToAwCookieManager(
     CookieManager* cookie_manager,
     const mojo::Remote<network::mojom::NetworkContext>& network_context) {
@@ -323,13 +318,6 @@ AwContentBrowserClient::AwContentBrowserClient(
   // take the PrefService owned by the creator as the Local State instead
   // of loading the JSON file from disk.
   DCHECK(aw_feature_list_creator_);
-
-  // Although WebView does not support password manager feature, renderer code
-  // could still request this interface, so we register a dummy binder which
-  // just drops the incoming request, to avoid the 'Failed to locate a binder
-  // for interface' error log..
-  frame_interfaces_.AddInterface(
-      base::BindRepeating(&DummyBindPasswordManagerDriver));
   sniff_file_urls_ = AwSettings::GetAllowSniffingFileUrls();
 }
 
@@ -692,14 +680,6 @@ AwContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
   return base::nullopt;
 }
 
-void AwContentBrowserClient::BindInterfaceRequestFromFrame(
-    content::RenderFrameHost* render_frame_host,
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle interface_pipe) {
-  frame_interfaces_.TryBindInterface(interface_name, &interface_pipe,
-                                     render_frame_host);
-}
-
 bool AwContentBrowserClient::BindAssociatedReceiverFromFrame(
     content::RenderFrameHost* render_frame_host,
     const std::string& interface_name,

android_webview/browser/aw_content_browser_client.h

@@ -18,7 +18,6 @@
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
 #include "storage/browser/quota/quota_settings.h"
 
 namespace content {
@@ -135,10 +134,6 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
   content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
   base::Optional<service_manager::Manifest> GetServiceManifestOverlay(
       base::StringPiece name) override;
-  void BindInterfaceRequestFromFrame(
-      content::RenderFrameHost* render_frame_host,
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle interface_pipe) override;
   bool BindAssociatedReceiverFromFrame(
       content::RenderFrameHost* render_frame_host,
       const std::string& interface_name,
@@ -246,9 +241,6 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
   // context.
   std::unique_ptr<AwBrowserContext> browser_context_;
 
-  service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>
-      frame_interfaces_;
-
   scoped_refptr<safe_browsing::UrlCheckerDelegate>
       safe_browsing_url_checker_delegate_;
 

chrome/browser/chrome_content_browser_client.cc

@@ -4117,12 +4117,6 @@ void ChromeContentBrowserClient::OverridePageVisibilityState(
   }
 }
 
-void ChromeContentBrowserClient::InitWebContextInterfaces() {
-  frame_interfaces_ = std::make_unique<service_manager::BinderRegistry>();
-  frame_interfaces_parameterized_ = std::make_unique<
-      service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>>();
-}
-
 void ChromeContentBrowserClient::InitNetworkContextsParentDirectory() {
   base::FilePath user_data_dir;
   base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);

chrome/browser/chrome_content_browser_client.h

@@ -29,7 +29,6 @@
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "ppapi/buildflags/buildflags.h"
 #include "services/network/public/mojom/network_context.mojom-forward.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
 
 class ChromeContentBrowserClientParts;
 class PrefRegistrySimple;
@@ -393,10 +392,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       content::RenderFrameHost* render_frame_host,
       service_manager::BinderMapWithContext<content::RenderFrameHost*>* map)
       override;
-  void BindInterfaceRequestFromFrame(
-      content::RenderFrameHost* render_frame_host,
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle interface_pipe) override;
   void BindCredentialManagerReceiver(
       content::RenderFrameHost* render_frame_host,
       mojo::PendingReceiver<blink::mojom::CredentialManager> receiver) override;
@@ -686,9 +681,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   friend class DisableWebRtcEncryptionFlagTest;
   friend class InProcessBrowserTest;
 
-  // Populates |frame_interfaces_| and |frame_interfaces_parameterized_|.
-  void InitWebContextInterfaces();
-
   // Initializes |network_contexts_parent_directory_| on the UI thread.
   void InitNetworkContextsParentDirectory();
 
@@ -723,11 +715,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   scoped_refptr<safe_browsing::UrlCheckerDelegate>
       safe_browsing_url_checker_delegate_;
 
-  std::unique_ptr<service_manager::BinderRegistry> frame_interfaces_;
-  std::unique_ptr<
-      service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>>
-      frame_interfaces_parameterized_;
-
   StartupData* startup_data_;
 
 #if !defined(OS_ANDROID)

chrome/browser/chrome_content_browser_client_receiver_bindings.cc

@@ -225,19 +225,6 @@ void ChromeContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
 #endif
 }
 
-void ChromeContentBrowserClient::BindInterfaceRequestFromFrame(
-    content::RenderFrameHost* render_frame_host,
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle interface_pipe) {
-  if (!frame_interfaces_ && !frame_interfaces_parameterized_) {
-    InitWebContextInterfaces();
-  }
-
-  if (!frame_interfaces_parameterized_->TryBindInterface(
-          interface_name, &interface_pipe, render_frame_host)) {
-    frame_interfaces_->TryBindInterface(interface_name, &interface_pipe);
-  }
-}
 bool ChromeContentBrowserClient::BindAssociatedReceiverFromFrame(
     content::RenderFrameHost* render_frame_host,
     const std::string& interface_name,