Convert UtilityProcessHost to bootstrap Mojo Channel using the Shell connection

content/browser/browser_main_loop.cc

Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index db8ea8df06362fdb66b750745d0f3925c0e59e1e..79dbce43faec71825e98fae09411f5f6569de638 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -55,7 +55,6 @@
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader_delegate_impl.h"
 #include "content/browser/media/media_internals.h"
-#include "content/browser/mojo/mojo_shell_context.h"
 #include "content/browser/net/browser_online_state_observer.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
@@ -72,6 +71,7 @@
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/shell_context.h"
 #include "content/public/browser/tracing_controller.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
@@ -1027,7 +1027,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
 #endif
 
   // Shutdown Mojo shell and IPC.
-  mojo_shell_context_.reset();
+  shell_context_.reset();
   mojo_ipc_support_.reset();
 
   // Must be size_t so we can subtract from it.
@@ -1172,7 +1172,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
           ->task_runner()));
 
-  mojo_shell_context_.reset(new MojoShellContext);
+  shell_context_ = ShellContext::Create();
   if (shell::ShellIsRemote()) {
 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
     // TODO(rockot): Remove the blocking wait for init.