Moved common parts of ChildProcessHost into chrome/common and created a Brows...

chrome/browser/nacl_host/nacl_process_host.cc

 // Copyright (c) 2010 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.
 
 #include "build/build_config.h"
 
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
@@ skipping 10 matching lines @@
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/nacl_host/nacl_broker_service_win.h"
 #endif
 
 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),
       running_on_wow64_(false) {
   set_name(url);
 #if defined(OS_WIN)
   CheckIsWow64();
 #endif
 }
 
@@ skipping 50 matching lines @@
   cmd_line->AppendSwitchWithValue(switches::kProcessChannelID,
                                   ASCIIToWide(channel_id()));
 
   // On Windows we might need to start the broker process to launch a new loader
 #if defined(OS_WIN)
   if (running_on_wow64_) {
     NaClBrokerService::GetInstance()->Init(resource_dispatcher_host_);
     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;
 }
 
 void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) {
   set_handle(handle);
   OnProcessLaunched();
 }
 
 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() {
   nacl::FileDescriptor imc_handle;
   base::ProcessHandle nacl_process_handle;
 #if defined(OS_WIN)
   // Duplicate the IMC handle
   // We assume the size of imc_handle has the same size as HANDLE, so the cast
   // below is safe.
   DCHECK(sizeof(HANDLE) == sizeof(imc_handle));
@@ skipping 81 matching lines @@
   if (fnIsWow64Process != NULL) {
     BOOL bIsWow64 = FALSE;
     if (fnIsWow64Process(GetCurrentProcess(),&bIsWow64)) {
       if (bIsWow64) {
         running_on_wow64_ = true;
       }
     }
   }
 }
 #endif