Revert of Establish MojoChildConnection from BrowserChildProcessHostImpl

content/browser/mojo/mojo_shell_context.cc

Index: content/browser/mojo/mojo_shell_context.cc
diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc
index 85dfabccb714ef28b7c983fd0989d08b4d456e7d..16b422849a9a8d7c3028e704f97afd9eeabe8c35 100644
--- a/content/browser/mojo/mojo_shell_context.cc
+++ b/content/browser/mojo/mojo_shell_context.cc
@@ -85,7 +85,7 @@
 // thread.
 void RequestGpuProcessControl(
     mojo::InterfaceRequest<mojom::ProcessControl> request) {
-  GpuProcessHost* process_host =
+  BrowserChildProcessHostDelegate* process_host =
       GpuProcessHost::Get(GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED);
   if (!process_host) {
     DLOG(ERROR) << "GPU process host not available.";
@@ -222,6 +222,7 @@
 
   DISALLOW_COPY_AND_ASSIGN(InProcessServiceManagerContext);
 };
+
 
 MojoShellContext::MojoShellContext() {
   shell::mojom::ServiceRequest request;
@@ -242,8 +243,6 @@
                                            IDR_MOJO_CONTENT_BROWSER_MANIFEST);
     manifest_provider->AddManifestResource(kGpuMojoApplicationName,
                                            IDR_MOJO_CONTENT_GPU_MANIFEST);
-    manifest_provider->AddManifestResource(kPluginMojoApplicationName,
-                                           IDR_MOJO_CONTENT_PLUGIN_MANIFEST);
     manifest_provider->AddManifestResource(kRendererMojoApplicationName,
                                            IDR_MOJO_CONTENT_RENDERER_MANIFEST);
     manifest_provider->AddManifestResource(kUtilityMojoApplicationName,