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

chrome_frame/chrome_frame_automation.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_frame/chrome_frame_automation.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/trace_event.h"
@@ skipping 262 matching lines @@
 
   // At same time we must destroy/stop the thread from another thread.
   ChromeFrameAutomationProxyImpl* proxy =
       new ChromeFrameAutomationProxyImpl(
           params.automation_server_launch_timeout);
 
   // Launch browser
   scoped_ptr<CommandLine> command_line(
       chrome_launcher::CreateLaunchCommandLine());
   command_line->AppendSwitchWithValue(switches::kAutomationClientChannelID,
-      ASCIIToWide(proxy->channel_id()));
+      proxy->channel_id());
 
   // Run Chrome in Chrome Frame mode. In practice, this modifies the paths
   // and registry keys that Chrome looks in via the BrowserDistribution
   // mechanism.
   command_line->AppendSwitch(switches::kChromeFrame);
 
   // Chrome Frame never wants Chrome to start up with a First Run UI.
   command_line->AppendSwitch(switches::kNoFirstRun);
 
   command_line->AppendSwitch(switches::kDisablePopupBlocking);
 
   // Disable the "Whoa! Chrome has crashed." dialog, because that isn't very
   // useful for Chrome Frame users.
 #ifndef NDEBUG
   command_line->AppendSwitch(switches::kNoErrorDialogs);
 #endif
 
   // In headless mode runs like reliability test runs we want full crash dumps
   // from chrome.
   if (IsHeadlessMode())
     command_line->AppendSwitch(switches::kFullMemoryCrashReport);
 
   DLOG(INFO) << "Profile path: " << params.profile_path.value();
-  command_line->AppendSwitchWithValue(switches::kUserDataDir,
-      params.profile_path.value());
+  command_line->AppendSwitchPath(switches::kUserDataDir, params.profile_path);
 
   std::wstring command_line_string(command_line->command_line_string());
   // If there are any extra arguments, append them to the command line.
   if (!params.extra_chrome_arguments.empty()) {
     command_line_string += L' ' + params.extra_chrome_arguments;
   }
 
   automation_server_launch_start_time_ = base::TimeTicks::Now();
 
   if (!base::LaunchApp(command_line_string, false, false, NULL)) {
@@ skipping 958 matching lines @@
     const URLRequestStatus& status) {
   automation_server_->Send(new AutomationMsg_RequestEnd(0, tab_->handle(),
       request_id, status));
 }
 
 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success,
     const GURL& url, const std::string& cookie_string, int cookie_id) {
   automation_server_->Send(new AutomationMsg_GetCookiesHostResponse(0,
       tab_->handle(), success, url, cookie_string, cookie_id));
 }