| Index: content/common/sandbox_win.cc
|
| diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc
|
| index 96bb05c347d61c6a90283ecfb88089cfd3a3166a..26d1601739946cd3c85cc2e65476b641c7621a3a 100644
|
| --- a/content/common/sandbox_win.cc
|
| +++ b/content/common/sandbox_win.cc
|
| @@ -709,8 +709,9 @@ base::Process StartSandboxedProcess(
|
| if (!disable_default_policy && !AddPolicyForSandboxedProcess(policy))
|
| return base::Process();
|
|
|
| - if (type_str == switches::kRendererProcess) {
|
| #if !defined(NACL_WIN64)
|
| + if (type_str == switches::kRendererProcess ||
|
| + type_str == switches::kPpapiPluginProcess) {
|
| if (gfx::win::ShouldUseDirectWrite()) {
|
| AddDirectory(base::DIR_WINDOWS_FONTS,
|
| NULL,
|
| @@ -734,8 +735,10 @@ base::Process StartSandboxedProcess(
|
| base::UintToString(reinterpret_cast<unsigned int>(shared_handle)));
|
| }
|
| }
|
| + }
|
| #endif
|
| - } else {
|
| +
|
| + if (type_str != switches::kRendererProcess) {
|
| // Hack for Google Desktop crash. Trick GD into not injecting its DLL into
|
| // this subprocess. See
|
| // http://code.google.com/p/chromium/issues/detail?id=25580
|
|
|