Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(321)

Unified Diff: chrome/test/nacl/nacl_sandbox_test.cc

Issue 3012021: CommandLine: add a CopySwitchesFrom() for copying from another CommandLine (Closed)
Patch Set: minor cleanups Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/memory_test/memory_test.cc ('k') | chrome/test/page_cycler/page_cycler_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/nacl/nacl_sandbox_test.cc
diff --git a/chrome/test/nacl/nacl_sandbox_test.cc b/chrome/test/nacl/nacl_sandbox_test.cc
index 41aa97a47d5cdc9296a207bb780e26ebace0ec57..25174031862898c1279f31b7a2beaa1765ca6c18 100644
--- a/chrome/test/nacl/nacl_sandbox_test.cc
+++ b/chrome/test/nacl/nacl_sandbox_test.cc
@@ -18,18 +18,16 @@ const FilePath::CharType kSrpcHwHtmlFileName[] =
NaClSandboxTest::NaClSandboxTest() : NaClTest() {
// Append the --test-nacl-sandbox=$TESTDLL flag before launching.
- FilePath dylibDir;
- PathService::Get(base::DIR_EXE, &dylibDir);
+ FilePath dylib_dir;
+ PathService::Get(base::DIR_EXE, &dylib_dir);
#if defined(OS_MACOSX)
- dylibDir = dylibDir.AppendASCII("libnacl_security_tests.dylib");
- launch_arguments_.AppendSwitchWithValue(switches::kTestNaClSandbox,
- dylibDir.value());
+ dylib_dir = dylib_dir.AppendASCII("libnacl_security_tests.dylib");
+ launch_arguments_.AppendSwitchPath(switches::kTestNaClSandbox, dylib_dir);
#elif defined(OS_WIN)
// Let the NaCl process detect if it is 64-bit or not and hack on
// the appropriate suffix to this dll.
- dylibDir = dylibDir.AppendASCII("nacl_security_tests");
- launch_arguments_.AppendSwitchWithValue(switches::kTestNaClSandbox,
- dylibDir.value());
+ dylib_dir = dylib_dir.AppendASCII("nacl_security_tests");
+ launch_arguments_.AppendSwitchPath(switches::kTestNaClSandbox, dylib_dir);
#elif defined(OS_LINUX)
// We currently do not test the Chrome Linux SUID or seccomp sandboxes.
#endif
« no previous file with comments | « chrome/test/memory_test/memory_test.cc ('k') | chrome/test/page_cycler/page_cycler_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698