Attempt to reland http://codereview.chromium.org/4928002/...

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 277 matching lines @@
   RegistryEntry::GetSystemEntries(chrome_exe, suffix, &entries);
   for (std::list<RegistryEntry*>::const_iterator itr = entries.begin();
        itr != entries.end() && registered; ++itr) {
     // We do not need registered = registered && ... since the loop condition
     // is set to exit early.
     registered = (*itr)->ExistsInHKLM();
   }
   return registered;
 }
 
-// This method registers Chrome on Vista by launching eleavated setup.exe.
-// That will show user standard Vista elevation prompt. If user accepts it
-// the new process will make the necessary changes and return SUCCESS that
-// we capture and return.
+// This method registers Chrome on Vista by launching an elevated setup.exe.
+// That will show the user the standard Vista elevation prompt. If the user
+// accepts it the new process will make the necessary changes and return SUCCESS
+// that we capture and return.
 bool ElevateAndRegisterChrome(const std::wstring& chrome_exe,
                               const std::wstring& suffix) {
   FilePath exe_path =
       FilePath::FromWStringHack(chrome_exe).DirName()
           .Append(installer_util::kSetupExe);
   if (!file_util::PathExists(exe_path)) {
     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_READ);
     std::wstring uninstall_string;
     key.ReadValue(installer_util::kUninstallStringField, &uninstall_string);
     CommandLine command_line = CommandLine::FromString(uninstall_string);
     exe_path = command_line.GetProgram();
   }
+
   if (file_util::PathExists(exe_path)) {
-    std::wstring params(L"--");
-    params.append(
-        ASCIIToWide(installer_util::switches::kRegisterChromeBrowser));
-    params.append(L"=\"" + chrome_exe + L"\"");
+    CommandLine cmd(exe_path);
+    cmd.AppendSwitchNative(installer_util::switches::kRegisterChromeBrowser,
+                           chrome_exe);
     if (!suffix.empty()) {
-      params.append(L" --");
-      params.append(ASCIIToWide(
-          installer_util::switches::kRegisterChromeBrowserSuffix));
-      params.append(L"=\"" + suffix + L"\"");
+      cmd.AppendSwitchNative(
+          installer_util::switches::kRegisterChromeBrowserSuffix, suffix);
     }
 
     CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
     if (browser_command_line.HasSwitch(switches::kChromeFrame)) {
-      params.append(L" --");
-      params.append(installer_util::switches::kChromeFrame);
+      cmd.AppendSwitch(installer_util::switches::kChromeFrame);
     }
 
     DWORD ret_val = 0;
-    InstallUtil::ExecuteExeAsAdmin(exe_path.value(), params, &ret_val);
+    InstallUtil::ExecuteExeAsAdmin(cmd, &ret_val);
     if (ret_val == 0)
       return true;
   }
   return false;
 }
 
 // This method tries to figure out if another user has already registered her
 // own copy of Chrome so that we can avoid overwriting it and append current
 // user's login name to default browser registry entries. This function is
 // not meant to detect all cases. It just tries to handle the most common case.
@@ skipping 456 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
   }
 }