3 files changed, 30 insertions, 21 deletions
diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
index 2372f73..4bfc981 100644
--- a/chrome/test/live_sync/live_sync_test.cc
+++ b/chrome/test/live_sync/live_sync_test.cc
@@ -401,14 +401,10 @@ bool LiveSyncTest::SetUpLocalTestServer() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   CommandLine::StringType server_cmdline_string = cl->GetSwitchValueNative(
       switches::kSyncServerCommandLine);
-#if defined(OS_WIN)
-  CommandLine server_cmdline = CommandLine::FromString(server_cmdline_string);
-#else
-  std::vector<std::string> server_cmdline_vector;
-  std::string delimiters(" ");
+  CommandLine::StringVector server_cmdline_vector;
+  CommandLine::StringType delimiters(FILE_PATH_LITERAL(" "));
   Tokenize(server_cmdline_string, delimiters, &server_cmdline_vector);
   CommandLine server_cmdline(server_cmdline_vector);
-#endif
   if (!base::LaunchApp(server_cmdline, false, true, &test_server_handle_))
     LOG(ERROR) << "Could not launch local test server.";
 
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index f30fdc1..0eca725 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -521,6 +521,8 @@ ProxyLauncher* UITest::CreateProxyLauncher() {
 }
 
 static CommandLine* CreatePythonCommandLine() {
+  // Note: Python's first argument must be the script; do not append CommandLine
+  // switches, as they would precede the script path and break this CommandLine.
   return new CommandLine(FilePath(FILE_PATH_LITERAL("python")));
 }
 
@@ -547,11 +549,13 @@ void UITest::StartHttpServer(const FilePath& root_directory) {
 
 void UITest::StartHttpServerWithPort(const FilePath& root_directory,
                                      int port) {
+  // Append CommandLine arguments after the server script, switches won't work.
   scoped_ptr<CommandLine> cmd_line(CreateHttpServerCommandLine());
   ASSERT_TRUE(cmd_line.get());
-  cmd_line->AppendSwitchASCII("server", "start");
-  cmd_line->AppendSwitch("register_cygwin");
-  cmd_line->AppendSwitchPath("root", root_directory);
+  cmd_line->AppendArg("--server=start");
+  cmd_line->AppendArg("--register_cygwin");
+  cmd_line->AppendArgNative(FILE_PATH_LITERAL("--root=") +
+                            root_directory.value());
 
   FilePath layout_tests_dir;
   PathService::Get(base::DIR_SOURCE_ROOT, &layout_tests_dir);
@@ -560,18 +564,19 @@ void UITest::StartHttpServerWithPort(const FilePath& root_directory,
                                      .AppendASCII("data")
                                      .AppendASCII("layout_tests")
                                      .AppendASCII("LayoutTests");
-  cmd_line->AppendSwitchPath("layout_tests_dir", layout_tests_dir);
+  cmd_line->AppendArgNative(FILE_PATH_LITERAL("--layout_tests_dir=") +
+                            layout_tests_dir.value());
 
   // For Windows 7, if we start the lighttpd server on the foreground mode,
   // it will mess up with the command window and cause conhost.exe to crash. To
   // work around this, we start the http server on the background mode.
 #if defined(OS_WIN)
   if (base::win::GetVersion() >= base::win::VERSION_WIN7)
-    cmd_line->AppendSwitch("run_background");
+    cmd_line->AppendArg("--run_background");
 #endif
 
   if (port)
-    cmd_line->AppendSwitchASCII("port", base::IntToString(port));
+    cmd_line->AppendArg("--port=" + base::IntToString(port));
 
 #if defined(OS_WIN)
   // TODO(phajdan.jr): is this needed?
@@ -585,9 +590,10 @@ void UITest::StartHttpServerWithPort(const FilePath& root_directory,
 }
 
 void UITest::StopHttpServer() {
+  // Append CommandLine arguments after the server script, switches won't work.
   scoped_ptr<CommandLine> cmd_line(CreateHttpServerCommandLine());
   ASSERT_TRUE(cmd_line.get());
-  cmd_line->AppendSwitchASCII("server", "stop");
+  cmd_line->AppendArg("--server=stop");
 
 #if defined(OS_WIN)
   // TODO(phajdan.jr): is this needed?
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index e7c84aa..77ce4ff 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -750,17 +750,20 @@ TestWebSocketServer::TestWebSocketServer() : started_(false) {
 bool TestWebSocketServer::Start(const FilePath& root_directory) {
   if (started_)
     return true;
+  // Append CommandLine arguments after the server script, switches won't work.
   scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
-  cmd_line->AppendSwitchASCII("server", "start");
-  cmd_line->AppendSwitch("chromium");
-  cmd_line->AppendSwitch("register_cygwin");
-  cmd_line->AppendSwitchPath("root", root_directory);
+  cmd_line->AppendArg("--server=start");
+  cmd_line->AppendArg("--chromium");
+  cmd_line->AppendArg("--register_cygwin");
+  cmd_line->AppendArgNative(FILE_PATH_LITERAL("--root=") +
+                            root_directory.value());
   if (!temp_dir_.CreateUniqueTempDir()) {
     LOG(ERROR) << "Unable to create a temporary directory.";
     return false;
   }
   websocket_pid_file_ = temp_dir_.path().AppendASCII("websocket.pid");
-  cmd_line->AppendSwitchPath("pidfile", websocket_pid_file_);
+  cmd_line->AppendArgNative(FILE_PATH_LITERAL("--pidfile=") +
+                            websocket_pid_file_.value());
   SetPythonPath();
   if (!base::LaunchApp(*cmd_line.get(), true, false, NULL)) {
     LOG(ERROR) << "Unable to launch websocket server.";
@@ -771,6 +774,8 @@ bool TestWebSocketServer::Start(const FilePath& root_directory) {
 }
 
 CommandLine* TestWebSocketServer::CreatePythonCommandLine() {
+  // Note: Python's first argument must be the script; do not append CommandLine
+  // switches, as they would precede the script path and break this CommandLine.
   return new CommandLine(FilePath(FILE_PATH_LITERAL("python")));
 }
 
@@ -806,10 +811,12 @@ CommandLine* TestWebSocketServer::CreateWebSocketServerCommandLine() {
 TestWebSocketServer::~TestWebSocketServer() {
   if (!started_)
     return;
+  // Append CommandLine arguments after the server script, switches won't work.
   scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
-  cmd_line->AppendSwitchASCII("server", "stop");
-  cmd_line->AppendSwitch("chromium");
-  cmd_line->AppendSwitchPath("pidfile", websocket_pid_file_);
+  cmd_line->AppendArg("--server=stop");
+  cmd_line->AppendArg("--chromium");
+  cmd_line->AppendArgNative(FILE_PATH_LITERAL("--pidfile=") +
+                            websocket_pid_file_.value());
   base::LaunchApp(*cmd_line.get(), true, false, NULL);
 }