Extract a Connector interface from Shell that can be cloned & passed to other threads

content/browser/frame_host/frame_mojo_shell.cc

 // Copyright 2015 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/frame_host/frame_mojo_shell.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "content/browser/mojo/mojo_shell_context.h"
@@ skipping 27 matching lines @@
 }
 
 FrameMojoShell::~FrameMojoShell() {
 }
 
 void FrameMojoShell::BindRequest(
     mojo::InterfaceRequest<mojo::shell::mojom::Shell> shell_request) {
   bindings_.AddBinding(this, std::move(shell_request));
 }
 
+void FrameMojoShell::GetConnector(
+    mojo::shell::mojom::ConnectorRequest request) {
+  connectors_.AddBinding(this, std::move(request));
+}
+
+void FrameMojoShell::QuitApplication() {
+}
+
 // TODO(xhwang): Currently no callers are exposing |exposed_services|. So we
 // drop it and replace it with services we provide in the browser. In the
 // future we may need to support both.
 void FrameMojoShell::Connect(
     const mojo::String& application_url,
     uint32_t user_id,
     mojo::shell::mojom::InterfaceProviderRequest services,
     mojo::shell::mojom::InterfaceProviderPtr /* exposed_services */,
     mojo::shell::mojom::CapabilityFilterPtr filter,
-    const ConnectCallback& callback) {
+    const mojo::shell::mojom::Connector::ConnectCallback& callback) {
   // TODO(beng): user_id is dropped on the floor right now. Figure out what to
   //             do with it.
   mojo::shell::mojom::InterfaceProviderPtr frame_services;
   service_provider_bindings_.AddBinding(GetServiceRegistry(),
                                         GetProxy(&frame_services));
 
   mojo::shell::CapabilityFilter capability_filter =
       mojo::shell::GetPermissiveCapabilityFilter();
   if (!filter.is_null())
     capability_filter = filter->filter.To<mojo::shell::CapabilityFilter>();
   MojoShellContext::ConnectToApplication(
       application_url.To<GURL>(),
       frame_host_->GetSiteInstance()->GetSiteURL(), std::move(services),
       std::move(frame_services), capability_filter, callback);
 }
 
-void FrameMojoShell::QuitApplication() {
+void FrameMojoShell::Clone(mojo::shell::mojom::ConnectorRequest request) {
+  connectors_.AddBinding(this, std::move(request));
 }
 
 ServiceRegistryImpl* FrameMojoShell::GetServiceRegistry() {
   if (!service_registry_) {
     service_registry_.reset(new ServiceRegistryImpl());
 
     // TODO(rockot/xhwang): Currently all applications connected share the same
     // set of services registered in the |registry|. We may want to provide
     // different services for different apps for better isolation.
     RegisterFrameMojoShellServices(service_registry_.get(), frame_host_);
     GetContentClient()->browser()->RegisterFrameMojoShellServices(
         service_registry_.get(), frame_host_);
   }
 
   return service_registry_.get();
 }
 
 }  // namespace content