diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/sandbox_init_mac.cc | 3 | ||||
| -rw-r--r-- | content/common/sandbox_policy.cc | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/content/common/sandbox_init_mac.cc b/content/common/sandbox_init_mac.cc index e39667b..86cf9e6 100644 --- a/content/common/sandbox_init_mac.cc +++ b/content/common/sandbox_init_mac.cc @@ -52,7 +52,8 @@ bool InitializeSandbox() { } else if (process_type == switches::kGpuProcess) { sandbox_process_type = Sandbox::SANDBOX_TYPE_GPU; } else if ((process_type == switches::kPluginProcess) || - (process_type == switches::kServiceProcess)) { + (process_type == switches::kServiceProcess) || + (process_type == switches::kPpapiBrokerProcess)) { return true; } else if (process_type == switches::kPpapiPluginProcess) { sandbox_process_type = Sandbox::SANDBOX_TYPE_PPAPI; diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc index 1153a30c..3d839a7 100644 --- a/content/common/sandbox_policy.cc +++ b/content/common/sandbox_policy.cc @@ -402,6 +402,8 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, type = ChildProcessInfo::GPU_PROCESS; } else if (type_str == switches::kPpapiPluginProcess) { type = ChildProcessInfo::PPAPI_PLUGIN_PROCESS; + } else if (type_str == switches::kPpapiBrokerProcess) { + type = ChildProcessInfo::PPAPI_BROKER_PROCESS; } else { NOTREACHED(); return 0; @@ -414,7 +416,8 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, // process are sandboxed by default. bool in_sandbox = (type != ChildProcessInfo::NACL_BROKER_PROCESS) && - (type != ChildProcessInfo::PLUGIN_PROCESS); + (type != ChildProcessInfo::PLUGIN_PROCESS) && + (type != ChildProcessInfo::PPAPI_BROKER_PROCESS); // If it is the GPU process then it can be disabled by a command line flag. if ((type == ChildProcessInfo::GPU_PROCESS) && |