Revert of Establish MojoChildConnection from BrowserChildProcessHostImpl

content/browser/gpu/gpu_process_host.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 #define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 26 matching lines @@
 
 namespace IPC {
 struct ChannelHandle;
 }
 
 namespace gpu {
 struct GpuPreferences;
 struct SyncToken;
 }
 
-namespace shell {
-class InterfaceProvider;
-}
-
 namespace content {
 class BrowserChildProcessHostImpl;
 class GpuMainThread;
 class InProcessChildThreadParams;
+class MojoChildConnection;
 class RenderWidgetHostViewFrameSubscriber;
 class ShaderDiskCache;
 
 typedef base::Thread* (*GpuMainThreadFactoryFunction)(
     const InProcessChildThreadParams&, const gpu::GpuPreferences&);
 
 class GpuProcessHost : public BrowserChildProcessHostDelegate,
                        public IPC::Sender,
                        public base::NonThreadSafe {
  public:
@@ skipping 38 matching lines @@
   // be set to force the creation of GpuProcessHost if one doesn't already
   // exist. This function can be called from any thread. Deletes the message if
   // it cannot be sent.
   CONTENT_EXPORT static void SendOnIO(GpuProcessKind kind,
                                       bool force_create,
                                       IPC::Message* message);
 
   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.
   static GpuProcessHost* FromID(int host_id);
   int host_id() const { return host_id_; }
 
   // IPC::Sender implementation.
   bool Send(IPC::Message* msg) override;
 
   // Adds a message filter to the GpuProcessHost's channel.
@@ skipping 78 matching lines @@
       gpu::SurfaceHandle parent_handle,
       gpu::SurfaceHandle window_handle);
 #endif
 
   void CreateChannelCache(int32_t client_id);
   void OnDestroyChannel(int32_t client_id);
   void OnCacheShader(int32_t client_id,
                      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();
 
   void BlockLiveOffscreenContexts();
 
   // Update GPU crash counters.  Disable GPU if crash limit is reached.
   void RecordProcessCrash();
 
   std::string GetShaderPrefixKey();
 
@@ skipping 62 matching lines @@
   // Statics kept around to send to UMA histograms on GPU process lost.
   bool uma_memory_stats_received_;
   gpu::GPUMemoryUmaStats uma_memory_stats_;
 
   typedef std::map<int32_t, scoped_refptr<ShaderDiskCache>>
       ClientIdToShaderCacheMap;
   ClientIdToShaderCacheMap client_id_to_shader_cache_;
 
   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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_