Moved common parts of ChildProcessHost into chrome/common and created a BrowserChildProcessHost with browser-specific implementation. This is in preparation of creating a ServiceChildProcessHost.

BUG=None
TEST=Test for regressions .

Review URL: http://codereview.chromium.org/2885017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51593 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 15 insertions, 14 deletions

diff --git a/chrome/browser/nacl_host/nacl_broker_host_win.cc b/chrome/browser/nacl_host/nacl_broker_host_win.cc
index eefbccd..f479030 100644
--- a/chrome/browser/nacl_host/nacl_broker_host_win.cc
+++ b/chrome/browser/nacl_host/nacl_broker_host_win.cc
@@ -17,7 +17,7 @@
 
 NaClBrokerHost::NaClBrokerHost(
     ResourceDispatcherHost* resource_dispatcher_host)
-    : ChildProcessHost(NACL_BROKER_PROCESS, resource_dispatcher_host),
+    : BrowserChildProcessHost(NACL_BROKER_PROCESS, resource_dispatcher_host),
       stopping_(false) {
 }
 
@@ -50,7 +50,7 @@ bool NaClBrokerHost::Init() {
   cmd_line->AppendSwitchWithValue(switches::kProcessChannelID,
       ASCIIToWide(channel_id()));
 
-  ChildProcessHost::Launch(FilePath(), cmd_line);
+  BrowserChildProcessHost::Launch(FilePath(), cmd_line);
   return true;
 }
 
diff --git a/chrome/browser/nacl_host/nacl_broker_host_win.h b/chrome/browser/nacl_host/nacl_broker_host_win.h
index 0bdc228..8668328 100644
--- a/chrome/browser/nacl_host/nacl_broker_host_win.h
+++ b/chrome/browser/nacl_host/nacl_broker_host_win.h
@@ -7,10 +7,10 @@
 
 #include "base/basictypes.h"
 #include "base/process.h"
-#include "chrome/browser/child_process_host.h"
+#include "chrome/browser/browser_child_process_host.h"
 #include "ipc/ipc_message.h"
 
-class NaClBrokerHost : public ChildProcessHost {
+class NaClBrokerHost : public BrowserChildProcessHost {
  public:
   explicit NaClBrokerHost(ResourceDispatcherHost* resource_dispatcher_host);
   ~NaClBrokerHost();
diff --git a/chrome/browser/nacl_host/nacl_broker_service_win.cc b/chrome/browser/nacl_host/nacl_broker_service_win.cc
index d1f7923..d5524ad 100644
--- a/chrome/browser/nacl_host/nacl_broker_service_win.cc
+++ b/chrome/browser/nacl_host/nacl_broker_service_win.cc
@@ -72,7 +72,8 @@ void NaClBrokerService::OnLoaderDied() {
 }
 
 NaClBrokerHost* NaClBrokerService::GetBrokerHost() {
-  for (ChildProcessHost::Iterator iter(ChildProcessInfo::NACL_BROKER_PROCESS);
+  for (BrowserChildProcessHost::Iterator iter(
+           ChildProcessInfo::NACL_BROKER_PROCESS);
        !iter.Done();
        ++iter) {
     NaClBrokerHost* broker_host = static_cast<NaClBrokerHost*>(*iter);
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index f28d31a..fb844d8 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -28,7 +28,7 @@
 NaClProcessHost::NaClProcessHost(
     ResourceDispatcherHost *resource_dispatcher_host,
     const std::wstring& url)
-    : ChildProcessHost(NACL_LOADER_PROCESS, resource_dispatcher_host),
+    : BrowserChildProcessHost(NACL_LOADER_PROCESS, resource_dispatcher_host),
       resource_dispatcher_host_(resource_dispatcher_host),
       reply_msg_(NULL),
       descriptor_(0),
@@ -99,12 +99,12 @@ bool NaClProcessHost::LaunchSelLdr() {
     return NaClBrokerService::GetInstance()->LaunchLoader(this,
         ASCIIToWide(channel_id()));
   } else {
-    ChildProcessHost::Launch(FilePath(), cmd_line);
+    BrowserChildProcessHost::Launch(FilePath(), cmd_line);
   }
 #elif defined(OS_POSIX)
-  ChildProcessHost::Launch(true,  // use_zygote
-                           base::environment_vector(),
-                           cmd_line);
+  BrowserChildProcessHost::Launch(true,  // use_zygote
+                                  base::environment_vector(),
+                                  cmd_line);
 #endif
 
   return true;
@@ -118,14 +118,14 @@ void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) {
 bool NaClProcessHost::DidChildCrash() {
   if (running_on_wow64_)
     return base::DidProcessCrash(NULL, handle());
-  return ChildProcessHost::DidChildCrash();
+  return BrowserChildProcessHost::DidChildCrash();
 }
 
 void NaClProcessHost::OnChildDied() {
 #if defined(OS_WIN)
   NaClBrokerService::GetInstance()->OnLoaderDied();
 #endif
-  ChildProcessHost::OnChildDied();
+  BrowserChildProcessHost::OnChildDied();
 }
 
 void NaClProcessHost::OnProcessLaunched() {
diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h
index b09d471..cae117b 100644
--- a/chrome/browser/nacl_host/nacl_process_host.h
+++ b/chrome/browser/nacl_host/nacl_process_host.h
@@ -8,7 +8,7 @@
 #include "build/build_config.h"
 
 #include "base/ref_counted.h"
-#include "chrome/browser/child_process_host.h"
+#include "chrome/browser/browser_child_process_host.h"
 #include "chrome/common/nacl_types.h"
 #include "native_client/src/shared/imc/nacl_imc.h"
 
@@ -20,7 +20,7 @@ class ResourceMessageFilter;
 // 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 ChildProcessHost {
+class NaClProcessHost : public BrowserChildProcessHost {
  public:
   NaClProcessHost(ResourceDispatcherHost *resource_dispatcher_host,
                   const std::wstring& url);