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..94c47172b2cfcd935e4037ab2e36ebf59ba5c116 100644 |
--- a/content/ppapi_plugin/ppapi_plugin_main.cc |
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc |
@@ -29,7 +29,7 @@ |
#include "base/win/win_util.h" |
#include "base/win/windows_version.h" |
#include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h" |
-#include "sandbox/win/src/sandbox.h" |
+#include "content/child/font_warmup_win.h" |
#include "third_party/WebKit/public/web/win/WebFontRendering.h" |
#include "third_party/skia/include/ports/SkTypeface_win.h" |
#include "ui/gfx/win/direct_write.h" |
@@ -48,11 +48,7 @@ |
#include <stdlib.h> |
#endif |
-#if defined(OS_WIN) |
-sandbox::TargetServices* g_target_services = NULL; |
-#else |
void* g_target_services = 0; |
-#endif |
namespace content { |
@@ -72,10 +68,6 @@ void SkiaPreCacheFont(const LOGFONT& logfont) { |
int PpapiPluginMain(const MainFunctionParams& parameters) { |
const base::CommandLine& command_line = parameters.command_line; |
-#if defined(OS_WIN) |
- g_target_services = parameters.sandbox_info->target_services; |
-#endif |
- |
// If |g_target_services| is not null this process is sandboxed. One side |
// effect is that we can't pop dialogs like ChildProcess::WaitForDebugger() |
// does. |