| Index: content/shell/browser/shell_content_browser_client.cc
|
| diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
|
| index 90cc70cfd2a1e47d4c3096abfa2a8dc017a69b43..ad4a186d150cfae54cd9156bf9c1febe508e8b8b 100644
|
| --- a/content/shell/browser/shell_content_browser_client.cc
|
| +++ b/content/shell/browser/shell_content_browser_client.cc
|
| @@ -34,7 +34,7 @@
|
| #include "content/shell/common/shell_messages.h"
|
| #include "content/shell/common/shell_switches.h"
|
| #include "content/shell/common/webkit_test_helpers.h"
|
| -#include "gin/public/isolate_holder.h"
|
| +#include "gin/v8_initializer.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -354,14 +354,14 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
| #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::V8Initializer::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::V8Initializer::kNativesFileName);
|
| base::FilePath v8_snapshot_data_path =
|
| - v8_data_path.AppendASCII(gin::IsolateHolder::kSnapshotFileName);
|
| + v8_data_path.AppendASCII(gin::V8Initializer::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());
|
|
|