Remove most remaining ConnectionFilter references

This removes most remaining references to ConnectionFilter and its
related headers. Any actual usage here is replaced with use of the
ChildProcess API in conjunction with a BinderMap.

Also deletes common_browser_interfaces.cc/h which haven't actually
been built for some time now.

Bug: 977637
Change-Id: Iaff4abfa569414c4f143292ae32dec2beb853c51
Tbr: boliu@chromium.org
Tbr: yucliu@chromium.org
Tbr: rouslan@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1910846
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715738}

android_webview/common/aw_content_client.cc

@@ -18,6 +18,7 @@
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_util.h"
 #include "ipc/ipc_message.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -77,18 +78,21 @@ media::MediaDrmBridgeClient* AwContentClient::GetMediaDrmBridgeClient() {
       AwResource::GetConfigKeySystemUuidMapping());
 }
 
-void AwContentClient::BindChildProcessInterface(
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle* receiving_handle) {
+void AwContentClient::ExposeInterfacesToBrowser(
+    scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+    mojo::BinderMap* binders) {
   // This creates a process-wide heap_profiling::ProfilingClient that listens
   // for requests from the HeapProfilingService to start profiling the current
   // process.
-  static base::NoDestructor<heap_profiling::ProfilingClient> profiling_client;
-  if (interface_name == heap_profiling::ProfilingClient::Name_) {
-    profiling_client->BindToInterface(
-        mojo::PendingReceiver<heap_profiling::mojom::ProfilingClient>(
-            std::move(*receiving_handle)));
-  }
+  binders->Add(
+      base::BindRepeating(
+          [](mojo::PendingReceiver<heap_profiling::mojom::ProfilingClient>
+                 receiver) {
+            static base::NoDestructor<heap_profiling::ProfilingClient>
+                profiling_client;
+            profiling_client->BindToInterface(std::move(receiver));
+          }),
+      io_task_runner);
 }
 
 }  // namespace android_webview

android_webview/common/aw_content_client.h

@@ -27,9 +27,9 @@ class AwContentClient : public content::ContentClient {
   void SetGpuInfo(const gpu::GPUInfo& gpu_info) override;
   bool UsingSynchronousCompositing() override;
   media::MediaDrmBridgeClient* GetMediaDrmBridgeClient() override;
-  void BindChildProcessInterface(
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle* receiving_handle) override;
+  void ExposeInterfacesToBrowser(
+      scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+      mojo::BinderMap* binders) override;
 
   const std::string& gpu_fingerprint() const { return gpu_fingerprint_; }
 

chrome/common/chrome_content_client.cc

@@ -53,6 +53,7 @@
 #include "media/base/media_switches.h"
 #include "media/base/video_codecs.h"
 #include "media/media_buildflags.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "net/http/http_util.h"
 #include "pdf/buildflags.h"
@@ -839,13 +840,16 @@ media::MediaDrmBridgeClient* ChromeContentClient::GetMediaDrmBridgeClient() {
 }
 #endif  // OS_ANDROID
 
-void ChromeContentClient::BindChildProcessInterface(
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle* receiving_handle) {
-  static base::NoDestructor<heap_profiling::ProfilingClient> profiling_client;
-  if (interface_name == heap_profiling::ProfilingClient::Name_) {
-    profiling_client->BindToInterface(
-        mojo::PendingReceiver<heap_profiling::mojom::ProfilingClient>(
-            std::move(*receiving_handle)));
-  }
+void ChromeContentClient::ExposeInterfacesToBrowser(
+    scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+    mojo::BinderMap* binders) {
+  binders->Add(
+      base::BindRepeating(
+          [](mojo::PendingReceiver<heap_profiling::mojom::ProfilingClient>
+                 receiver) {
+            static base::NoDestructor<heap_profiling::ProfilingClient>
+                profiling_client;
+            profiling_client->BindToInterface(std::move(receiver));
+          }),
+      io_task_runner);
 }

chrome/common/chrome_content_client.h

@@ -102,9 +102,9 @@ class ChromeContentClient : public content::ContentClient {
   media::MediaDrmBridgeClient* GetMediaDrmBridgeClient() override;
 #endif  // OS_ANDROID
 
-  void BindChildProcessInterface(
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle* receiving_handle) override;
+  void ExposeInterfacesToBrowser(
+      scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+      mojo::BinderMap* binders) override;
 
  private:
   // Used to lock when |origin_trial_policy_| is initialized.

chromecast/common/cast_content_client.cc

@@ -15,6 +15,7 @@
 #include "chromecast/base/version.h"
 #include "chromecast/chromecast_buildflags.h"
 #include "content/public/common/user_agent.h"
+#include "mojo/public/cpp/bindings/binder_map.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/url_util.h"
@@ -143,16 +144,19 @@ gfx::Image& CastContentClient::GetNativeImageNamed(int resource_id) {
 }
 #endif  // OS_ANDROID
 
-void CastContentClient::BindChildProcessInterface(
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle* receiving_handle) {
+void CastContentClient::ExposeInterfacesToBrowser(
+    scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+    mojo::BinderMap* binders) {
 #if !defined(OS_FUCHSIA)
-  static base::NoDestructor<heap_profiling::ProfilingClient> profiling_client;
-  if (interface_name == heap_profiling::ProfilingClient::Name_) {
-    profiling_client->BindToInterface(
-        mojo::PendingReceiver<heap_profiling::mojom::ProfilingClient>(
-            std::move(*receiving_handle)));
-  }
+  binders->Add(
+      base::BindRepeating(
+          [](mojo::PendingReceiver<heap_profiling::mojom::ProfilingClient>
+                 receiver) {
+            static base::NoDestructor<heap_profiling::ProfilingClient>
+                profiling_client;
+            profiling_client->BindToInterface(std::move(receiver));
+          }),
+      io_task_runner);
 #endif  // !defined(OS_FUCHSIA)
 }
 

chromecast/common/cast_content_client.h

@@ -29,9 +29,9 @@ class CastContentClient : public content::ContentClient {
 #if defined(OS_ANDROID)
   ::media::MediaDrmBridgeClient* GetMediaDrmBridgeClient() override;
 #endif  // OS_ANDROID
-  void BindChildProcessInterface(
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle* receiving_handle) override;
+  void ExposeInterfacesToBrowser(
+      scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+      mojo::BinderMap* binders) override;
 
  private:
   GURL last_active_url_;

components/spellcheck/renderer/spellcheck.cc

@@ -25,8 +25,6 @@
 #include "components/spellcheck/renderer/spellcheck_language.h"
 #include "components/spellcheck/renderer/spellcheck_provider.h"
 #include "components/spellcheck/spellcheck_buildflags.h"
-#include "content/public/common/service_manager_connection.h"
-#include "content/public/common/simple_connection_filter.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_frame_visitor.h"
 #include "content/public/renderer/render_thread.h"

content/browser/browser_child_process_host_impl.cc

@@ -46,7 +46,6 @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_coordinator_service.h"
 #include "content/public/browser/system_connector.h"
-#include "content/public/common/connection_filter.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"

content/browser/service_manager/common_browser_interfaces.cc

-// Copyright 2017 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 "content/browser/service_manager/common_browser_interfaces.h"
-
-#include <memory>
-#include <utility>
-
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/command_line.h"
-#include "base/task/post_task.h"
-#include "base/task_runner.h"
-#include "build/build_config.h"
-#include "components/discardable_memory/service/discardable_shared_memory_manager.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/common/connection_filter.h"
-#include "content/public/common/service_manager_connection.h"
-#include "content/public/common/service_names.mojom.h"
-#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
-
-#if defined(OS_WIN)
-#include "content/browser/renderer_host/dwrite_font_proxy_impl_win.h"
-#include "content/public/common/font_cache_dispatcher_win.h"
-#elif defined(OS_MACOSX)
-#include "content/browser/sandbox_support_mac_impl.h"
-#endif
-
-namespace content {
-
-namespace {
-
-class ConnectionFilterImpl : public ConnectionFilter {
- public:
-  ConnectionFilterImpl() {
-#if defined(OS_WIN)
-    registry_.AddInterface(base::BindRepeating(&FontCacheDispatcher::Create));
-    registry_.AddInterface(
-        base::BindRepeating(&DWriteFontProxyImpl::Create),
-        base::CreateSequencedTaskRunner({base::ThreadPool(),
-                                         base::TaskPriority::USER_BLOCKING,
-                                         base::MayBlock()}));
-#elif defined(OS_MACOSX)
-    registry_.AddInterface(
-        base::BindRepeating(&SandboxSupportMacImpl::BindRequest,
-                            base::Owned(new SandboxSupportMacImpl)));
-#endif
-
-    auto* discardable_shared_memory_manager =
-        discardable_memory::DiscardableSharedMemoryManager::Get();
-    if (discardable_shared_memory_manager) {
-      registry_.AddInterface(base::BindRepeating(
-          &discardable_memory::DiscardableSharedMemoryManager::Bind,
-          base::Unretained(discardable_shared_memory_manager)));
-    }
-  }
-
-  ~ConnectionFilterImpl() override { DCHECK_CURRENTLY_ON(BrowserThread::IO); }
-
- private:
-  template <typename Interface>
-  using InterfaceBinder =
-      base::Callback<void(mojo::InterfaceRequest<Interface>,
-                          const service_manager::BindSourceInfo&)>;
-
-  // ConnectionFilter:
-  void OnBindInterface(const service_manager::BindSourceInfo& source_info,
-                       const std::string& interface_name,
-                       mojo::ScopedMessagePipeHandle* interface_pipe,
-                       service_manager::Connector* connector) override {
-    registry_.TryBindInterface(interface_name, interface_pipe, source_info);
-  }
-
-  service_manager::BinderRegistryWithArgs<
-      const service_manager::BindSourceInfo&>
-      registry_;
-
-  DISALLOW_COPY_AND_ASSIGN(ConnectionFilterImpl);
-};
-
-}  // namespace
-
-void RegisterCommonBrowserInterfaces(ServiceManagerConnection* connection) {
-  connection->AddConnectionFilter(std::make_unique<ConnectionFilterImpl>());
-}
-
-}  // namespace content

content/browser/service_manager/common_browser_interfaces.h

-// Copyright 2017 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 CONTENT_BROWSER_SERVICE_MANAGER_COMMON_BROWSER_INTERFACES_H_
-#define CONTENT_BROWSER_SERVICE_MANAGER_COMMON_BROWSER_INTERFACES_H_
-
-namespace content {
-
-class ServiceManagerConnection;
-
-// Registers interface binders for browser-side interfaces that are common to
-// all child process types.
-void RegisterCommonBrowserInterfaces(ServiceManagerConnection* connection);
-
-}  // namespace content
-
-#endif  // CONTENT_BROWSER_SERVICE_MANAGER_COMMON_BROWSER_INTERFACES_H_

content/child/browser_exposed_child_interfaces.cc

@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/sequenced_task_runner.h"
 #include "content/child/child_histogram_fetcher_impl.h"
+#include "content/public/common/content_client.h"
 #include "mojo/public/cpp/bindings/binder_map.h"
 
 namespace content {
@@ -16,6 +17,8 @@ void ExposeChildInterfacesToBrowser(
     mojo::BinderMap* binders) {
   binders->Add(base::BindRepeating(&ChildHistogramFetcherFactoryImpl::Create),
                io_task_runner);
+
+  GetContentClient()->ExposeInterfacesToBrowser(io_task_runner, binders);
 }
 
 }  // namespace content

content/child/child_thread_impl.cc

@@ -266,23 +266,6 @@ class ChannelBootstrapFilter : public ConnectionFilter {
   DISALLOW_COPY_AND_ASSIGN(ChannelBootstrapFilter);
 };
 
-class ContentClientConnectionFilter : public ConnectionFilter {
- public:
-  ContentClientConnectionFilter() = default;
-
- private:
-  // ConnectionFilter:
-  void OnBindInterface(const service_manager::BindSourceInfo& source_info,
-                       const std::string& interface_name,
-                       mojo::ScopedMessagePipeHandle* interface_pipe,
-                       service_manager::Connector* connector) override {
-    GetContentClient()->BindChildProcessInterface(interface_name,
-                                                  interface_pipe);
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(ContentClientConnectionFilter);
-};
-
 }  // namespace
 
 // Implements the mojom ChildProcess interface and lives on the IO thread.
@@ -397,14 +380,6 @@ class ChildThreadImpl::IOThreadState
   }
 
   void BindReceiver(mojo::GenericPendingReceiver receiver) override {
-    std::string interface_name = *receiver.interface_name();
-    mojo::ScopedMessagePipeHandle pipe = receiver.PassPipe();
-    // TODO(crbug.com/977637): Rework this API to use the BinderMap.
-    GetContentClient()->BindChildProcessInterface(interface_name, &pipe);
-    if (!pipe)
-      return;
-    receiver = mojo::GenericPendingReceiver(interface_name, std::move(pipe));
-
     if (wait_for_interface_binders_) {
       pending_binding_requests_.push_back(std::move(receiver));
       return;
@@ -642,15 +617,12 @@ void ChildThreadImpl::Init(const Options& options) {
   thread_safe_sender_ =
       new ThreadSafeSender(main_thread_runner_, sync_message_filter_.get());
 
-  GetServiceManagerConnection()->AddConnectionFilter(
-      std::make_unique<ContentClientConnectionFilter>());
-
   auto registry = std::make_unique<service_manager::BinderRegistry>();
   registry->AddInterface(
       base::BindRepeating(&IOThreadState::BindChildProcessReceiver,
                           io_thread_state_),
       ChildThreadImpl::GetIOTaskRunner());
-  GetServiceManagerConnection()->AddConnectionFilter(
+  service_manager_connection_->AddConnectionFilter(
       std::make_unique<SimpleConnectionFilter>(std::move(registry)));
 
   // In single process mode, browser-side tracing and memory will cover the
@@ -804,10 +776,6 @@ void ChildThreadImpl::RecordComputedAction(const std::string& action) {
     NOTREACHED();
 }
 
-ServiceManagerConnection* ChildThreadImpl::GetServiceManagerConnection() {
-  return service_manager_connection_.get();
-}
-
 void ChildThreadImpl::BindHostReceiver(mojo::GenericPendingReceiver receiver) {
   child_process_host_->BindHostReceiver(std::move(receiver));
 }

content/child/child_thread_impl.h

@@ -61,6 +61,7 @@ class BackgroundTracingAgentProviderImpl;
 
 namespace content {
 class InProcessChildThreadParams;
+class ServiceManagerConnection;
 class ThreadSafeSender;
 
 // The main thread of a child process derives from this class.
@@ -98,7 +99,6 @@ class CONTENT_EXPORT ChildThreadImpl
 #endif
   void RecordAction(const base::UserMetricsAction& action) override;
   void RecordComputedAction(const std::string& action) override;
-  ServiceManagerConnection* GetServiceManagerConnection() override;
   void BindHostReceiver(mojo::GenericPendingReceiver receiver) override;
   scoped_refptr<base::SingleThreadTaskRunner> GetIOTaskRunner() override;
   void SetFieldTrialGroup(const std::string& trial_name,

content/gpu/gpu_child_thread.cc

@@ -21,7 +21,6 @@
 #include "content/child/child_process.h"
 #include "content/gpu/browser_exposed_gpu_interfaces.h"
 #include "content/gpu/gpu_service_factory.h"
-#include "content/public/common/connection_filter.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_manager_connection.h"

content/public/child/child_thread.h

@@ -24,8 +24,6 @@ struct UserMetricsAction;
 
 namespace content {
 
-class ServiceManagerConnection;
-
 // An abstract base class that contains logic shared between most child
 // processes of the embedder.
 class CONTENT_EXPORT ChildThread : public IPC::Sender {
@@ -55,10 +53,6 @@ class CONTENT_EXPORT ChildThread : public IPC::Sender {
   // actions in chrome/tools/extract_actions.py.
   virtual void RecordComputedAction(const std::string& action) = 0;
 
-  // Returns the ServiceManagerConnection for the thread (from which a
-  // service_manager::Connector can be obtained).
-  virtual ServiceManagerConnection* GetServiceManagerConnection() = 0;
-
   // Asks the browser-side process host object to bind |receiver|. Whether or
   // not the interface type encapsulated by |receiver| is supported depends on
   // the process type and potentially on the Content embedder.

content/public/common/content_client.cc

@@ -123,8 +123,8 @@ media::MediaDrmBridgeClient* ContentClient::GetMediaDrmBridgeClient() {
 }
 #endif  // OS_ANDROID
 
-void ContentClient::BindChildProcessInterface(
-    const std::string& interface_name,
-    mojo::ScopedMessagePipeHandle* receiving_handle) {}
+void ContentClient::ExposeInterfacesToBrowser(
+    scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+    mojo::BinderMap* binders) {}
 
 }  // namespace content

content/public/common/content_client.h

@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/memory/scoped_refptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
@@ -20,8 +21,9 @@
 #include "url/url_util.h"
 
 namespace base {
-class RefCountedMemory;
 class DictionaryValue;
+class RefCountedMemory;
+class SequencedTaskRunner;
 }
 
 namespace blink {
@@ -45,6 +47,10 @@ struct CdmHostFilePath;
 class MediaDrmBridgeClient;
 }
 
+namespace mojo {
+class BinderMap;
+}
+
 namespace content {
 
 class ContentBrowserClient;
@@ -200,10 +206,11 @@ class CONTENT_EXPORT ContentClient {
 #endif  // OS_ANDROID
 
   // Allows the embedder to handle incoming interface binding requests from
-  // the browser process to any type of child process.
-  virtual void BindChildProcessInterface(
-      const std::string& interface_name,
-      mojo::ScopedMessagePipeHandle* receiving_handle);
+  // the browser process to any type of child process. This is called once
+  // in each child process during that process's initialization.
+  virtual void ExposeInterfacesToBrowser(
+      scoped_refptr<base::SequencedTaskRunner> io_task_runner,
+      mojo::BinderMap* binders);
 
  private:
   friend class ContentClientInitializer;  // To set these pointers.

content/public/test/mock_render_thread.cc

@@ -237,10 +237,6 @@ void MockRenderThread::ReleaseCachedFonts() {
 }
 #endif
 
-ServiceManagerConnection* MockRenderThread::GetServiceManagerConnection() {
-  return nullptr;
-}
-
 void MockRenderThread::SetFieldTrialGroup(const std::string& trial_name,
                                           const std::string& group_name) {}
 

content/public/test/mock_render_thread.h

@@ -85,7 +85,6 @@ class MockRenderThread : public RenderThread {
   void PreCacheFont(const LOGFONT& log_font) override;
   void ReleaseCachedFonts() override;
 #endif
-  ServiceManagerConnection* GetServiceManagerConnection() override;
   void SetFieldTrialGroup(const std::string& trial_name,
                           const std::string& group_name) override;
 

content/shell/utility/shell_content_utility_client.cc

@@ -15,8 +15,6 @@
 #include "base/process/process.h"
 #include "content/public/child/child_thread.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/service_manager_connection.h"
-#include "content/public/common/simple_connection_filter.h"
 #include "content/public/test/test_service.h"
 #include "content/public/test/test_service.mojom.h"
 #include "content/public/utility/utility_thread.h"

extensions/test/test_content_utility_client.cc

@@ -4,11 +4,6 @@
 
 #include "extensions/test/test_content_utility_client.h"
 
-#include "content/public/child/child_thread.h"
-#include "content/public/common/service_manager_connection.h"
-#include "content/public/common/simple_connection_filter.h"
-#include "services/service_manager/public/cpp/binder_registry.h"
-
 namespace extensions {
 
 TestContentUtilityClient::TestContentUtilityClient() = default;