Convert UtilityProcessHost to bootstrap Mojo Channel using the Shell connection

content/browser/mojo/mojo_shell_context.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/mojo/mojo_shell_context.h"
 
 #include <unordered_map>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 42 matching lines @@
 
 base::LazyInstance<ConnectorPtr>::Leaky io_connector_tls_ptr =
     LAZY_INSTANCE_INITIALIZER;
 
 void SetConnectorOnIOThread(std::unique_ptr<shell::Connector> connector) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   io_connector_tls_ptr.Pointer()->Set(connector.release());
 }
 
 void DestroyConnectorOnIOThread() {
-  delete MojoShellContext::GetConnectorForIOThread();
+  delete ShellContext::GetConnectorForIOThread();
   io_connector_tls_ptr.Pointer()->Set(nullptr);
 }
 
 void StartUtilityProcessOnIOThread(
     mojo::InterfaceRequest<mojom::ProcessControl> request,
     const base::string16& process_name,
     bool use_sandbox) {
   UtilityProcessHost* process_host =
       UtilityProcessHost::Create(nullptr, nullptr);
   process_host->SetName(process_name);
@@ skipping 255 matching lines @@
     const std::string& name,
     const std::string& requestor_name,
     shell::mojom::InterfaceProviderRequest request,
     shell::mojom::InterfaceProviderPtr exposed_services,
     const shell::mojom::Connector::ConnectCallback& callback) {
   proxy_.Get()->ConnectToApplication(user_id, name, requestor_name,
                                      std::move(request),
                                      std::move(exposed_services), callback);
 }
 
-// static
-shell::Connector* MojoShellContext::GetConnectorForIOThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return io_connector_tls_ptr.Pointer()->Get();
-}
-
 void MojoShellContext::ConnectToApplicationOnOwnThread(
     const std::string& user_id,
     const std::string& name,
     const std::string& requestor_name,
     shell::mojom::InterfaceProviderRequest request,
     shell::mojom::InterfaceProviderPtr exposed_services,
     const shell::mojom::Connector::ConnectCallback& callback) {
   std::unique_ptr<shell::ConnectParams> params(new shell::ConnectParams);
   shell::Identity source_id(requestor_name, user_id);
   params->set_source(source_id);
   params->set_target(shell::Identity(name, user_id));
   params->set_remote_interfaces(std::move(request));
   params->set_local_interfaces(std::move(exposed_services));
   params->set_connect_callback(callback);
   shell_->Connect(std::move(params));
 }
 
+// static
+std::unique_ptr<ShellContext> ShellContext::Create() {
+  return base::WrapUnique(new MojoShellContext);
+}
+
+// static
+shell::Connector* ShellContext::GetConnectorForIOThread() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  return io_connector_tls_ptr.Pointer()->Get();
+}
+
+
 }  // namespace content