Revert of Move content's shell connections to the IO thread

content/gpu/gpu_child_thread.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/gpu/gpu_child_thread.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_local.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #include "content/child/child_process.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/establish_channel_params.h"
 #include "content/common/gpu_host_messages.h"
-#include "content/common/process_control.mojom.h"
 #include "content/gpu/gpu_process_control_impl.h"
 #include "content/gpu/gpu_watchdog_thread.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/mojo_shell_connection.h"
 #include "content/public/gpu/content_gpu_client.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
 #include "gpu/config/gpu_util.h"
 #include "gpu/ipc/common/memory_stats.h"
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
 #include "media/gpu/ipc/service/media_service.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 #include "ui/gl/init/gl_factory.h"
 #include "url/gurl.h"
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/gpu_platform_support.h"
 #include "ui/ozone/public/ozone_platform.h"
 #endif
@@ skipping 84 matching lines @@
   IPC::MessageFilter* message_filter = ui::OzonePlatform::GetInstance()
                                            ->GetGpuPlatformSupport()
                                            ->GetMessageFilter();
   if (message_filter)
     builder.AddStartupFilter(message_filter);
 #endif
 
   return builder.Build();
 }
 
-// Connection filter for incoming connections from other shell clients.
-class GpuConnectionFilter
-    : public ConnectionFilter,
-      public shell::InterfaceFactory<mojom::ProcessControl> {
- public:
-  GpuConnectionFilter() {}
-  ~GpuConnectionFilter() override {}
-
- private:
-  // ConnectionFilter:
-  bool OnConnect(shell::Connection* connection,
-                 shell::Connector* connector) override {
-    connection->AddInterface<mojom::ProcessControl>(this);
-    return true;
-  }
-
-  // shell::InterfaceFactory<mojom::ProcessControl>:
-  void Create(shell::Connection* connection,
-              mojom::ProcessControlRequest request) override {
-    process_control_bindings_.AddBinding(&process_control_, std::move(request));
-  }
-
-  // Process control for Mojo application hosting.
-  //
-  // TODO(rockot): Remove this. To host mojo:media in the gpu process, we should
-  // simply package mojo:media in exe:content_gpu and use the ShellClientFactory
-  // idiom.
-  GpuProcessControlImpl process_control_;
-
-  // Bindings to the mojom::ProcessControl impl.
-  mojo::BindingSet<mojom::ProcessControl> process_control_bindings_;
-
-  DISALLOW_COPY_AND_ASSIGN(GpuConnectionFilter);
-};
-
 }  // namespace
 
 // static
 GpuChildThread* GpuChildThread::current() {
   return g_lazy_tls.Pointer()->Get();
 }
 
 GpuChildThread::GpuChildThread(
     GpuWatchdogThread* watchdog_thread,
     bool dead_on_arrival,
@@ skipping 58 matching lines @@
 void GpuChildThread::Init(const base::Time& process_start_time) {
   process_start_time_ = process_start_time;
 
 #if defined(OS_ANDROID)
   // When running in in-process mode, this has been set in the browser at
   // ChromeBrowserMainPartsAndroid::PreMainMessageLoopRun().
   if (!in_browser_process_)
     media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid());
 #endif
 
-  if (GetContentClient()->gpu()) {  // NULL in tests.
-    GetContentClient()->gpu()->ExposeInterfacesToBrowser(
-        GetInterfaceRegistry());
-  }
-
-  // We don't want to process any incoming interface requests until
-  // OnInitialize() is invoked.
-  GetInterfaceRegistry()->PauseBinding();
+  // Only set once per process instance.
+  process_control_.reset(new GpuProcessControlImpl());
 
   if (GetContentClient()->gpu())  // NULL in tests.
     GetContentClient()->gpu()->Initialize(this);
 }
 
 void GpuChildThread::OnFieldTrialGroupFinalized(const std::string& trial_name,
                                                 const std::string& group_name) {
   Send(new GpuHostMsg_FieldTrialActivated(trial_name));
 }
 
-void GpuChildThread::AddConnectionFilters(MojoShellConnection* connection) {
-  connection->AddConnectionFilter(base::MakeUnique<GpuConnectionFilter>());
-}
-
 bool GpuChildThread::Send(IPC::Message* msg) {
   // The GPU process must never send a synchronous IPC message to the browser
   // process. This could result in deadlock.
   DCHECK(!msg->is_sync());
 
   return ChildThreadImpl::Send(msg);
 }
 
 bool GpuChildThread::OnControlMessageReceived(const IPC::Message& msg) {
   bool handled = true;
@@ skipping 40 matching lines @@
                         OnDestroyingVideoSurface);
 #endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   if (handled)
     return true;
 
   return false;
 }
 
+bool GpuChildThread::OnConnect(shell::Connection* connection) {
+  // Use of base::Unretained(this) is safe here because |service_registry()|
+  // will be destroyed before GpuChildThread is destructed.
+  connection->GetInterfaceRegistry()->AddInterface(base::Bind(
+      &GpuChildThread::BindProcessControlRequest, base::Unretained(this)));
+
+  if (GetContentClient()->gpu()) {  // NULL in tests.
+    GetContentClient()->gpu()->ExposeInterfacesToBrowser(
+        connection->GetInterfaceRegistry());
+  }
+
+  // We don't want to process any incoming interface requests until
+  // OnInitialize().
+  if (!gpu_channel_manager_) {
+    connection->GetInterfaceRegistry()->PauseBinding();
+    resume_interface_bindings_callback_ = base::Bind(
+        &shell::InterfaceRegistry::ResumeBinding,
+        connection->GetInterfaceRegistry()->GetWeakPtr());
+  }
+
+  return true;
+}
+
+shell::InterfaceRegistry* GpuChildThread::GetInterfaceRegistryForConnection() {
+  return nullptr;
+}
+
+shell::InterfaceProvider* GpuChildThread::GetInterfaceProviderForConnection() {
+  return nullptr;
+}
+
 void GpuChildThread::SetActiveURL(const GURL& url) {
   GetContentClient()->SetActiveURL(url);
 }
 
 void GpuChildThread::DidCreateOffscreenContext(const GURL& active_url) {
   Send(new GpuHostMsg_DidCreateOffscreenContext(active_url));
 }
 
 void GpuChildThread::DidDestroyChannel(int client_id) {
   media_service_->RemoveChannel(client_id);
@@ skipping 23 matching lines @@
 }
 #endif
 
 void GpuChildThread::StoreShaderToDisk(int32_t client_id,
                                        const std::string& key,
                                        const std::string& shader) {
   Send(new GpuHostMsg_CacheShader(client_id, key, shader));
 }
 
 void GpuChildThread::OnInitialize(const gpu::GpuPreferences& gpu_preferences) {
-  GetInterfaceRegistry()->ResumeBinding();
+  if (!resume_interface_bindings_callback_.is_null())
+    base::ResetAndReturn(&resume_interface_bindings_callback_).Run();
 
   gpu_preferences_ = gpu_preferences;
 
   gpu_info_.video_decode_accelerator_capabilities =
       media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences_);
   gpu_info_.video_encode_accelerator_supported_profiles =
       media::GpuVideoEncodeAccelerator::GetSupportedProfiles(
           gpu_preferences_);
   gpu_info_.jpeg_decode_accelerator_supported =
       media::GpuJpegDecodeAccelerator::IsSupported();
@@ skipping 197 matching lines @@
 }
 #endif
 
 void GpuChildThread::OnLoseAllContexts() {
   if (gpu_channel_manager_) {
     gpu_channel_manager_->DestroyAllChannels();
     media_service_->DestroyAllChannels();
   }
 }
 
+void GpuChildThread::BindProcessControlRequest(
+    mojo::InterfaceRequest<mojom::ProcessControl> request) {
+  DVLOG(1) << "GPU: Binding ProcessControl request";
+  DCHECK(process_control_);
+  process_control_bindings_.AddBinding(process_control_.get(),
+                                       std::move(request));
+}
+
 }  // namespace content