Revert of Establish MojoChildConnection from BrowserChildProcessHostImpl

content/browser/gpu/gpu_process_host.h

Index: content/browser/gpu/gpu_process_host.h
diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h
index e20a1474e046b79c1984d670d5ccd73b5ff92021..bb3510b7ba8e852ed8134e111c3e448380ae68c0 100644
--- a/content/browser/gpu/gpu_process_host.h
+++ b/content/browser/gpu/gpu_process_host.h
@@ -44,14 +44,11 @@
 struct SyncToken;
 }
 
-namespace shell {
-class InterfaceProvider;
-}
-
 namespace content {
 class BrowserChildProcessHostImpl;
 class GpuMainThread;
 class InProcessChildThreadParams;
+class MojoChildConnection;
 class RenderWidgetHostViewFrameSubscriber;
 class ShaderDiskCache;
 
@@ -110,7 +107,8 @@
   CONTENT_EXPORT static void RegisterGpuMainThreadFactory(
       GpuMainThreadFactoryFunction create);
 
-  shell::InterfaceProvider* GetRemoteInterfaces();
+  // BrowserChildProcessHostDelegate implementation.
+  shell::InterfaceProvider* GetRemoteInterfaces() override;
 
   // Get the GPU process host for the GPU process with the given ID. Returns
   // null if the process no longer exists.
@@ -209,7 +207,8 @@
                      const std::string& key,
                      const std::string& shader);
 
-  bool LaunchGpuProcess(gpu::GpuPreferences* gpu_preferences);
+  bool LaunchGpuProcess(const std::string& channel_id,
+                        gpu::GpuPreferences* gpu_preferences);
 
   void SendOutstandingReplies();
 
@@ -292,6 +291,11 @@
 
   std::string shader_prefix_key_;
 
+  // Browser-side Mojo endpoint which sets up a Mojo channel with the child
+  // process and contains the browser's InterfaceRegistry.
+  const std::string child_token_;
+  std::unique_ptr<MojoChildConnection> mojo_child_connection_;
+
   DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
 };