Allow startup with missing V8 snapshot file.

content/app/content_main_runner.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/public/app/content_main_runner.h"
 
 #include <stdlib.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
@@ skipping 710 matching lines @@
           kV8NativesDataDescriptor + base::GlobalDescriptors::kBaseDescriptor);
     }
     if (command_line.HasSwitch(switches::kV8SnapshotPassedByFD)) {
       g_fds->Set(
           kV8SnapshotDataDescriptor,
           kV8SnapshotDataDescriptor + base::GlobalDescriptors::kBaseDescriptor);
     }
 #endif  // !OS_ANDROID
     int v8_natives_fd = g_fds->MaybeGet(kV8NativesDataDescriptor);
     int v8_snapshot_fd = g_fds->MaybeGet(kV8SnapshotDataDescriptor);
-    if (v8_natives_fd != -1 && v8_snapshot_fd != -1) {
-      auto v8_natives_region = g_fds->GetRegion(kV8NativesDataDescriptor);
+    if (v8_snapshot_fd != -1) {
       auto v8_snapshot_region = g_fds->GetRegion(kV8SnapshotDataDescriptor);
       CHECK(gin::V8Initializer::LoadV8SnapshotFromFD(
-          v8_natives_fd, v8_natives_region.offset, v8_natives_region.size,
           v8_snapshot_fd, v8_snapshot_region.offset, v8_snapshot_region.size));
     } else {
-      CHECK(gin::V8Initializer::LoadV8Snapshot());
+      gin::V8Initializer::LoadV8Snapshot();
+    }
+    if (v8_natives_fd != -1) {
+      auto v8_natives_region = g_fds->GetRegion(kV8NativesDataDescriptor);
+      CHECK(gin::V8Initializer::LoadV8SnapshotFromFD(
+          v8_natives_fd, v8_natives_region.offset, v8_natives_region.size));
+    } else {
+      CHECK(gin::V8Initializer::LoadV8Natives());
     }
 #else
-    CHECK(gin::V8Initializer::LoadV8Snapshot());
+    gin::V8Initializer::LoadV8Snapshot();

[rmcilroy, 2015/06/01 14:06:31]

Maybe we should make it obvious from the function name that this is OK to fail?
Or maybe just return true if it fails in a way we expect (i.e., file is not
available) and only return false for unexpected errors (e.g., map errors on a
file which exists? Then you could CHECK it everytime?

[Erik Corry Chromium.org, 2015/06/02 11:18:52]

Not sure I want to CHECK it.  Lets say it's there, but can't be mapped or
verified.  I think it's more helpful to log it in UMA and carry on.

[rmcilroy, 2015/06/02 11:27:07]

As discussed below, let's get rid of the return values.

+    CHECK(gin::V8Initializer::LoadV8Natives());
 #endif  // OS_POSIX && !OS_MACOSX
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 
     if (delegate_)
       delegate_->PreSandboxStartup();
 
     if (!process_type.empty())
       CommonSubprocessInit(process_type);
 
 #if defined(OS_WIN)
@@ skipping 95 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content