diff options
| author | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 23:02:52 +0000 |
|---|---|---|
| committer | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 23:02:52 +0000 |
| commit | 23acfc08defd8db4cd54d91e86593baf47b461ea (patch) | |
| tree | fe9e80355421a03b7fab0bf372834144adf4bd21 /chrome/app/chrome_dll_main.cc | |
| parent | 9d098779ae0342c1bf8db56d0bacbb57c3858215 (diff) | |
| download | chromium_src-23acfc08defd8db4cd54d91e86593baf47b461ea.zip chromium_src-23acfc08defd8db4cd54d91e86593baf47b461ea.tar.gz chromium_src-23acfc08defd8db4cd54d91e86593baf47b461ea.tar.bz2 | |
Set up tests to exercise the chrome outersandbox from the nacl loader.
It is similar to the renderer sandbox tests in that the test code is
separated into a DLL and only loaded based on commandline flags.
Currently tests file open, process creation, and connect.
This is currently not set up for Linux. To set it up for Linux,
we need to be more careful about what tests are expected to pass,
and will need to look into zygote process for how to get the test
shared lib loaded.
BUG=39409
TEST=none
Review URL: http://codereview.chromium.org/1549046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index c51ac67..9e3feb8 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -732,9 +732,11 @@ int ChromeMain(int argc, char** argv) { #if defined(OS_MACOSX) // On OS X the renderer sandbox needs to be initialized later in the startup - // sequence in RendererMainPlatformDelegate::PlatformInitialize(). + // sequence in RendererMainPlatformDelegate::EnableSandbox(). + // Same goes for NaClLoader, in NaClMainPlatformDelegate::EnableSandbox(). if (process_type != switches::kRendererProcess && - process_type != switches::kExtensionProcess) { + process_type != switches::kExtensionProcess && + process_type != switches::kNaClLoaderProcess) { bool sandbox_initialized_ok = sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type); // Die if the sandbox can't be enabled. |