Remove GetSwitchValue() from chrome/* where easy.

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 291 matching lines @@
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     HKEY reg_root = InstallUtil::IsPerUserInstall(chrome_exe.c_str()) ?
         HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
     RegKey key(reg_root, dist->GetUninstallRegPath().c_str());
     key.ReadValue(installer_util::kUninstallStringField, &exe_path);
     CommandLine command_line = CommandLine::FromString(exe_path);
     exe_path = command_line.program();
   }
   if (file_util::PathExists(FilePath::FromWStringHack(exe_path))) {
     std::wstring params(L"--");
-    params.append(installer_util::switches::kRegisterChromeBrowser);
+    params.append(
+        ASCIIToWide(installer_util::switches::kRegisterChromeBrowser));
     params.append(L"=\"" + chrome_exe + L"\"");
     if (!suffix.empty()) {
       params.append(L" --");
-      params.append(installer_util::switches::kRegisterChromeBrowserSuffix);
+      params.append(ASCIIToWide(
+          installer_util::switches::kRegisterChromeBrowserSuffix));
       params.append(L"=\"" + suffix + L"\"");
     }
 
     CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
     if (browser_command_line.HasSwitch(switches::kChromeFrame)) {
       params.append(L" --");
       params.append(installer_util::switches::kChromeFrame);
     }
 
     DWORD ret_val = 0;
@@ skipping 467 matching lines @@
         chrome_exe.c_str(),                // target
         shortcut.c_str(),                  // shortcut
         chrome_path.c_str(),               // working dir
         NULL,                              // arguments
         description.c_str(),               // description
         chrome_exe.c_str(),                // icon file
         icon_index,                        // icon index
         dist->GetBrowserAppId().c_str());  // app id
   }
 }