Index: content/browser/child_process_launcher.cc |
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc |
index 5a655368aa8bac219446a3ea3586a4c7b6eb7666..0d640fae6ab95d3e10951a73f1b615b1a849df03 100644 |
--- a/content/browser/child_process_launcher.cc |
+++ b/content/browser/child_process_launcher.cc |
@@ -259,7 +259,10 @@ void LaunchOnLauncherThread(const NotifyCallback& callback, |
// child termination. |
#if !defined(OS_MACOSX) |
- ZygoteHandle* zygote_handle = delegate->GetZygote(); |
+ ZygoteHandle* zygote_handle = |
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) |
+ ? delegate->GetZygote() |
+ : nullptr; |
// If |zygote_handle| is null, a zygote should not be used. |
if (zygote_handle) { |
// This code runs on the PROCESS_LAUNCHER thread so race conditions are not |