Use GetSwitchValueASCII.

chrome/browser/first_run_win.cc

 // Copyright (c) 2006-2009 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.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 486 matching lines @@
     HWND active_window = ::GetLastActivePopup(owner_window_);
     if (::IsHungAppWindow(active_window) || ::IsHungAppWindow(owner_window_)) {
       ::TerminateProcess(import_process_, ResultCodes::IMPORTER_HUNG);
       import_process_ = NULL;
     }
   }
 
   HWND owner_window_;
   base::ProcessHandle import_process_;
   WorkerThreadTicker ticker_;
-  DISALLOW_EVIL_CONSTRUCTORS(HungImporterMonitor);
+  DISALLOW_COPY_AND_ASSIGN(HungImporterMonitor);
 };
 
 // This class is used by FirstRun::ImportNow to get notified of the outcome of
 // the import operation. It differs from ImportProcessRunner in that this
 // class executes in the context of importing child process.
 // The values that it handles are meant to be used as the process exit code.
 class FirstRunImportObserver : public ImportObserver {
  public:
   FirstRunImportObserver()
       : loop_running_(false), import_result_(ResultCodes::NORMAL_EXIT) {
@@ skipping 16 matching lines @@
   }
 
  private:
   void Finish() {
     if (loop_running_)
       MessageLoop::current()->Quit();
   }
 
   bool loop_running_;
   int import_result_;
-  DISALLOW_EVIL_CONSTRUCTORS(FirstRunImportObserver);
+  DISALLOW_COPY_AND_ASSIGN(FirstRunImportObserver);
 };
 
 std::wstring EncodeImportParams(int browser_type, int options, HWND window) {
   return StringPrintf(L"%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);
@@ skipping 13 matching lines @@
 }  // namespace
 
 bool FirstRun::ImportSettings(Profile* profile, int browser_type,
                               int items_to_import, HWND parent_window) {
   const CommandLine& cmdline = *CommandLine::ForCurrentProcess();
   CommandLine import_cmd(cmdline.GetProgram());
   // Propagate user data directory switch.
   if (cmdline.HasSwitch(switches::kUserDataDir)) {
     import_cmd.AppendSwitchWithValue(
         switches::kUserDataDir,
-        cmdline.GetSwitchValue(switches::kUserDataDir));
+        cmdline.GetSwitchValueASCII(switches::kUserDataDir));
   }
 
   // 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.CommandLine::AppendSwitchWithValue(switches::kImport,
@@ skipping 371 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TryChromeDialog);
 };
 
 }  // namespace
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   TryChromeDialog td(version);
   return td.ShowModal();
 }