CommandLine: add a CopySwitchesFrom() for copying from another CommandLine

chrome/test/ui/ui_test.cc

 // Copyright (c) 2010 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 318 matching lines @@
 void UITestBase::StartHttpServer(const FilePath& root_directory) {
   StartHttpServerWithPort(root_directory, L"");
 }
 
 void UITestBase::StartHttpServerWithPort(const FilePath& root_directory,
                                      const std::wstring& port) {
   scoped_ptr<CommandLine> cmd_line(CreateHttpServerCommandLine());
   ASSERT_TRUE(cmd_line.get());
   cmd_line->AppendSwitchWithValue("server", "start");
   cmd_line->AppendSwitch("register_cygwin");
-  cmd_line->AppendSwitchWithValue("root", root_directory.ToWStringHack());
+  cmd_line->AppendSwitchPath("root", root_directory);
 
   // 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 (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7)
     cmd_line->AppendSwitch("run_background");
 #endif
 
   if (!port.empty()) {
@@ skipping 761 matching lines @@
   }
 
   // No first-run dialogs, please.
   command_line.AppendSwitch(switches::kNoFirstRun);
 
   // No default browser check, it would create an info-bar (if we are not the
   // default browser) that could conflicts with some tests expectations.
   command_line.AppendSwitch(switches::kNoDefaultBrowserCheck);
 
   // This is a UI test.
-  command_line.AppendSwitchWithValue(switches::kTestType,
-                                     ASCIIToWide(kUITestType));
+  command_line.AppendSwitchWithValue(switches::kTestType, kUITestType);
 
   // Tell the browser to use a temporary directory just for this test.
-  command_line.AppendSwitchWithValue(switches::kUserDataDir,
-                                     user_data_dir().ToWStringHack());
+  command_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir());
 
   // We need cookies on file:// for things like the page cycler.
   if (enable_file_cookies_)
     command_line.AppendSwitch(switches::kEnableFileCookies);
 
   if (dom_automation_enabled_)
     command_line.AppendSwitch(switches::kDomAutomationController);
 
   if (include_testing_id_) {
     command_line.AppendSwitchWithValue(switches::kTestingChannelID,
-                                       ASCIIToWide(server_->channel_id()));
+                                       server_->channel_id());
   }
 
   if (!show_error_dialogs_ &&
       !CommandLine::ForCurrentProcess()->HasSwitch(kEnableErrorDialogs)) {
     command_line.AppendSwitch(switches::kNoErrorDialogs);
   }
   if (in_process_renderer_)
     command_line.AppendSwitch(switches::kSingleProcess);
   if (no_sandbox_)
     command_line.AppendSwitch(switches::kNoSandbox);
   if (full_memory_dump_)
     command_line.AppendSwitch(switches::kFullMemoryCrashReport);
   if (safe_plugins_)
     command_line.AppendSwitch(switches::kSafePlugins);
   if (enable_dcheck_)
     command_line.AppendSwitch(switches::kEnableDCHECK);
   if (silent_dump_on_dcheck_)
     command_line.AppendSwitch(switches::kSilentDumpOnDCHECK);
   if (disable_breakpad_)
     command_line.AppendSwitch(switches::kDisableBreakpad);
   if (!homepage_.empty())
-    command_line.AppendSwitchWithValue(switches::kHomePage,
-                                       homepage_);
+    command_line.AppendSwitchWithValue(switches::kHomePage, homepage_);
   // Don't try to fetch web resources during UI testing.
   command_line.AppendSwitch(switches::kDisableWebResources);
 
   if (!js_flags_.empty())
-    command_line.AppendSwitchWithValue(switches::kJavaScriptFlags,
-                                       js_flags_);
+    command_line.AppendSwitchWithValue(switches::kJavaScriptFlags, js_flags_);
   if (!log_level_.empty())
     command_line.AppendSwitchWithValue(switches::kLoggingLevel, log_level_);
 
   command_line.AppendSwitch(switches::kMetricsRecordingOnly);
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kEnableErrorDialogs))
     command_line.AppendSwitch(switches::kEnableLogging);
 
   if (dump_histograms_on_exit_)
     command_line.AppendSwitch(switches::kDumpHistogramsOnExit);
 
 #ifdef WAIT_FOR_DEBUGGER_ON_OPEN
   command_line.AppendSwitch(switches::kDebugOnStart);
 #endif
 
   if (!ui_test_name_.empty())
-    command_line.AppendSwitchWithValue(switches::kTestName,
-                                       ui_test_name_);
+    command_line.AppendSwitchWithValue(switches::kTestName, ui_test_name_);
 
   // The tests assume that file:// URIs can freely access other file:// URIs.
   command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
 
   // Disable TabCloseableStateWatcher for tests.
   command_line.AppendSwitch(switches::kDisableTabCloseableStateWatcher);
 
   DebugFlags::ProcessDebugFlags(
       &command_line, ChildProcessInfo::UNKNOWN_PROCESS, false);
   command_line.AppendArguments(arguments, false);
@@ skipping 327 matching lines @@
     set_ui_test_name(ASCIIToWide(test_name));
   }
   UITestBase::SetUp();
   PlatformTest::SetUp();
 }
 
 void UITest::TearDown() {
   UITestBase::TearDown();
   PlatformTest::TearDown();
 }