Move V8 snapshot loading code from isolate_holder to gin/v8_startup_data.{h,cc}.

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 33 matching lines @@
 #include "content/utility/in_process_utility_thread.h"
 #include "crypto/nss_util.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_switches.h"
 #include "media/base/media.h"
 #include "sandbox/win/src/sandbox_types.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
-#include "gin/public/isolate_holder.h"
+#include "gin/v8_startup_data.h"
 #endif
 
 #if defined(USE_TCMALLOC)
 #include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
 #if defined(TYPE_PROFILING)
 #include "base/allocator/type_profiler.h"
 #include "base/allocator/type_profiler_tcmalloc.h"
 #endif
 #endif
 
@@ skipping 645 matching lines @@
       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);
       auto v8_snapshot_region = g_fds->GetRegion(kV8SnapshotDataDescriptor);
-      CHECK(gin::IsolateHolder::LoadV8SnapshotFd(
+      CHECK(gin::V8StartupData::LoadV8SnapshotFromFile(
           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::IsolateHolder::LoadV8Snapshot());
+      CHECK(gin::V8StartupData::LoadV8Snapshot());
     }
 #else
-    CHECK(gin::IsolateHolder::LoadV8Snapshot());
+    CHECK(gin::V8StartupData::LoadV8Snapshot());
 #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