Revert of Eliminate kMojoChannelToken usage for render processes

content/browser/mojo/mojo_shell_context.h

Index: content/browser/mojo/mojo_shell_context.h
diff --git a/content/browser/mojo/mojo_shell_context.h b/content/browser/mojo/mojo_shell_context.h
index 8885270116803a651ee29c97b1adc3e711ad8d18..8602773e0402b741e09a29d09590b8f021fe8504 100644
--- a/content/browser/mojo/mojo_shell_context.h
+++ b/content/browser/mojo/mojo_shell_context.h
@@ -5,19 +5,23 @@
 #ifndef CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
 #define CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
 
+#include <map>
+#include <memory>
+
+#include "base/callback_forward.h"
+#include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
+#include "services/shell/service_manager.h"
 
-namespace shell {
-class Connector;
+namespace catalog {
+class Catalog;
 }
 
 namespace content {
 
-// MojoShellContext manages the browser's connection to the ServiceManager,
-// hosting a new in-process ServiceManager if the browser was not launched from
-// an external one.
+// MojoShellContext hosts the browser's ApplicationManager, coordinating
+// app registration and interconnection.
 class CONTENT_EXPORT MojoShellContext {
  public:
   MojoShellContext();
@@ -27,9 +31,11 @@
   static shell::Connector* GetConnectorForIOThread();
 
  private:
-  class InProcessServiceManagerContext;
+  class BuiltinManifestProvider;
 
-  scoped_refptr<InProcessServiceManagerContext> in_process_context_;
+  std::unique_ptr<BuiltinManifestProvider> manifest_provider_;
+  std::unique_ptr<catalog::Catalog> catalog_;
+  std::unique_ptr<shell::ServiceManager> service_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellContext);
 };