Rename BrowserChildProcessHost implementation class to BrowserChildProcessHostImpl.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9117006

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

20 files changed, 79 insertions, 78 deletions

diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host_impl.cc
index 891a4d8..54f8fcc 100644
--- a/content/browser/browser_child_process_host.cc
+++ b/content/browser/browser_child_process_host_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/browser_child_process_host.h"
+#include "content/browser/browser_child_process_host_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -42,7 +42,7 @@ using content::ChildProcessHostImpl;
 
 namespace {
 
-static base::LazyInstance<BrowserChildProcessHost::BrowserChildProcessList>
+static base::LazyInstance<BrowserChildProcessHostImpl::BrowserChildProcessList>
     g_child_process_list = LAZY_INSTANCE_INITIALIZER;
 
 // Helper functions since the child process related notifications happen on the
@@ -61,17 +61,17 @@ namespace content {
 BrowserChildProcessHost* BrowserChildProcessHost::Create(
     ProcessType type,
     BrowserChildProcessHostDelegate* delegate) {
-  return new ::BrowserChildProcessHost(type, delegate);
+  return new BrowserChildProcessHostImpl(type, delegate);
 }
 
 }  // namespace content
 
-BrowserChildProcessHost::BrowserChildProcessList*
-    BrowserChildProcessHost::GetIterator() {
+BrowserChildProcessHostImpl::BrowserChildProcessList*
+    BrowserChildProcessHostImpl::GetIterator() {
   return g_child_process_list.Pointer();
 }
 
-BrowserChildProcessHost::BrowserChildProcessHost(
+BrowserChildProcessHostImpl::BrowserChildProcessHostImpl(
     content::ProcessType type,
     BrowserChildProcessHostDelegate* delegate)
     : data_(type),
@@ -89,12 +89,12 @@ BrowserChildProcessHost::BrowserChildProcessHost(
   g_child_process_list.Get().push_back(this);
 }
 
-BrowserChildProcessHost::~BrowserChildProcessHost() {
+BrowserChildProcessHostImpl::~BrowserChildProcessHostImpl() {
   g_child_process_list.Get().remove(this);
 }
 
 // static
-void BrowserChildProcessHost::TerminateAll() {
+void BrowserChildProcessHostImpl::TerminateAll() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Make a copy since the BrowserChildProcessHost dtor mutates the original
   // list.
@@ -102,7 +102,7 @@ void BrowserChildProcessHost::TerminateAll() {
   STLDeleteElements(&copy);
 }
 
-void BrowserChildProcessHost::Launch(
+void BrowserChildProcessHostImpl::Launch(
 #if defined(OS_WIN)
     const FilePath& exposed_dir,
 #elif defined(OS_POSIX)
@@ -127,17 +127,17 @@ void BrowserChildProcessHost::Launch(
       this));
 }
 
-const ChildProcessData& BrowserChildProcessHost::GetData() const {
+const ChildProcessData& BrowserChildProcessHostImpl::GetData() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return data_;
 }
 
-ChildProcessHost* BrowserChildProcessHost::GetHost() const {
+ChildProcessHost* BrowserChildProcessHostImpl::GetHost() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return child_process_host_.get();
 }
 
-base::ProcessHandle BrowserChildProcessHost::GetHandle() const {
+base::ProcessHandle BrowserChildProcessHostImpl::GetHandle() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(child_process_.get())
       << "Requesting a child process handle before launching.";
@@ -146,36 +146,36 @@ base::ProcessHandle BrowserChildProcessHost::GetHandle() const {
   return child_process_->GetHandle();
 }
 
-void BrowserChildProcessHost::SetName(const string16& name) {
+void BrowserChildProcessHostImpl::SetName(const string16& name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   data_.name = name;
 }
 
-void BrowserChildProcessHost::SetHandle(base::ProcessHandle handle) {
+void BrowserChildProcessHostImpl::SetHandle(base::ProcessHandle handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   data_.handle = handle;
 }
 
-void BrowserChildProcessHost::ForceShutdown() {
+void BrowserChildProcessHostImpl::ForceShutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   g_child_process_list.Get().remove(this);
   child_process_host_->ForceShutdown();
 }
 
-void BrowserChildProcessHost::SetTerminateChildOnShutdown(
+void BrowserChildProcessHostImpl::SetTerminateChildOnShutdown(
     bool terminate_on_shutdown) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   child_process_->SetTerminateChildOnShutdown(terminate_on_shutdown);
 }
 
-void BrowserChildProcessHost::Notify(int type) {
+void BrowserChildProcessHostImpl::Notify(int type) {
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&ChildNotificationHelper, type, data_));
 }
 
-base::TerminationStatus BrowserChildProcessHost::GetTerminationStatus(
+base::TerminationStatus BrowserChildProcessHostImpl::GetTerminationStatus(
     int* exit_code) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!child_process_.get())  // If the delegate doesn't use Launch() helper.
@@ -183,20 +183,21 @@ base::TerminationStatus BrowserChildProcessHost::GetTerminationStatus(
   return child_process_->GetChildTerminationStatus(exit_code);
 }
 
-bool BrowserChildProcessHost::OnMessageReceived(const IPC::Message& message) {
+bool BrowserChildProcessHostImpl::OnMessageReceived(
+    const IPC::Message& message) {
   return delegate_->OnMessageReceived(message);
 }
 
-void BrowserChildProcessHost::OnChannelConnected(int32 peer_pid) {
+void BrowserChildProcessHostImpl::OnChannelConnected(int32 peer_pid) {
   Notify(content::NOTIFICATION_CHILD_PROCESS_HOST_CONNECTED);
   delegate_->OnChannelConnected(peer_pid);
 }
 
-void BrowserChildProcessHost::OnChannelError() {
+void BrowserChildProcessHostImpl::OnChannelError() {
   delegate_->OnChannelError();
 }
 
-bool BrowserChildProcessHost::CanShutdown() {
+bool BrowserChildProcessHostImpl::CanShutdown() {
   return delegate_->CanShutdown();
 }
 
@@ -207,7 +208,7 @@ bool BrowserChildProcessHost::CanShutdown() {
 // delayed task to wait for an exit code. However, this means that this method
 // may be called twice: once from the actual channel error and once from
 // OnWaitableEventSignaled() or the delayed task.
-void BrowserChildProcessHost::OnChildDisconnected() {
+void BrowserChildProcessHostImpl::OnChildDisconnected() {
   DCHECK(data_.handle != base::kNullProcessHandle);
   int exit_code;
   base::TerminationStatus status = GetTerminationStatus(&exit_code);
@@ -260,7 +261,7 @@ void BrowserChildProcessHost::OnChildDisconnected() {
       const int kExitCodeWaitMs = 250;
       MessageLoop::current()->PostDelayedTask(
           FROM_HERE,
-          base::Bind(&BrowserChildProcessHost::OnChildDisconnected,
+          base::Bind(&BrowserChildProcessHostImpl::OnChildDisconnected,
                      task_factory_.GetWeakPtr()),
           kExitCodeWaitMs);
 #endif
@@ -282,7 +283,7 @@ void BrowserChildProcessHost::OnChildDisconnected() {
 // available. Unfortunately STILL_ACTIVE (0x103) is a valid exit code in
 // which case we should not call OnChildDisconnected() or else we will be
 // waiting forever.
-void BrowserChildProcessHost::OnWaitableEventSignaled(
+void BrowserChildProcessHostImpl::OnWaitableEventSignaled(
     base::WaitableEvent* waitable_event) {
 #if defined (OS_WIN)
   unsigned long exit_code = 0;
@@ -291,23 +292,23 @@ void BrowserChildProcessHost::OnWaitableEventSignaled(
   if (exit_code == STILL_ACTIVE) {
     delete delegate_;  // Will delete us
   } else {
-    BrowserChildProcessHost::OnChildDisconnected();
+    BrowserChildProcessHostImpl::OnChildDisconnected();
   }
 #endif
 }
 
-bool BrowserChildProcessHost::Send(IPC::Message* message) {
+bool BrowserChildProcessHostImpl::Send(IPC::Message* message) {
   return child_process_host_->Send(message);
 }
 
-void BrowserChildProcessHost::ShutdownStarted() {
+void BrowserChildProcessHostImpl::ShutdownStarted() {
   // Must remove the process from the list now, in case it gets used for a
   // new instance before our watcher tells us that the process terminated.
   g_child_process_list.Get().remove(this);
 }
 
 
-void BrowserChildProcessHost::OnProcessLaunched() {
+void BrowserChildProcessHostImpl::OnProcessLaunched() {
   if (!child_process_->GetHandle()) {
     delete delegate_;  // Will delete us
     return;
diff --git a/content/browser/browser_child_process_host.h b/content/browser/browser_child_process_host_impl.h
index 45d2a22..f9c2acd 100644
--- a/content/browser/browser_child_process_host.h
+++ b/content/browser/browser_child_process_host_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_
-#define CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_
+#ifndef CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_IMPL_H_
+#define CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_IMPL_H_
 #pragma once
 
 #include <list>
@@ -25,21 +25,22 @@ class BrowserChildProcessHostIterator;
 // Plugins/workers and other child processes that live on the IO thread use this
 // class. RenderProcessHostImpl is the main exception that doesn't use this
 /// class because it lives on the UI thread.
-class CONTENT_EXPORT BrowserChildProcessHost :
-    public NON_EXPORTED_BASE(content::BrowserChildProcessHost),
+class CONTENT_EXPORT BrowserChildProcessHostImpl :
+    public content::BrowserChildProcessHost,
     public NON_EXPORTED_BASE(content::ChildProcessHostDelegate),
     public ChildProcessLauncher::Client,
     public base::WaitableEventWatcher::Delegate {
  public:
-  BrowserChildProcessHost(content::ProcessType type,
-                          content::BrowserChildProcessHostDelegate* delegate);
-  virtual ~BrowserChildProcessHost();
+  BrowserChildProcessHostImpl(
+      content::ProcessType type,
+      content::BrowserChildProcessHostDelegate* delegate);
+  virtual ~BrowserChildProcessHostImpl();
 
   // Terminates all child processes and deletes each BrowserChildProcessHost
   // instance.
   static void TerminateAll();
 
-  // BrowserChildProcessHost implementation:
+  // BrowserChildProcessHostImpl implementation:
   virtual bool Send(IPC::Message* message) OVERRIDE;
   virtual void Launch(
 #if defined(OS_WIN)
@@ -75,7 +76,7 @@ class CONTENT_EXPORT BrowserChildProcessHost :
     return delegate_;
   }
 
-  typedef std::list<BrowserChildProcessHost*> BrowserChildProcessList;
+  typedef std::list<BrowserChildProcessHostImpl*> BrowserChildProcessList;
  private:
   friend class content::BrowserChildProcessHostIterator;
 
@@ -104,9 +105,9 @@ class CONTENT_EXPORT BrowserChildProcessHost :
 #if defined(OS_WIN)
   base::WaitableEventWatcher child_watcher_;
 #else
-  base::WeakPtrFactory<BrowserChildProcessHost> task_factory_;
+  base::WeakPtrFactory<BrowserChildProcessHostImpl> task_factory_;
 #endif
   bool disconnect_was_alive_;
 };
 
-#endif  // CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_
+#endif  // CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_IMPL_H_
diff --git a/content/browser/browser_process_sub_thread.cc b/content/browser/browser_process_sub_thread.cc
index 2b42da1..fb80cae 100644
--- a/content/browser/browser_process_sub_thread.cc
+++ b/content/browser/browser_process_sub_thread.cc
@@ -10,7 +10,7 @@
 
 #include "base/debug/leak_tracker.h"
 #include "build/build_config.h"
-#include "content/browser/browser_child_process_host.h"
+#include "content/browser/browser_child_process_host_impl.h"
 #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h"
 #include "content/browser/notification_service_impl.h"
 #include "content/public/common/url_fetcher.h"
@@ -69,7 +69,7 @@ void BrowserProcessSubThread::IOThreadPreCleanUp() {
   // If any child processes are still running, terminate them and
   // and delete the BrowserChildProcessHost instances to release whatever
   // IO thread only resources they are referencing.
-  ::BrowserChildProcessHost::TerminateAll();
+  BrowserChildProcessHostImpl::TerminateAll();
 }
 
 void BrowserProcessSubThread::IOThreadPostCleanUp() {
diff --git a/content/browser/content_ipc_logging.cc b/content/browser/content_ipc_logging.cc
index 45b7a2e..cb4a9f4 100644
--- a/content/browser/content_ipc_logging.cc
+++ b/content/browser/content_ipc_logging.cc
@@ -5,7 +5,6 @@
 #include "content/public/browser/content_ipc_logging.h"
 
 #include "base/bind.h"
-#include "content/browser/browser_child_process_host.h"
 #include "content/common/child_process_messages.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 258c12a..a8db517 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -15,7 +15,7 @@
 #include "base/process_util.h"
 #include "base/string_piece.h"
 #include "base/threading/thread.h"
-#include "content/browser/browser_child_process_host.h"
+#include "content/browser/browser_child_process_host_impl.h"
 #include "content/browser/gpu/gpu_data_manager.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/renderer_host/render_widget_host.h"
@@ -271,7 +271,8 @@ GpuProcessHost::GpuProcessHost(int host_id)
       FROM_HERE,
       base::Bind(base::IgnoreResult(&GpuProcessHostUIShim::Create), host_id));
 
-  process_.reset(new BrowserChildProcessHost(content::PROCESS_TYPE_GPU, this));
+  process_.reset(
+      new BrowserChildProcessHostImpl(content::PROCESS_TYPE_GPU, this));
 }
 
 GpuProcessHost::~GpuProcessHost() {
diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h
index 51245d7..b2f599f 100644
--- a/content/browser/gpu/gpu_process_host.h
+++ b/content/browser/gpu/gpu_process_host.h
@@ -23,7 +23,7 @@
 class GpuMainThread;
 struct GPUCreateCommandBufferConfig;
 
-class BrowserChildProcessHost;
+class BrowserChildProcessHostImpl;
 
 class GpuProcessHost : public content::BrowserChildProcessHostDelegate,
                        public IPC::Message::Sender,
@@ -157,7 +157,7 @@ class GpuProcessHost : public content::BrowserChildProcessHostDelegate,
   // existing tabs, just the future ones.
   CONTENT_EXPORT static bool gpu_enabled_;
 
-  scoped_ptr<BrowserChildProcessHost> process_;
+  scoped_ptr<BrowserChildProcessHostImpl> process_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
 };
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc
index d15ffbd..a515b58 100644
--- a/content/browser/plugin_process_host.cc
+++ b/content/browser/plugin_process_host.cc
@@ -21,7 +21,7 @@
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "content/browser/browser_child_process_host.h"
+#include "content/browser/browser_child_process_host_impl.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/common/plugin_messages.h"
@@ -120,8 +120,8 @@ PluginProcessHost::PluginProcessHost()
     : plugin_cursor_visible_(true)
 #endif
 {
-  process_.reset(new BrowserChildProcessHost(
-      content::PROCESS_TYPE_PLUGIN, this));
+  process_.reset(
+      new BrowserChildProcessHostImpl(content::PROCESS_TYPE_PLUGIN, this));
 }
 
 PluginProcessHost::~PluginProcessHost() {
diff --git a/content/browser/plugin_process_host.h b/content/browser/plugin_process_host.h
index cc24e5f..d1b1171 100644
--- a/content/browser/plugin_process_host.h
+++ b/content/browser/plugin_process_host.h
@@ -23,7 +23,7 @@
 #include "webkit/plugins/webplugininfo.h"
 #include "ui/gfx/native_widget_types.h"
 
-class BrowserChildProcessHost;
+class BrowserChildProcessHostImpl;
 
 namespace content {
 class ResourceContext;
@@ -178,7 +178,7 @@ class CONTENT_EXPORT PluginProcessHost
   bool plugin_cursor_visible_;
 #endif
 
-  scoped_ptr<BrowserChildProcessHost> process_;
+  scoped_ptr<BrowserChildProcessHostImpl> process_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginProcessHost);
 };
diff --git a/content/browser/plugin_process_host_mac.cc b/content/browser/plugin_process_host_mac.cc
index 883d301..2638f46 100644
--- a/content/browser/plugin_process_host_mac.cc
+++ b/content/browser/plugin_process_host_mac.cc
@@ -12,7 +12,7 @@
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/process_util.h"
-#include "content/browser/browser_child_process_host.h"
+#include "content/browser/browser_child_process_host_impl.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/common/plugin_messages.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index 9ca0019..623f989 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -9,7 +9,7 @@
 #include "base/file_path.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
-#include "content/browser/browser_child_process_host.h"
+#include "content/browser/browser_child_process_host_impl.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/browser/renderer_host/render_message_filter.h"
 #include "content/common/child_process_host_impl.h"
@@ -110,7 +110,7 @@ PpapiPluginProcessHost::PpapiPluginProcessHost(net::HostResolver* host_resolver)
       network_observer_(new PluginNetworkObserver(this)),
       is_broker_(false),
       process_id_(ChildProcessHostImpl::GenerateChildProcessUniqueId()) {
-  process_.reset(new BrowserChildProcessHost(
+  process_.reset(new BrowserChildProcessHostImpl(
       content::PROCESS_TYPE_PPAPI_PLUGIN, this));
   process_->GetHost()->AddFilter(filter_.get());
 }
@@ -118,7 +118,7 @@ PpapiPluginProcessHost::PpapiPluginProcessHost(net::HostResolver* host_resolver)
 PpapiPluginProcessHost::PpapiPluginProcessHost()
     : is_broker_(true),
       process_id_(ChildProcessHostImpl::GenerateChildProcessUniqueId()) {
-  process_.reset(new BrowserChildProcessHost(
+  process_.reset(new BrowserChildProcessHostImpl(
       content::PROCESS_TYPE_PPAPI_BROKER, this));
 }
 
diff --git a/content/browser/ppapi_plugin_process_host.h b/content/browser/ppapi_plugin_process_host.h
index 0a37360..7376321 100644
--- a/content/browser/ppapi_plugin_process_host.h
+++ b/content/browser/ppapi_plugin_process_host.h
@@ -17,7 +17,7 @@
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "ipc/ipc_message.h"
 
-class BrowserChildProcessHost;
+class BrowserChildProcessHostImpl;
 
 namespace content {
 struct PepperPluginInfo;
@@ -122,7 +122,7 @@ class PpapiPluginProcessHost : public content::BrowserChildProcessHostDelegate,
   // The unique id created for the process.
   int process_id_;
 
-  scoped_ptr<BrowserChildProcessHost> process_;
+  scoped_ptr<BrowserChildProcessHostImpl> process_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiPluginProcessHost);
 };
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index ecf8aa2..13c8ec9 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -39,7 +39,6 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/tracked_objects.h"
 #include "content/browser/appcache/appcache_dispatcher_host.h"
-#include "content/browser/browser_child_process_host.h"
 #include "content/browser/browser_main.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/device_orientation/message_filter.h"
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc
index 2c225af..5f2e5a2 100644
--- a/content/browser/utility_process_host.cc
+++ b/content/browser/utility_process_host.cc
@@ -9,7 +9,7 @@
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "content/browser/browser_child_process_host.h"
+#include "content/browser/browser_child_process_host_impl.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/common/utility_messages.h"
 #include "content/public/browser/content_browser_client.h"
@@ -48,8 +48,8 @@ UtilityProcessHost::UtilityProcessHost(Client* client,
 #endif
       use_linux_zygote_(false),
       started_(false) {
-  process_.reset(new BrowserChildProcessHost(
-      content::PROCESS_TYPE_UTILITY, this));
+  process_.reset(
+      new BrowserChildProcessHostImpl(content::PROCESS_TYPE_UTILITY, this));
 }
 
 UtilityProcessHost::~UtilityProcessHost() {
diff --git a/content/browser/utility_process_host.h b/content/browser/utility_process_host.h
index cad678e..779c849 100644
--- a/content/browser/utility_process_host.h
+++ b/content/browser/utility_process_host.h
@@ -17,7 +17,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "ipc/ipc_message.h"
 
-class BrowserChildProcessHost;
+class BrowserChildProcessHostImpl;
 
 // This class acts as the browser-side host to a utility child process.  A
 // utility process is a short-lived sandboxed process that is created to run
@@ -115,7 +115,7 @@ class CONTENT_EXPORT UtilityProcessHost
 
   bool started_;
 
-  scoped_ptr<BrowserChildProcessHost> process_;
+  scoped_ptr<BrowserChildProcessHostImpl> process_;
 
   DISALLOW_COPY_AND_ASSIGN(UtilityProcessHost);
 };
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index 11b3464..d25183b 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -16,7 +16,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/appcache/appcache_dispatcher_host.h"
-#include "content/browser/browser_child_process_host.h"
+#include "content/browser/browser_child_process_host_impl.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/debugger/worker_devtools_message_filter.h"
 #include "content/browser/file_system/file_system_dispatcher_host.h"
@@ -91,8 +91,8 @@ WorkerProcessHost::WorkerProcessHost(
     : resource_context_(resource_context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(resource_context);
-  process_.reset(new BrowserChildProcessHost(
-      content::PROCESS_TYPE_WORKER, this));
+  process_.reset(
+      new BrowserChildProcessHostImpl(content::PROCESS_TYPE_WORKER, this));
 }
 
 WorkerProcessHost::~WorkerProcessHost() {
diff --git a/content/browser/worker_host/worker_process_host.h b/content/browser/worker_host/worker_process_host.h
index 57806c8..1a6aa9c 100644
--- a/content/browser/worker_host/worker_process_host.h
+++ b/content/browser/worker_host/worker_process_host.h
@@ -19,7 +19,7 @@
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
 
-class BrowserChildProcessHost;
+class BrowserChildProcessHostImpl;
 
 namespace content {
 class ResourceContext;
@@ -194,7 +194,7 @@ class WorkerProcessHost : public content::BrowserChildProcessHostDelegate,
   // process.
   scoped_refptr<WorkerMessageFilter> worker_message_filter_;
 
-  scoped_ptr<BrowserChildProcessHost> process_;
+  scoped_ptr<BrowserChildProcessHostImpl> process_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkerProcessHost);
 };
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 797039a..e520eb3 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -127,8 +127,8 @@
     'browser/appcache/appcache_frontend_proxy.h',
     'browser/appcache/chrome_appcache_service.cc',
     'browser/appcache/chrome_appcache_service.h',
-    'browser/browser_child_process_host.cc',
-    'browser/browser_child_process_host.h',
+    'browser/browser_child_process_host_impl.cc',
+    'browser/browser_child_process_host_impl.h',
     'browser/browser_main.cc',
     'browser/browser_main.h',
     'browser/browser_main_loop.cc',
diff --git a/content/public/browser/DEPS b/content/public/browser/DEPS
index 6314946..2a8ffad 100644
--- a/content/public/browser/DEPS
+++ b/content/public/browser/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+content/browser/browser_child_process_host.h",
+  "+content/browser/browser_child_process_host_impl.h",
   "+content/browser/notification_service_impl.h",
   "+content/browser/renderer_host/render_view_host.h",
 
diff --git a/content/public/browser/browser_child_process_host_iterator.cc b/content/public/browser/browser_child_process_host_iterator.cc
index 534a431..bda317e 100644
--- a/content/public/browser/browser_child_process_host_iterator.cc
+++ b/content/public/browser/browser_child_process_host_iterator.cc
@@ -5,7 +5,7 @@
 #include "content/public/browser/browser_child_process_host_iterator.h"
 
 #include "base/logging.h"
-#include "content/browser/browser_child_process_host.h"
+#include "content/browser/browser_child_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace content {
@@ -14,7 +14,7 @@ BrowserChildProcessHostIterator::BrowserChildProcessHostIterator()
     : all_(true), type_(content::PROCESS_TYPE_UNKNOWN) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)) <<
         "BrowserChildProcessHostIterator must be used on the IO thread.";
-  iterator_ = ::BrowserChildProcessHost::GetIterator()->begin();
+  iterator_ = BrowserChildProcessHostImpl::GetIterator()->begin();
 }
 
 BrowserChildProcessHostIterator::BrowserChildProcessHostIterator(
@@ -22,7 +22,7 @@ BrowserChildProcessHostIterator::BrowserChildProcessHostIterator(
     : all_(false), type_(type) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)) <<
         "BrowserChildProcessHostIterator must be used on the IO thread.";
-  iterator_ = ::BrowserChildProcessHost::GetIterator()->begin();
+  iterator_ = BrowserChildProcessHostImpl::GetIterator()->begin();
   if (!Done() && (*iterator_)->GetData().type != type_)
     ++(*this);
 }
@@ -44,7 +44,7 @@ bool BrowserChildProcessHostIterator::operator++() {
 }
 
 bool BrowserChildProcessHostIterator::Done() {
-  return iterator_ == ::BrowserChildProcessHost::GetIterator()->end();
+  return iterator_ == BrowserChildProcessHostImpl::GetIterator()->end();
 }
 
 const ChildProcessData& BrowserChildProcessHostIterator::GetData() {
diff --git a/content/public/browser/browser_child_process_host_iterator.h b/content/public/browser/browser_child_process_host_iterator.h
index 357d708..91ac458 100644
--- a/content/public/browser/browser_child_process_host_iterator.h
+++ b/content/public/browser/browser_child_process_host_iterator.h
@@ -11,7 +11,7 @@
 #include "content/common/content_export.h"
 #include "content/public/common/process_type.h"
 
-class BrowserChildProcessHost;
+class BrowserChildProcessHostImpl;
 
 namespace IPC {
 class Message;
@@ -42,7 +42,7 @@ class CONTENT_EXPORT BrowserChildProcessHostIterator {
  private:
   bool all_;
   content::ProcessType type_;
-  std::list<BrowserChildProcessHost*>::iterator iterator_;
+  std::list<BrowserChildProcessHostImpl*>::iterator iterator_;
 };
 
 // Helper class so that subclasses of BrowserChildProcessHostDelegate can be