1 files changed, 15 insertions, 8 deletions
diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc
index 19f0547b..957b830 100644
--- a/extensions/shell/browser/shell_content_browser_client.cc
+++ b/extensions/shell/browser/shell_content_browser_client.cc
@@ -200,21 +200,26 @@ void ShellContentBrowserClient::SiteInstanceDeleting(
                  site_instance->GetId()));
 }
 
-void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
-    base::CommandLine* command_line,
-    int child_process_id) {
+void ShellContentBrowserClient::AppendMappedFileCommandLineSwitches(
+    base::CommandLine* command_line) {
   std::string process_type =
       command_line->GetSwitchValueASCII(::switches::kProcessType);
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-  if (process_type != ::switches::kZygoteProcess) {
-    command_line->AppendSwitch(::switches::kV8NativesPassedByFD);
+  DCHECK(natives_fd_exists());
+  command_line->AppendSwitch(::switches::kV8NativesPassedByFD);
+  if (snapshot_fd_exists())
     command_line->AppendSwitch(::switches::kV8SnapshotPassedByFD);
-  }
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 #endif  // OS_POSIX && !OS_MACOSX
+}
 
+void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
+    base::CommandLine* command_line,
+    int child_process_id) {
+  std::string process_type =
+      command_line->GetSwitchValueASCII(::switches::kProcessType);
   if (process_type == ::switches::kRendererProcess)
     AppendRendererSwitches(command_line);
 }
@@ -255,7 +260,7 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     int child_process_id,
     content::FileDescriptorInfo* mappings) {
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-  if (v8_natives_fd_.get() == -1 || v8_snapshot_fd_.get() == -1) {
+  if (!natives_fd_exists()) {
     int v8_natives_fd = -1;
     int v8_snapshot_fd = -1;
     if (gin::V8Initializer::OpenV8FilesForChildProcesses(&v8_natives_fd,
@@ -264,7 +269,9 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
       v8_snapshot_fd_.reset(v8_snapshot_fd);
     }
   }
-  DCHECK(v8_natives_fd_.get() != -1 && v8_snapshot_fd_.get() != -1);
+  // V8 can't start up without the source of the natives, but it can
+  // start up (slower) without the snapshot.
+  DCHECK(natives_fd_exists());
   mappings->Share(kV8NativesDataDescriptor, v8_natives_fd_.get());
   mappings->Share(kV8SnapshotDataDescriptor, v8_snapshot_fd_.get());
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA