Convert content ConnectionFilter to OnBindInterface

content/browser/gpu/gpu_process_host.cc

 // Copyright (c) 2012 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/gpu/gpu_process_host.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 49 matching lines @@
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/config/gpu_driver_bug_list.h"
 #include "gpu/ipc/host/shader_disk_cache.h"
 #include "gpu/ipc/service/switches.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/message_filter.h"
 #include "media/base/media_switches.h"
 #include "media/media_features.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/runner/common/client_util.h"
 #include "ui/display/display_switches.h"
 #include "ui/events/latency_info.h"
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #endif
 
@@ skipping 245 matching lines @@
                       const std::string& data) {
   GpuProcessHost* host = GpuProcessHost::FromID(host_id);
   if (host)
     host->LoadedShader(key, data);
 }
 
 }  // anonymous namespace
 
 class GpuProcessHost::ConnectionFilterImpl : public ConnectionFilter {
  public:
-  ConnectionFilterImpl(GpuProcessHost* host) : host_(host) {}
-
- private:
-  // ConnectionFilter:
-  bool OnConnect(const service_manager::Identity& remote_identity,
-                 service_manager::InterfaceRegistry* registry,
-                 service_manager::Connector* connector) override {
-    if (remote_identity.name() != mojom::kGpuServiceName)
-      return false;
-
-    registry->AddInterface(
+  ConnectionFilterImpl() {
+    registry_.AddInterface(
         base::Bind(
             &memory_instrumentation::CoordinatorImpl::BindCoordinatorRequest,
             base::Unretained(
                 memory_instrumentation::CoordinatorImpl::GetInstance())),
         content::BrowserThread::GetTaskRunnerForThread(
             content::BrowserThread::UI));
-
-    GetContentClient()->browser()->ExposeInterfacesToGpuProcess(registry,
-                                                                host_);
-
 #if defined(OS_ANDROID)
-    GpuProcessHostUIShim::RegisterUIThreadMojoInterfaces(registry);
+    GpuProcessHostUIShim::RegisterUIThreadMojoInterfaces(&registry_);
 #endif
-
-    return true;
   }
 
-  GpuProcessHost* host_;
+ private:
+  // ConnectionFilter:
+  void OnBindInterface(const service_manager::ServiceInfo& source_info,
+                       const std::string& interface_name,
+                       mojo::ScopedMessagePipeHandle* interface_pipe,
+                       service_manager::Connector* connector) override {
+    if (registry_.CanBindInterface(interface_name)) {
+      registry_.BindInterface(source_info.identity, interface_name,
+                              std::move(*interface_pipe));
+    } else {
+      GetContentClient()->browser()->BindInterfaceRequest(
+          source_info, interface_name, interface_pipe);
+    }
+  }
+
+  service_manager::BinderRegistry registry_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionFilterImpl);
 };
 
 // static
 bool GpuProcessHost::ValidateHost(GpuProcessHost* host) {
   // The Gpu process is invalid if it's not using SwiftShader, the card is
   // blacklisted, and we can kill it and start over.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcess) ||
@@ skipping 85 matching lines @@
     bool force_create,
     const base::Callback<void(GpuProcessHost*)>& callback) {
 #if !defined(OS_WIN)
   DCHECK_NE(kind, GpuProcessHost::GPU_PROCESS_KIND_UNSANDBOXED);
 #endif
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&RunCallbackOnIO, kind, force_create, callback));
 }
 
-service_manager::InterfaceProvider* GpuProcessHost::GetRemoteInterfaces() {
-  return process_->child_connection()->GetRemoteInterfaces();
+void GpuProcessHost::BindInterface(
+    const std::string& interface_name,
+    mojo::ScopedMessagePipeHandle interface_pipe) {
+  process_->child_connection()->BindInterface(interface_name,
+                                              std::move(interface_pipe));
 }
 
 // static
 GpuProcessHost* GpuProcessHost::FromID(int host_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   for (int i = 0; i < GPU_PROCESS_KIND_COUNT; ++i) {
     GpuProcessHost* host = g_gpu_process_hosts[i];
     if (host && host->host_id_ == host_id && ValidateHost(host))
       return host;
@@ skipping 130 matching lines @@
 }
 
 bool GpuProcessHost::Init() {
   init_start_time_ = base::TimeTicks::Now();
 
   TRACE_EVENT_INSTANT0("gpu", "LaunchGpuProcess", TRACE_EVENT_SCOPE_THREAD);
 
   // May be null during test execution.
   if (ServiceManagerConnection::GetForProcess()) {
     ServiceManagerConnection::GetForProcess()->AddConnectionFilter(
-        base::MakeUnique<ConnectionFilterImpl>(this));
+        base::MakeUnique<ConnectionFilterImpl>());
   }
 
   process_->GetHost()->CreateChannelMojo();
 
   gpu::GpuPreferences gpu_preferences = GetGpuPreferencesFromCommandLine();
   if (in_process_) {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     DCHECK(GetGpuMainThreadFactory());
     in_process_gpu_thread_.reset(GetGpuMainThreadFactory()(
         InProcessChildThreadParams(
@@ skipping 613 matching lines @@
       GetShaderCacheFactorySingleton()->Get(client_id);
   if (!cache.get())
     return;
 
   cache->set_shader_loaded_callback(base::Bind(&HostLoadedShader, host_id_));
 
   client_id_to_shader_cache_[client_id] = cache;
 }
 
 }  // namespace content