| Index: content/browser/child_process_launcher.cc
|
| diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
|
| index cb7d0315dce12fe3ac9acfad0800e833a78ae163..bfcc61e2296f4649b8288665633f7057821004b4 100644
|
| --- a/content/browser/child_process_launcher.cc
|
| +++ b/content/browser/child_process_launcher.cc
|
| @@ -14,6 +14,7 @@
|
| #include "base/process_util.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/thread.h"
|
| +#include "chrome/common/chrome_switches.h"
|
| #include "content/common/chrome_descriptors.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| @@ -48,12 +49,13 @@ class ChildProcessLauncher::Context
|
| client_thread_id_(BrowserThread::UI),
|
| termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
|
| exit_code_(content::RESULT_CODE_NORMAL_EXIT),
|
| - starting_(true),
|
| - terminate_child_on_shutdown_(true)
|
| + starting_(true)
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| , zygote_(false)
|
| #endif
|
| {
|
| + terminate_child_on_shutdown_ = !CommandLine::ForCurrentProcess()->
|
| + HasSwitch(switches::kEnableRendererCleanExit);
|
| }
|
|
|
| void Launch(
|
|
|