diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 20:55:24 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 20:55:24 +0000 |
| commit | dbd82584da433118de55fb3319be12c4c3536cf2 (patch) | |
| tree | bba6762062c6bff54dce8cadcb2a7d19a7ea19eb /chrome/nacl | |
| parent | 0cc75fe16b6e272176ee8db613ceef0990825bcf (diff) | |
| download | chromium_src-dbd82584da433118de55fb3319be12c4c3536cf2.zip chromium_src-dbd82584da433118de55fb3319be12c4c3536cf2.tar.gz chromium_src-dbd82584da433118de55fb3319be12c4c3536cf2.tar.bz2 | |
Load mac sandbox definitions from resources instead of the bundle.
Also, move all mac sandbox unittests to content
BUG=90443
TEST=content_unittests
Review URL: http://codereview.chromium.org/8589001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
| -rw-r--r-- | chrome/nacl/nacl_main_platform_delegate_mac.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/nacl/nacl_main_platform_delegate_mac.mm b/chrome/nacl/nacl_main_platform_delegate_mac.mm index 6e3121e..b818ce7 100644 --- a/chrome/nacl/nacl_main_platform_delegate_mac.mm +++ b/chrome/nacl/nacl_main_platform_delegate_mac.mm @@ -9,6 +9,7 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/native_library.h" +#include "chrome/common/chrome_sandbox_type_mac.h" #include "chrome/common/chrome_switches.h" #include "content/common/sandbox_mac.h" #include "content/public/common/sandbox_init.h" @@ -55,8 +56,8 @@ void NaClMainPlatformDelegate::InitSandboxTests(bool no_sandbox) { } void NaClMainPlatformDelegate::EnableSandbox() { - CHECK(content::InitializeSandbox()) << "Error initializing sandbox for " - << switches::kNaClLoaderProcess; + CHECK(content::InitializeSandbox(CHROME_SANDBOX_TYPE_NACL_LOADER, FilePath())) + << "Error initializing sandbox for " << switches::kNaClLoaderProcess; } bool NaClMainPlatformDelegate::RunSandboxTests() { |