diff options
Diffstat (limited to 'chrome/common/sandbox_policy.cc')
| -rw-r--r-- | chrome/common/sandbox_policy.cc | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/chrome/common/sandbox_policy.cc b/chrome/common/sandbox_policy.cc index a79a962..9e70b08 100644 --- a/chrome/common/sandbox_policy.cc +++ b/chrome/common/sandbox_policy.cc @@ -23,13 +23,6 @@ #include "sandbox/src/sandbox.h" #include "webkit/glue/plugins/plugin_list.h" -#ifdef NACL_WIN64 - // The sandbox can be used also by the NaCl broker process. In this case we - // define a global variable g_broker_services instead of g_browser_process. - // This can be changed if we discover that the broker process needs to be more - // similar to the browser process. - extern sandbox::BrokerServices* g_broker_services; -#endif namespace { // The DLLs listed here are known (or under strong suspicion) of causing crashes @@ -349,12 +342,10 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, type = ChildProcessInfo::PLUGIN_PROCESS; } else if (type_str == switches::kWorkerProcess) { type = ChildProcessInfo::WORKER_PROCESS; - } else if (type_str == switches::kNaClLoaderProcess) { - type = ChildProcessInfo::NACL_LOADER_PROCESS; + } else if (type_str == switches::kNaClProcess) { + type = ChildProcessInfo::NACL_PROCESS; } else if (type_str == switches::kUtilityProcess) { type = ChildProcessInfo::UTILITY_PROCESS; - } else if (type_str == switches::kNaClBrokerProcess) { - type = ChildProcessInfo::NACL_BROKER_PROCESS; } else if (type_str == switches::kGpuProcess) { type = ChildProcessInfo::GPU_PROCESS; } else { @@ -388,15 +379,10 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, return process; } -#ifdef NACL_WIN64 - // When running in the broker we get the BrokerServices pointer from a global - // variable. It is initialized in NaClBrokerMain. - sandbox::BrokerServices* broker_service = g_broker_services; -#else // spawn the child process in the sandbox sandbox::BrokerServices* broker_service = g_browser_process->broker_services(); -#endif + sandbox::ResultCode result; PROCESS_INFORMATION target = {0}; sandbox::TargetPolicy* policy = broker_service->CreatePolicy(); |