Re-fix http://crbug.com/87176, and add a test.

content/browser/child_process_launcher.cc

 // Copyright (c) 2012 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/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 25 matching lines @@
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #include "content/browser/zygote_host/zygote_host_impl_linux.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/posix/global_descriptors.h"
 #endif
 
 namespace content {
 
+ChildProcessLauncher::~ChildProcessLauncher() {}
+
+class ChildProcessLauncherImpl : public ChildProcessLauncher {
+ public:
+  ChildProcessLauncherImpl(
+#if defined(OS_WIN)
+      SandboxedProcessLauncherDelegate* delegate,
+#elif defined(OS_POSIX)
+      bool use_zygote,
+      const base::EnvironmentVector& environ,
+      int ipcfd,
+#endif
+      CommandLine* cmd_line,
+      int child_process_id,
+      Client* client);
+
+  virtual ~ChildProcessLauncherImpl();
+
+  // ChildProcessLauncher implementation
+  virtual bool IsStarting() OVERRIDE;
+  virtual base::ProcessHandle GetHandle() OVERRIDE;
+  virtual base::TerminationStatus GetChildTerminationStatus(bool known_dead,
+                                                            int* exit_code)
+      OVERRIDE;
+  virtual void SetProcessBackgrounded(bool background) OVERRIDE;
+  virtual void SetTerminateChildOnShutdown(bool terminate_on_shutdown) OVERRIDE;
+
+ private:
+  class Context;
+
+  scoped_refptr<Context> context_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChildProcessLauncherImpl);
+};
+
 // Having the functionality of ChildProcessLauncher be in an internal
 // ref counted object allows us to automatically terminate the process when the
 // parent class destructs, while still holding on to state that we need.
-class ChildProcessLauncher::Context
-    : public base::RefCountedThreadSafe<ChildProcessLauncher::Context> {
+class ChildProcessLauncherImpl::Context
+    : public base::RefCountedThreadSafe<ChildProcessLauncherImpl::Context> {
  public:
   Context()
       : client_(NULL),
         client_thread_id_(BrowserThread::UI),
         termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
         exit_code_(RESULT_CODE_NORMAL_EXIT),
         starting_(true)
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
         , zygote_(false)
 #endif
@@ skipping 56 matching lines @@
       const base::TimeTicks begin_launch_time,
       base::ProcessHandle handle) {
     RecordHistograms(begin_launch_time);
     if (BrowserThread::CurrentlyOn(client_thread_id)) {
       // This is always invoked on the UI thread which is commonly the
       // |client_thread_id| so we can shortcut one PostTask.
       this_object->Notify(handle);
     } else {
       BrowserThread::PostTask(
           client_thread_id, FROM_HERE,
-          base::Bind(
-              &ChildProcessLauncher::Context::Notify,
-              this_object,
-              handle));
+          base::Bind(&Context::Notify, this_object, handle));
     }
   }
 #endif
 
   void ResetClient() {
     // No need for locking as this function gets called on the same thread that
     // client_ would be used.
     CHECK(BrowserThread::CurrentlyOn(client_thread_id_));
     client_ = NULL;
   }
 
   void set_terminate_child_on_shutdown(bool terminate_on_shutdown) {
     terminate_child_on_shutdown_ = terminate_on_shutdown;
   }
 
  private:
-  friend class base::RefCountedThreadSafe<ChildProcessLauncher::Context>;
-  friend class ChildProcessLauncher;
+  friend class base::RefCountedThreadSafe<Context>;
+  friend class ChildProcessLauncherImpl;
 
   ~Context() {
     Terminate();
   }
 
   static void RecordHistograms(const base::TimeTicks begin_launch_time) {
     base::TimeDelta launch_time = base::TimeTicks::Now() - begin_launch_time;
     if (BrowserThread::CurrentlyOn(BrowserThread::PROCESS_LAUNCHER)) {
       RecordLaunchHistograms(launch_time);
     } else {
       BrowserThread::PostTask(
           BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
-          base::Bind(&ChildProcessLauncher::Context::RecordLaunchHistograms,
+          base::Bind(&Context::RecordLaunchHistograms,
                      launch_time));
     }
   }
 
   static void RecordLaunchHistograms(const base::TimeDelta launch_time) {
     // Log the launch time, separating out the first one (which will likely be
     // slower due to the rest of the browser initializing at the same time).
     static bool done_first_launch = false;
     if (done_first_launch) {
       UMA_HISTOGRAM_TIMES("MPArch.ChildProcessLaunchSubsequent", launch_time);
@@ skipping 34 matching lines @@
     std::vector<FileDescriptorInfo> files_to_register;
     files_to_register.push_back(
         FileDescriptorInfo(kPrimaryIPCChannel,
                                     base::FileDescriptor(ipcfd, false)));
 
     GetContentClient()->browser()->
         GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id,
                                                 &files_to_register);
 
     StartChildProcess(cmd_line->argv(), files_to_register,
-        base::Bind(&ChildProcessLauncher::Context::OnChildProcessStarted,
+        base::Bind(&Context::OnChildProcessStarted,
                    this_object, client_thread_id, begin_launch_time));
 
 #elif defined(OS_POSIX)
     base::ProcessHandle handle = base::kNullProcessHandle;
     // We need to close the client end of the IPC channel to reliably detect
     // child termination.
     file_util::ScopedFD ipcfd_closer(&ipcfd);
 
     std::string process_type =
         cmd_line->GetSwitchValueASCII(switches::kProcessType);
@@ skipping 175 matching lines @@
   bool terminate_child_on_shutdown_;
 #if defined(OS_ANDROID)
   // The fd to close after creating the process.
   int ipcfd_;
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
   bool zygote_;
 #endif
 };
 
 
-ChildProcessLauncher::ChildProcessLauncher(
+ChildProcessLauncherImpl::ChildProcessLauncherImpl(
 #if defined(OS_WIN)
     SandboxedProcessLauncherDelegate* delegate,
 #elif defined(OS_POSIX)
     bool use_zygote,
     const base::EnvironmentVector& environ,
     int ipcfd,
 #endif
     CommandLine* cmd_line,
     int child_process_id,
     Client* client) {
   context_ = new Context();
   context_->Launch(
 #if defined(OS_WIN)
       delegate,
 #elif defined(OS_ANDROID)
       ipcfd,
 #elif defined(OS_POSIX)
       use_zygote,
       environ,
       ipcfd,
 #endif
       cmd_line,
       child_process_id,
       client);
 }
 
-ChildProcessLauncher::~ChildProcessLauncher() {
+ChildProcessLauncherImpl::~ChildProcessLauncherImpl() {
   context_->ResetClient();
 }
 
-bool ChildProcessLauncher::IsStarting() {
+bool ChildProcessLauncherImpl::IsStarting() {
   return context_->starting_;
 }
 
-base::ProcessHandle ChildProcessLauncher::GetHandle() {
+base::ProcessHandle ChildProcessLauncherImpl::GetHandle() {
   DCHECK(!context_->starting_);
   return context_->process_.handle();
 }
 
-base::TerminationStatus ChildProcessLauncher::GetChildTerminationStatus(
+base::TerminationStatus ChildProcessLauncherImpl::GetChildTerminationStatus(
     bool known_dead,
     int* exit_code) {
   base::ProcessHandle handle = context_->process_.handle();
   if (handle == base::kNullProcessHandle) {
     // Process is already gone, so return the cached termination status.
     if (exit_code)
       *exit_code = context_->exit_code_;
     return context_->termination_status_;
   }
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
@@ skipping 15 matching lines @@
   // here. Since GetTerminationStatus called waitpid with WNOHANG,
   // it'll reap the process.  However, if GetTerminationStatus didn't
   // reap the child (because it was still running), we'll need to
   // Terminate via ProcessWatcher. So we can't close the handle here.
   if (context_->termination_status_ != base::TERMINATION_STATUS_STILL_RUNNING)
     context_->process_.Close();
 
   return context_->termination_status_;
 }
 
-void ChildProcessLauncher::SetProcessBackgrounded(bool background) {
+void ChildProcessLauncherImpl::SetProcessBackgrounded(bool background) {
   BrowserThread::PostTask(
       BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
-      base::Bind(
-          &ChildProcessLauncher::Context::SetProcessBackgrounded,
-          GetHandle(), background));
+      base::Bind(&Context::SetProcessBackgrounded, GetHandle(), background));
 }
 
-void ChildProcessLauncher::SetTerminateChildOnShutdown(
+void ChildProcessLauncherImpl::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
   if (context_.get())
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }
 
+scoped_ptr<ChildProcessLauncher> NewChildProcessLauncher(
+#if defined(OS_WIN)
+    SandboxedProcessLauncherDelegate* delegate,
+#elif defined(OS_POSIX)
+    bool use_zygote,
+    const base::EnvironmentVector& environ,
+    int ipcfd,
+#endif
+    CommandLine* cmd_line,
+    int child_process_id,
+    ChildProcessLauncher::Client* client) {
+  return scoped_ptr<ChildProcessLauncher>(new ChildProcessLauncherImpl(
+#if defined(OS_WIN)
+      delegate,
+#elif defined(OS_POSIX)
+      use_zygote,
+      environ,
+      ipcfd,
+#endif
+      cmd_line,
+      child_process_id,
+      client));
+}
+
 }  // namespace content