Revert 86532 - Revert 86517 - Don't terminate plugin processes from the browser during browser sh...

content/browser/child_process_launcher.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/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 26 matching lines @@
 
 // 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> {
  public:
   Context()
       : client_(NULL),
         client_thread_id_(BrowserThread::UI),
-        starting_(true)
+        starting_(true),
+        terminate_child_on_shutdown_(true)
 #if defined(OS_LINUX)
         , zygote_(false)
 #endif
         {
   }
 
   void Launch(
 #if defined(OS_WIN)
       const FilePath& exposed_dir,
 #elif defined(OS_POSIX)
@@ skipping 22 matching lines @@
             cmd_line));
   }
 
   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;
 
   ~Context() {
     Terminate();
   }
 
   void LaunchInternal(
 #if defined(OS_WIN)
@@ skipping 103 matching lines @@
       client_->OnProcessLaunched();
     } else {
       Terminate();
     }
   }
 
   void Terminate() {
     if (!process_.handle())
       return;
 
+    if (!terminate_child_on_shutdown_)
+      return;
+
     // On Posix, EnsureProcessTerminated can lead to 2 seconds of sleep!  So
     // don't this on the UI/IO threads.
     BrowserThread::PostTask(
         BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
         NewRunnableFunction(
             &ChildProcessLauncher::Context::TerminateInternal,
 #if defined(OS_LINUX)
             zygote_,
 #endif
             process_.handle()));
@@ skipping 27 matching lines @@
       ProcessWatcher::EnsureProcessTerminated(handle);
     }
 #endif  // OS_POSIX
     process.Close();
   }
 
   Client* client_;
   BrowserThread::ID client_thread_id_;
   base::Process process_;
   bool starting_;
+  // Controls whether the child process should be terminated on browser
+  // shutdown. Default behavior is to terminate the child.
+  bool terminate_child_on_shutdown_;
 
 #if defined(OS_LINUX)
   bool zygote_;
 #endif
 };
 
 
 ChildProcessLauncher::ChildProcessLauncher(
 #if defined(OS_WIN)
     const FilePath& exposed_dir,
@@ skipping 56 matching lines @@
 }
 
 void ChildProcessLauncher::SetProcessBackgrounded(bool background) {
   BrowserThread::PostTask(
       BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
       NewRunnableMethod(
           context_.get(),
           &ChildProcessLauncher::Context::SetProcessBackgrounded,
           background));
 }
+
+void ChildProcessLauncher::SetTerminateChildOnShutdown(
+  bool terminate_on_shutdown) {
+  if (context_)
+    context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
+}
+