WIP: Obtain Bootstrap from utility process Service

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 b26c59b3b3c371eb15ec95257c78c08f0cc64e4f..479d999e213d20c8a4132fccef3230817680fe6c 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -57,7 +57,7 @@
 #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/mojo/service_manager_context_impl.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"
@@ -1046,7 +1046,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
 #endif
 
   // Shutdown Mojo shell and IPC.
-  mojo_shell_context_.reset();
+  service_manager_context_.reset();
   mojo_ipc_support_.reset();
 
   // Must be size_t so we can subtract from it.
@@ -1200,7 +1200,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
           ->task_runner()));
 
-  mojo_shell_context_.reset(new MojoShellContext);
+  service_manager_context_ = ServiceManagerContext::Create();
 #if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
   // TODO(rockot): Remove the blocking wait for init.
   // http://crbug.com/594852.