diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 21:04:15 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 21:04:15 +0000 |
| commit | bdb2b052880db23872869796f4979adceaf5f43a (patch) | |
| tree | 506a93ce2afb26d985f65c255e2966023bf42120 | |
| parent | fc2652479169e0cfda69fb58c8232ed32e86b706 (diff) | |
| download | chromium_src-bdb2b052880db23872869796f4979adceaf5f43a.zip chromium_src-bdb2b052880db23872869796f4979adceaf5f43a.tar.gz chromium_src-bdb2b052880db23872869796f4979adceaf5f43a.tar.bz2 | |
After recent changes (handle passing and RNG) Native Client tests run successfully in the sandbox.
Review URL: http://codereview.chromium.org/316011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29818 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/browser/sandbox_policy.cc | 4 | ||||
| -rw-r--r-- | chrome/test/nacl/nacl_test.cc | 1 |
3 files changed, 2 insertions, 5 deletions
@@ -43,7 +43,7 @@ deps = { "http://v8.googlecode.com/svn/trunk@3093", "src/native_client": - "http://nativeclient.googlecode.com/svn/trunk/src/native_client@893", + "http://nativeclient.googlecode.com/svn/trunk/src/native_client@894", "src/third_party/skia": "http://skia.googlecode.com/svn/trunk@404", diff --git a/chrome/browser/sandbox_policy.cc b/chrome/browser/sandbox_policy.cc index 5c21a67..3c825b0 100644 --- a/chrome/browser/sandbox_policy.cc +++ b/chrome/browser/sandbox_policy.cc @@ -358,10 +358,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 diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc index cf0e742..ced0e51 100644 --- a/chrome/test/nacl/nacl_test.cc +++ b/chrome/test/nacl/nacl_test.cc @@ -25,7 +25,6 @@ static const FilePath::CharType kSrpcHwNexeFileName[] = NaClTest::NaClTest() : UITest() { launch_arguments_.AppendSwitch(switches::kInternalNaCl); - launch_arguments_.AppendSwitch(switches::kNoSandbox); } NaClTest::~NaClTest() {} |