Index: content/ppapi_plugin/ppapi_plugin_main.cc |
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc |
index fccb830e7cbbfdfbbc527e3bbb9ae73fa09a6ae0..ccd05e9111bf7790718ece5dde9e7fa80bf6b49f 100644 |
--- a/content/ppapi_plugin/ppapi_plugin_main.cc |
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc |
@@ -19,7 +19,6 @@ |
#include "content/public/common/content_client.h" |
#include "content/public/common/content_switches.h" |
#include "content/public/common/main_function_params.h" |
-#include "content/public/plugin/content_plugin_client.h" |
#include "ipc/ipc_sender.h" |
#include "ppapi/proxy/plugin_globals.h" |
#include "ppapi/proxy/proxy_module.h" |
@@ -44,6 +43,10 @@ |
#include "content/public/common/sandbox_init.h" |
#endif |
+#ifdef V8_USE_EXTERNAL_STARTUP_DATA |
+#include "gin/v8_initializer.h" |
+#endif |
+ |
#if defined(OS_POSIX) && !defined(OS_ANDROID) |
#include <stdlib.h> |
#endif |
@@ -122,10 +125,10 @@ int PpapiPluginMain(const MainFunctionParams& parameters) { |
base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex( |
kTraceEventPpapiProcessSortIndex); |
- // Allow the embedder to perform any necessary per-process initialization |
- // before the sandbox is initialized. |
- if (GetContentClient()->plugin()) |
- GetContentClient()->plugin()->PreSandboxInitialization(); |
+#ifdef V8_USE_EXTERNAL_STARTUP_DATA |
+ gin::V8Initializer::LoadV8Snapshot(); |
+ gin::V8Initializer::LoadV8Natives(); |
+#endif |
#if defined(OS_LINUX) |
LinuxSandbox::InitializeSandbox(); |