Convert a bunch of easy AppendSwitchWithValue to *ASCII.

chrome/browser/first_run/first_run_win.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/browser/first_run/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 117 matching lines @@
 
 bool LaunchSetupWithParam(const std::string& param, const std::wstring& value,
                           int* ret_code) {
   FilePath exe_path;
   if (!PathService::Get(base::DIR_MODULE, &exe_path))
     return false;
   exe_path = exe_path.Append(installer_util::kInstallerDir);
   exe_path = exe_path.Append(installer_util::kSetupExe);
   base::ProcessHandle ph;
   CommandLine cl(exe_path);
-  cl.AppendSwitchWithValue(param, value);
+  cl.AppendSwitchNative(param, value);
 
   CommandLine* browser_command_line = CommandLine::ForCurrentProcess();
   if (browser_command_line->HasSwitch(switches::kChromeFrame)) {
     cl.AppendSwitch(switches::kChromeFrame);
   }
 
   if (!base::LaunchApp(cl, false, false, &ph))
     return false;
   DWORD wr = ::WaitForSingleObject(ph, INFINITE);
   if (wr != WAIT_OBJECT_0)
@@ skipping 424 matching lines @@
       import_process_ = NULL;
     }
   }
 
   HWND owner_window_;
   base::ProcessHandle import_process_;
   WorkerThreadTicker ticker_;
   DISALLOW_COPY_AND_ASSIGN(HungImporterMonitor);
 };
 
-std::wstring EncodeImportParams(int browser_type, int options, HWND window) {
-  return StringPrintf(L"%d@%d@%d", browser_type, options, window);
+std::string EncodeImportParams(int browser_type, int options, HWND window) {
+  return StringPrintf("%d@%d@%d", browser_type, options, window);
 }
 
 bool DecodeImportParams(const std::wstring& encoded,
                         int* browser_type, int* options, HWND* window) {
   std::vector<std::wstring> v;
   SplitString(encoded, L'@', &v);
   if (v.size() != 3)
     return false;
 
   if (!StringToInt(v[0], browser_type))
@@ skipping 91 matching lines @@
   const char* kSwitchNames[] = {
     switches::kUserDataDir,
     switches::kChromeFrame,
     switches::kCountry,
   };
   import_cmd.CopySwitchesFrom(cmdline, kSwitchNames, arraysize(kSwitchNames));
 
   // Since ImportSettings is called before the local state is stored on disk
   // we pass the language as an argument.  GetApplicationLocale checks the
   // current command line as fallback.
-  import_cmd.AppendSwitchWithValue(
-      switches::kLang,
-      ASCIIToWide(g_browser_process->GetApplicationLocale()));
+  import_cmd.AppendSwitchASCII(switches::kLang,
+                               g_browser_process->GetApplicationLocale());
 
   if (items_to_import) {
-    import_cmd.CommandLine::AppendSwitchWithValue(switches::kImport,
+    import_cmd.CommandLine::AppendSwitchASCII(switches::kImport,
         EncodeImportParams(browser_type, items_to_import, parent_window));
   }
 
   if (!import_bookmarks_path.empty()) {
     import_cmd.CommandLine::AppendSwitchWithValue(
         switches::kImportFromFile, import_bookmarks_path.c_str());
   }
 
   // Time to launch the process that is going to do the import.
   base::ProcessHandle import_process;
@@ skipping 342 matching lines @@
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   if (version > 10000) {
     // This is a test value. We want to make sure we exercise
     // returning this early. See EarlyReturnTest test harness.
     return Upgrade::TD_NOT_NOW;
   }
   TryChromeDialog td;
   return td.ShowModal();
 }