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

chrome/browser/nacl_host/nacl_process_host.h

Index: chrome/browser/nacl_host/nacl_process_host.h
===================================================================
--- chrome/browser/nacl_host/nacl_process_host.h	(revision 118420)
+++ chrome/browser/nacl_host/nacl_process_host.h	(working copy)
@@ -12,18 +12,23 @@
 #include "base/file_util_proxy.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/process.h"
 #include "chrome/common/nacl_types.h"
-#include "content/browser/browser_child_process_host.h"
+#include "content/public/browser/browser_child_process_host_delegate.h"
 
 class ChromeRenderMessageFilter;
 
+namespace content {
+class BrowserChildProcessHost;
+}
+
 // Represents the browser side of the browser <--> NaCl communication
 // channel. There will be one NaClProcessHost per NaCl process
 // The browser is responsible for starting the NaCl process
 // when requested by the renderer.
 // After that, most of the communication is directly between NaCl plugin
 // running in the renderer and NaCl processes.
-class NaClProcessHost : public BrowserChildProcessHost {
+class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
  public:
   explicit NaClProcessHost(const std::wstring& url);
   virtual ~NaClProcessHost();
@@ -39,10 +44,6 @@
               int socket_count,
               IPC::Message* reply_msg);
 
-  // BrowserChildProcessHost implementation:
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
-  virtual void OnProcessCrashed(int exit_code) OVERRIDE;
-
   void OnProcessLaunchedByBroker(base::ProcessHandle handle);
 
  private:
@@ -54,6 +55,9 @@
 
   bool LaunchSelLdr();
 
+  // BrowserChildProcessHostDelegate implementation:
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual void OnProcessCrashed(int exit_code) OVERRIDE;
   virtual void OnProcessLaunched() OVERRIDE;
 
   void IrtReady();
@@ -74,6 +78,8 @@
 
   base::WeakPtrFactory<NaClProcessHost> weak_factory_;
 
+  scoped_ptr<content::BrowserChildProcessHost> process_;
+
   DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
 };