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

content/common/child_process_host_impl.cc

 // Copyright (c) 2011 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 "content/common/child_process_host.h"
+#include "content/common/child_process_host_impl.h"
 
 #include <limits>
 
 #include "base/atomicops.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 51 matching lines @@
                                .Append(kContentsName)
                                .Append(kMacOSName)
                                .Append(new_basename);
 
   return new_path;
 }
 
 }  // namespace
 #endif  // OS_MACOSX
 
-ChildProcessHost::ChildProcessHost(content::ChildProcessHostDelegate* delegate)
-    : delegate_(delegate),
-      peer_handle_(base::kNullProcessHandle),
-      opening_channel_(false) {
-#if defined(OS_WIN)
-  AddFilter(new FontCacheDispatcher());
-#endif
-}
+namespace content {
 
-ChildProcessHost::~ChildProcessHost() {
-  for (size_t i = 0; i < filters_.size(); ++i) {
-    filters_[i]->OnChannelClosing();
-    filters_[i]->OnFilterRemoved();
-  }
-
-  base::CloseProcessHandle(peer_handle_);
-}
-
-void ChildProcessHost::AddFilter(IPC::ChannelProxy::MessageFilter* filter) {
-  filters_.push_back(filter);
-
-  if (channel_.get())
-    filter->OnFilterAdded(channel_.get());
+// static
+ChildProcessHost* ChildProcessHost::Create(ChildProcessHostDelegate* delegate) {
+  return new ChildProcessHostImpl(delegate);
 }
 
 // static
 FilePath ChildProcessHost::GetChildPath(int flags) {
   FilePath child_path;
 
   child_path = CommandLine::ForCurrentProcess()->GetSwitchValuePath(
       switches::kBrowserSubprocessPath);
 
 #if defined(OS_LINUX)
@@ skipping 26 matching lines @@
     // non-executable heap, but the "EH" feature is provided to allow code
     // intolerant of a non-executable heap to work properly on 10.7. This
     // results in Chromium Helper EH.app or Google Chrome Helper EH.app.
     child_path = TransformPathForFeature(child_path, "EH");
   }
 #endif
 
   return child_path;
 }
 
-void ChildProcessHost::ForceShutdown() {
+ChildProcessHostImpl::ChildProcessHostImpl(ChildProcessHostDelegate* delegate)
+    : delegate_(delegate),
+      peer_handle_(base::kNullProcessHandle),
+      opening_channel_(false) {
+#if defined(OS_WIN)
+  AddFilter(new FontCacheDispatcher());
+#endif
+}
+
+ChildProcessHostImpl::~ChildProcessHostImpl() {
+  for (size_t i = 0; i < filters_.size(); ++i) {
+    filters_[i]->OnChannelClosing();
+    filters_[i]->OnFilterRemoved();
+  }
+
+  base::CloseProcessHandle(peer_handle_);
+}
+
+void ChildProcessHostImpl::AddFilter(IPC::ChannelProxy::MessageFilter* filter) {
+  filters_.push_back(filter);
+
+  if (channel_.get())
+    filter->OnFilterAdded(channel_.get());
+}
+
+void ChildProcessHostImpl::ForceShutdown() {
   Send(new ChildProcessMsg_Shutdown());
 }
 
-bool ChildProcessHost::CreateChannel() {
+std::string ChildProcessHostImpl::CreateChannel() {
   channel_id_ = GenerateRandomChannelID(this);
   channel_.reset(new IPC::Channel(
       channel_id_, IPC::Channel::MODE_SERVER, this));
   if (!channel_->Connect())
-    return false;
+    return std::string();
 
   for (size_t i = 0; i < filters_.size(); ++i)
     filters_[i]->OnFilterAdded(channel_.get());
 
   // Make sure these messages get sent first.
 #if defined(IPC_MESSAGE_LOG_ENABLED)
   bool enabled = IPC::Logging::GetInstance()->Enabled();
   Send(new ChildProcessMsg_SetIPCLoggingEnabled(enabled));
 #endif
 
   Send(new ChildProcessMsg_AskBeforeShutdown());
 
   opening_channel_ = true;
 
-  return true;
+  return channel_id_;
 }
 
-bool ChildProcessHost::Send(IPC::Message* message) {
+bool ChildProcessHostImpl::IsChannelOpening() {
+  return opening_channel_;
+}
+
+#if defined(OS_POSIX)
+int ChildProcessHostImpl::TakeClientFileDescriptor() {
+  return channel_->TakeClientFileDescriptor();
+}
+#endif
+
+bool ChildProcessHostImpl::Send(IPC::Message* message) {
   if (!channel_.get()) {
     delete message;
     return false;
   }
   return channel_->Send(message);
 }
 
-void ChildProcessHost::AllocateSharedMemory(
+void ChildProcessHostImpl::AllocateSharedMemory(
       uint32 buffer_size, base::ProcessHandle child_process_handle,
       base::SharedMemoryHandle* shared_memory_handle) {
   base::SharedMemory shared_buf;
   if (!shared_buf.CreateAndMapAnonymous(buffer_size)) {
     *shared_memory_handle = base::SharedMemory::NULLHandle();
     NOTREACHED() << "Cannot map shared memory buffer";
     return;
   }
   shared_buf.GiveToProcess(child_process_handle, shared_memory_handle);
 }
 
-std::string ChildProcessHost::GenerateRandomChannelID(void* instance) {
+std::string ChildProcessHostImpl::GenerateRandomChannelID(void* instance) {
   // Note: the string must start with the current process id, this is how
   // child processes determine the pid of the parent.
   // Build the channel ID.  This is composed of a unique identifier for the
   // parent browser process, an identifier for the child instance, and a random
   // component. We use a random component so that a hacked child process can't
   // cause denial of service by causing future named pipe creation to fail.
   return base::StringPrintf("%d.%p.%d",
                             base::GetCurrentProcId(), instance,
                             base::RandInt(0, std::numeric_limits<int>::max()));
 }
 
-int ChildProcessHost::GenerateChildProcessUniqueId() {
+int ChildProcessHostImpl::GenerateChildProcessUniqueId() {
   // This function must be threadsafe.
   static base::subtle::Atomic32 last_unique_child_id = 0;
   return base::subtle::NoBarrier_AtomicIncrement(&last_unique_child_id, 1);
 }
 
-bool ChildProcessHost::OnMessageReceived(const IPC::Message& msg) {
+bool ChildProcessHostImpl::OnMessageReceived(const IPC::Message& msg) {
 #ifdef IPC_MESSAGE_LOG_ENABLED
   IPC::Logging* logger = IPC::Logging::GetInstance();
   if (msg.type() == IPC_LOGGING_ID) {
     logger->OnReceivedLoggingMessage(msg);
     return true;
   }
 
   if (logger->Enabled())
     logger->OnPreDispatchMessage(msg);
 #endif
 
   bool handled = false;
   for (size_t i = 0; i < filters_.size(); ++i) {
     if (filters_[i]->OnMessageReceived(msg)) {
       handled = true;
       break;
     }
   }
 
   if (!handled) {
     handled = true;
-    IPC_BEGIN_MESSAGE_MAP(ChildProcessHost, msg)
+    IPC_BEGIN_MESSAGE_MAP(ChildProcessHostImpl, msg)
       IPC_MESSAGE_HANDLER(ChildProcessHostMsg_ShutdownRequest,
                           OnShutdownRequest)
       IPC_MESSAGE_HANDLER(ChildProcessHostMsg_SyncAllocateSharedMemory,
                           OnAllocateSharedMemory)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
 
     if (!handled)
       handled = delegate_->OnMessageReceived(msg);
   }
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
   if (logger->Enabled())
     logger->OnPostDispatchMessage(msg, channel_id_);
 #endif
   return handled;
 }
 
-void ChildProcessHost::OnChannelConnected(int32 peer_pid) {
+void ChildProcessHostImpl::OnChannelConnected(int32 peer_pid) {
   if (!base::OpenProcessHandle(peer_pid, &peer_handle_)) {
     NOTREACHED();
   }
   opening_channel_ = false;
   delegate_->OnChannelConnected(peer_pid);
   for (size_t i = 0; i < filters_.size(); ++i)
     filters_[i]->OnChannelConnected(peer_pid);
 }
 
-void ChildProcessHost::OnChannelError() {
+void ChildProcessHostImpl::OnChannelError() {
   opening_channel_ = false;
   delegate_->OnChannelError();
 
   for (size_t i = 0; i < filters_.size(); ++i)
     filters_[i]->OnChannelError();
 
   // This will delete host_, which will also destroy this!
   delegate_->OnChildDisconnected();
 }
 
-void ChildProcessHost::OnAllocateSharedMemory(
+void ChildProcessHostImpl::OnAllocateSharedMemory(
     uint32 buffer_size,
     base::SharedMemoryHandle* handle) {
   AllocateSharedMemory(buffer_size, peer_handle_, handle);
 }
 
-void ChildProcessHost::OnShutdownRequest() {
+void ChildProcessHostImpl::OnShutdownRequest() {
   if (delegate_->CanShutdown())
     Send(new ChildProcessMsg_Shutdown());
 }
+
+}  // namespace content