WIP: Obtain Bootstrap from utility process Service

content/browser/mojo/service_manager_context_impl.h

Index: content/browser/mojo/service_manager_context_impl.h
diff --git a/content/browser/mojo/mojo_shell_context.h b/content/browser/mojo/service_manager_context_impl.h
similarity index 81%
rename from content/browser/mojo/mojo_shell_context.h
rename to content/browser/mojo/service_manager_context_impl.h
index 6de10cf146762752d5b31075fdf6e2eaeafdfa38..b3f71fdf5edebc3c60e1d38556139a08a2f52829 100644
--- a/content/browser/mojo/mojo_shell_context.h
+++ b/content/browser/mojo/service_manager_context_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
-#define CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
+#ifndef CONTENT_BROWSER_MOJO_SERVICE_MANAGER_CONTEXT_IMPL_H_
+#define CONTENT_BROWSER_MOJO_SERVICE_MANAGER_CONTEXT_IMPL_H_
 
 #include <map>
 #include <memory>
@@ -12,7 +12,7 @@
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
-#include "content/common/content_export.h"
+#include "content/public/browser/service_manager_context.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/shell/service_manager.h"
 
@@ -22,12 +22,10 @@ class Catalog;
 
 namespace content {
 
-// MojoShellContext hosts the browser's ApplicationManager, coordinating
-// app registration and interconnection.
-class CONTENT_EXPORT MojoShellContext {
+class CONTENT_EXPORT ServiceManagerContextImpl : public ServiceManagerContext {
  public:
-  MojoShellContext();
-  ~MojoShellContext();
+  ServiceManagerContextImpl();
+  ~ServiceManagerContextImpl();
 
   // Connects an application at |name| and gets a handle to its exposed
   // services. This is only intended for use in browser code that's not part of
@@ -63,9 +61,9 @@ class CONTENT_EXPORT MojoShellContext {
   std::unique_ptr<catalog::Catalog> catalog_;
   std::unique_ptr<shell::ServiceManager> service_manager_;
 
-  DISALLOW_COPY_AND_ASSIGN(MojoShellContext);
+  DISALLOW_COPY_AND_ASSIGN(ServiceManagerContextImpl);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
+#endif  // CONTENT_BROWSER_MOJO_SERVICE_MANAGER_CONTEXT_IMPL_H_