Make ChildProcessHost be used through an interface in content/public, instead of by inheritence.

chrome/browser/nacl_host/nacl_broker_host_win.cc

Index: chrome/browser/nacl_host/nacl_broker_host_win.cc
===================================================================
--- chrome/browser/nacl_host/nacl_broker_host_win.cc	(revision 112775)
+++ chrome/browser/nacl_host/nacl_broker_host_win.cc	(working copy)
@@ -14,7 +14,7 @@
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_messages.h"
-#include "content/common/child_process_host.h"
+#include "content/public/common/child_process_host.h"
 
 NaClBrokerHost::NaClBrokerHost()
     : BrowserChildProcessHost(content::PROCESS_TYPE_NACL_BROKER),
@@ -26,7 +26,8 @@
 
 bool NaClBrokerHost::Init() {
   // Create the channel that will be used for communicating with the broker.
-  if (!child_process_host()->CreateChannel())
+  std::string channel_id = child_process_host()->CreateChannel();
+  if (channel_id.empty())
     return false;
 
   // Create the path to the nacl broker/loader executable.
@@ -40,8 +41,7 @@
 
   cmd_line->AppendSwitchASCII(switches::kProcessType,
                               switches::kNaClBrokerProcess);
-  cmd_line->AppendSwitchASCII(switches::kProcessChannelID,
-                              child_process_host()->channel_id());
+  cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
   if (logging::DialogsAreSuppressed())
     cmd_line->AppendSwitch(switches::kNoErrorDialogs);