Add a Content API around BrowserChildProcessHost, similar to what was done with ChildProcessHost....

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_
 #pragma once
 
 #include <map>
 #include <queue>
 
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
+#include "base/process.h"
 #include "base/threading/non_thread_safe.h"
-#include "content/browser/browser_child_process_host.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
+#include "content/public/browser/browser_child_process_host_delegate.h"
 #include "content/public/common/gpu_info.h"
+#include "ipc/ipc_message.h"
 #include "ui/gfx/native_widget_types.h"
 
+class GpuMainThread;
 struct GPUCreateCommandBufferConfig;
 
-namespace IPC {
-class Message;
-}
+class BrowserChildProcessHost;
 
-class GpuMainThread;
-
-class GpuProcessHost : public BrowserChildProcessHost,
+class GpuProcessHost : public content::BrowserChildProcessHostDelegate,
+                       public IPC::Message::Sender,
                        public base::NonThreadSafe {
  public:
   static bool gpu_enabled() { return gpu_enabled_; }
 
   // Creates a new GpuProcessHost or gets one for a particular
   // renderer process, resulting in the launching of a GPU process if required.
   // Returns null on failure. It is not safe to store the pointer once control
   // has returned to the message loop as it can be destroyed. Instead store the
   // associated GPU host ID. A renderer ID of zero means the browser process.
   // This could return NULL if GPU access is not allowed (blacklisted).
   static GpuProcessHost* GetForRenderer(int client_id,
                                         content::CauseForGpuLaunch cause);
 
   // Helper function to send the given message to the GPU process on the IO
   // thread.  Calls GetForRenderer and if a host is returned, sends it.
   // Can be called from any thread.
   CONTENT_EXPORT static void SendOnIO(int client_id,
                                       content::CauseForGpuLaunch cause,
                                       IPC::Message* message);
 
   // 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::Message::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
-  // ChildProcessHost implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-
   typedef base::Callback<void(const IPC::ChannelHandle&,
                               base::ProcessHandle,
                               const content::GPUInfo&)>
       EstablishChannelCallback;
 
   // Tells the GPU process to create a new channel for communication with a
   // renderer. Once the GPU process responds asynchronously with the IPC handle
   // and GPUInfo, we call the callback.
   void EstablishGpuChannel(
       int client_id, const EstablishChannelCallback& callback);
 
   typedef base::Callback<void(int32)> CreateCommandBufferCallback;
 
   // Tells the GPU process to create a new command buffer that draws into the
   // window associated with the given renderer.
   void CreateViewCommandBuffer(
       gfx::PluginWindowHandle compositing_surface,
       int surface_id,
       int client_id,
       const GPUCreateCommandBufferConfig& init_params,
       const CreateCommandBufferCallback& callback);
 
   // Whether this GPU process is set up to use software rendering.
   bool software_rendering();
 
   void ForceShutdown();
 
  private:
+  static bool HostIsValid(GpuProcessHost* host);
+
   GpuProcessHost(int host_id);
   virtual ~GpuProcessHost();
 
   bool Init();
 
   // Post an IPC message to the UI shim's message handler on the UI thread.
   void RouteOnUIThread(const IPC::Message& message);
 
+  // BrowserChildProcessHostDelegate implementation.
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnProcessLaunched() OVERRIDE;
   virtual void OnProcessCrashed(int exit_code) OVERRIDE;
 
   // Message handlers.
   void OnChannelEstablished(const IPC::ChannelHandle& channel_handle);
   void OnCommandBufferCreated(const int32 route_id);
   void OnDestroyCommandBuffer(int32 surface_id);
 
   bool LaunchGpuProcess(const std::string& channel_id);
 
@@ skipping 41 matching lines @@
 
   bool software_rendering_;
 
   scoped_ptr<GpuMainThread> in_process_gpu_thread_;
 
   // Master switch for enabling/disabling GPU acceleration for the current
   // browser session. It does not change the acceleration settings for
   // existing tabs, just the future ones.
   CONTENT_EXPORT static bool gpu_enabled_;
 
+  scoped_ptr<BrowserChildProcessHost> process_;
+
   DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
 };
 
 #endif  // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_