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

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 109 matching lines @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/common/web_preferences.h"
-#include "gin/public/isolate_holder.h"
+#include "gin/v8_startup_data.h"
 #include "net/base/mime_util.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 
@@ skipping 2205 matching lines @@
 }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
     FileDescriptorInfo* mappings) {
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
   if (v8_snapshot_fd_.get() == -1 && v8_natives_fd_.get() == -1) {
     base::FilePath v8_data_path;
-    PathService::Get(gin::IsolateHolder::kV8SnapshotBasePathKey, &v8_data_path);
+    PathService::Get(gin::V8StartupData::kV8SnapshotBasePathKey, &v8_data_path);
     DCHECK(!v8_data_path.empty());
 
     int file_flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
     base::FilePath v8_natives_data_path =
-        v8_data_path.AppendASCII(gin::IsolateHolder::kNativesFileName);
+        v8_data_path.AppendASCII(gin::V8StartupData::kNativesFileName);
     base::FilePath v8_snapshot_data_path =
-        v8_data_path.AppendASCII(gin::IsolateHolder::kSnapshotFileName);
+        v8_data_path.AppendASCII(gin::V8StartupData::kSnapshotFileName);
     base::File v8_natives_data_file(v8_natives_data_path, file_flags);
     base::File v8_snapshot_data_file(v8_snapshot_data_path, file_flags);
     DCHECK(v8_natives_data_file.IsValid());
     DCHECK(v8_snapshot_data_file.IsValid());
     v8_natives_fd_.reset(v8_natives_data_file.TakePlatformFile());
     v8_snapshot_fd_.reset(v8_snapshot_data_file.TakePlatformFile());
   }
   mappings->Share(kV8NativesDataDescriptor, v8_natives_fd_.get());
   mappings->Share(kV8SnapshotDataDescriptor, v8_snapshot_fd_.get());
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
@@ skipping 208 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome