From 63c8147ea589679a57838cfe721f8af5d7271a21 Mon Sep 17 00:00:00 2001
From: "gregoryd@google.com"
<gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 28 Sep 2009 20:45:32 +0000
Subject: Revert 27397 - First step towards NaClChrome integration:1. NaCl
plugin becomes a builtin plugin in Chrome and runs in the renderer process.2.
Most of the changes are related to launching the NaCl process (that loads and
runs the NaCl module) and establishing the initial communication between that
process and the NaCl plugin.3. Command line flag "internalnacl" is required
to enable the builtin NaCl plugin. NaCl still cannot run in Chrome sandbox,
the flag automatically disables the sandboxCommitted:
http://src.chromium.org/viewvc/chrome?view=rev&revision=27315
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=27324
Review URL: http://codereview.chromium.org/153002
TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/235042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27400 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/browser/sandbox_policy.cc | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
(limited to 'chrome/browser/sandbox_policy.cc')
diff --git a/chrome/browser/sandbox_policy.cc b/chrome/browser/sandbox_policy.cc
index 784e5a7..13f4ee2 100644
--- a/chrome/browser/sandbox_policy.cc
+++ b/chrome/browser/sandbox_policy.cc
@@ -359,8 +359,6 @@ 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::kNaClProcess) {
- type = ChildProcessInfo::NACL_PROCESS;
} else if (type_str == switches::kUtilityProcess) {
type = ChildProcessInfo::UTILITY_PROCESS;
} else {
@@ -373,10 +371,8 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
(type != ChildProcessInfo::PLUGIN_PROCESS ||
browser_command_line.HasSwitch(switches::kSafePlugins));
#if !defined (GOOGLE_CHROME_BUILD)
- if (browser_command_line.HasSwitch(switches::kInProcessPlugins) ||
- browser_command_line.HasSwitch(switches::kInternalNaCl)) {
+ if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) {
// In process plugins won't work if the sandbox is enabled.
- // The internal NaCl plugin doesn't work in the sandbox for now.
in_sandbox = false;
}
#endif
@@ -398,8 +394,6 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line,
sandbox::TargetPolicy* policy = broker_service->CreatePolicy();
bool on_sandbox_desktop = false;
- // TODO(gregoryd): try locked-down policy for sel_ldr after we fix IMC.
- // TODO(gregoryd): do we need a new desktop for sel_ldr?
if (type == ChildProcessInfo::PLUGIN_PROCESS) {
if (!AddPolicyForPlugin(cmd_line, policy))
return 0;
--
cgit v1.1