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

chrome/test/in_process_browser_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/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 117 matching lines @@
   if (!command_line->HasSwitch(kUnitTestShowWindows) && !show_window_)
     BrowserView::SetShowState(SW_HIDE);
 #endif
 
   if (dom_automation_enabled_)
     command_line->AppendSwitch(switches::kDomAutomationController);
 
   // Turn off tip loading for tests; see http://crbug.com/17725
   command_line->AppendSwitch(switches::kDisableWebResources);
 
-  command_line->AppendSwitchWithValue(switches::kUserDataDir,
-                                      user_data_dir.ToWStringHack());
+  command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir);
 
   // Don't show the first run ui.
   command_line->AppendSwitch(switches::kNoFirstRun);
 
   // This is a Browser test.
-  command_line->AppendSwitchWithValue(switches::kTestType,
-                                      ASCIIToWide(kBrowserTestType));
+  command_line->AppendSwitchWithValue(switches::kTestType, kBrowserTestType);
 
   // Single-process mode is not set in BrowserMain so it needs to be processed
   // explicitly.
   original_single_process_ = RenderProcessHost::run_renderer_in_process();
   if (command_line->HasSwitch(switches::kSingleProcess))
     RenderProcessHost::set_run_renderer_in_process(true);
 
 #if defined(OS_WIN)
   // The Windows sandbox requires that the browser and child processes are the
   // same binary.  So we launch browser_process.exe which loads chrome.dll
-  command_line->AppendSwitchWithValue(switches::kBrowserSubprocessPath,
-                                      command_line->GetProgram().value());
+  command_line->AppendSwitchPath(switches::kBrowserSubprocessPath,
+                                 command_line->GetProgram());
 #else
   // Explicitly set the path of the binary used for child processes, otherwise
   // they'll try to use browser_tests which doesn't contain ChromeMain.
   FilePath subprocess_path;
   PathService::Get(base::FILE_EXE, &subprocess_path);
   subprocess_path = subprocess_path.DirName();
   subprocess_path = subprocess_path.AppendASCII(WideToASCII(
       chrome::kBrowserProcessExecutablePath));
-  command_line->AppendSwitchWithValue(switches::kBrowserSubprocessPath,
-                                      subprocess_path.ToWStringHack());
+  command_line->AppendSwitchPath(switches::kBrowserSubprocessPath,
+                                 subprocess_path);
 #endif
 
   // Enable warning level logging so that we can see when bad stuff happens.
   command_line->AppendSwitch(switches::kEnableLogging);
   command_line->AppendSwitchWithValue(switches::kLoggingLevel,
                                       IntToWString(1));  // warning
 
   // If ncecessary, disable TabCloseableStateWatcher.
   if (!tab_closeable_state_watcher_enabled_)
     command_line->AppendSwitch(switches::kDisableTabCloseableStateWatcher);
@@ skipping 158 matching lines @@
 
   GTEST_NONFATAL_FAILURE_(error_message.c_str());
 
   MessageLoopForUI::current()->Quit();
 }
 
 void InProcessBrowserTest::SetInitialTimeoutInMS(int timeout_value) {
   DCHECK_GT(timeout_value, 0);
   initial_timeout_ = timeout_value;
 }