diff options
Diffstat (limited to 'chromium/components/nacl/common')
-rw-r--r-- | chromium/components/nacl/common/nacl_cmd_line.cc | 1 | ||||
-rw-r--r-- | chromium/components/nacl/common/nacl_switches.cc | 3 | ||||
-rw-r--r-- | chromium/components/nacl/common/nacl_switches.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/chromium/components/nacl/common/nacl_cmd_line.cc b/chromium/components/nacl/common/nacl_cmd_line.cc index d9bbd6557f4..b21a671ae1d 100644 --- a/chromium/components/nacl/common/nacl_cmd_line.cc +++ b/chromium/components/nacl/common/nacl_cmd_line.cc @@ -18,6 +18,7 @@ void CopyNaClCommandLineArguments(CommandLine* cmd_line) { // TODO(gregoryd): check which flags of those below can be supported. static const char* const kSwitchNames[] = { switches::kNoSandbox, + switches::kTestNaClSandbox, switches::kDisableBreakpad, switches::kFullMemoryCrashReport, switches::kEnableLogging, diff --git a/chromium/components/nacl/common/nacl_switches.cc b/chromium/components/nacl/common/nacl_switches.cc index 0dfdc949857..b9db537b252 100644 --- a/chromium/components/nacl/common/nacl_switches.cc +++ b/chromium/components/nacl/common/nacl_switches.cc @@ -36,4 +36,7 @@ const char kNaClLoaderCmdPrefix[] = "nacl-loader-cmd-prefix"; // Causes the process to run as a NativeClient loader. const char kNaClLoaderProcess[] = "nacl-loader"; +// Runs the security test for the NaCl loader sandbox. +const char kTestNaClSandbox[] = "test-nacl-sandbox"; + } // namespace switches diff --git a/chromium/components/nacl/common/nacl_switches.h b/chromium/components/nacl/common/nacl_switches.h index 9bc1bcb4697..8b12206a21a 100644 --- a/chromium/components/nacl/common/nacl_switches.h +++ b/chromium/components/nacl/common/nacl_switches.h @@ -18,6 +18,7 @@ extern const char kNaClGdb[]; extern const char kNaClGdbScript[]; extern const char kNaClLoaderCmdPrefix[]; extern const char kNaClLoaderProcess[]; +extern const char kTestNaClSandbox[]; } // namespace switches |