CommandLine refactoring and cleanup.

chrome/test/ui/ui_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
@@ skipping 503 matching lines @@
 }
 
 ProxyLauncher* UITest::CreateProxyLauncher() {
   // Make the AutomationProxy disconnect the channel on the first error,
   // so that we avoid spending a lot of time in timeouts. The browser is likely
   // hosed if we hit those errors.
   return new AnonymousProxyLauncher(true);
 }
 
 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")));
 }
 
 static CommandLine* CreateHttpServerCommandLine() {
   FilePath src_path;
   // Get to 'src' dir.
   PathService::Get(base::DIR_SOURCE_ROOT, &src_path);
 
   FilePath script_path(src_path);
   script_path = script_path.AppendASCII("third_party");
   script_path = script_path.AppendASCII("WebKit");
   script_path = script_path.AppendASCII("Tools");
   script_path = script_path.AppendASCII("Scripts");
   script_path = script_path.AppendASCII("new-run-webkit-httpd");
 
   CommandLine* cmd_line = CreatePythonCommandLine();
   cmd_line->AppendArgPath(script_path);
   return cmd_line;
 }
 
 void UITest::StartHttpServer(const FilePath& root_directory) {
   StartHttpServerWithPort(root_directory, 0);
 }
 
 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);
   layout_tests_dir = layout_tests_dir.AppendASCII("chrome")
                                      .AppendASCII("test")
                                      .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?
   base::LaunchAppWithHandleInheritance(cmd_line->command_line_string(),
                                        true,
                                        false,
                                        NULL);
 #else
   base::LaunchApp(*cmd_line.get(), true, false, NULL);
 #endif
 }
 
 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?
   base::LaunchAppWithHandleInheritance(cmd_line->command_line_string(),
                                        true,
                                        false,
                                        NULL);
 #else
   base::LaunchApp(*cmd_line.get(), true, false, NULL);
 #endif
@@ skipping 237 matching lines @@
     base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms() / kCycles);
   }
 
   LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF()
             << " seconds"
             << " call failed " << fail_count << " times"
             << " state was incorrect " << incorrect_state_count << " times";
   ADD_FAILURE() << "Timeout reached in " << __FUNCTION__;
   return false;
 }