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

chrome/installer/setup/uninstall.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 the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 452 matching lines @@
     std::wstring ext_association(ShellUtil::kRegClasses);
     ext_association.append(L"\\");
     ext_association.append(chrome::kExtensionFileExtension);
     InstallUtil::DeleteRegistryKey(key, ext_association);
   }
 }
 
 installer_util::InstallStatus installer_setup::UninstallChrome(
     const std::wstring& exe_path, bool system_uninstall,
     bool remove_all, bool force_uninstall,
-    const CommandLine& cmd_line, const wchar_t* cmd_params) {
+    const CommandLine& cmd_line) {
   installer_util::InstallStatus status = installer_util::UNINSTALL_CONFIRMED;
   std::wstring suffix;
   if (!ShellUtil::GetUserSpecificDefaultBrowserSuffix(&suffix))
     suffix = L"";
 
   if (force_uninstall) {
     // Since --force-uninstall command line option is used, we are going to
     // do silent uninstall. Try to close all running Chrome instances.
     if (!InstallUtil::IsChromeFrameProcess())
       CloseAllChromeProcesses();
   } else if (!InstallUtil::IsChromeFrameProcess()) {
     // no --force-uninstall so lets show some UI dialog boxes.
     status = IsChromeActiveOrUserCancelled(system_uninstall);
     if (status != installer_util::UNINSTALL_CONFIRMED &&
         status != installer_util::UNINSTALL_DELETE_PROFILE)
       return status;
 
     // Check if we need admin rights to cleanup HKLM. If we do, try to launch
     // another uninstaller (silent) in elevated mode to do HKLM cleanup.
     // And continue uninstalling in the current process also to do HKCU cleanup.
     if (remove_all &&
         (!suffix.empty() || CurrentUserHasDefaultBrowser(system_uninstall)) &&
         !::IsUserAnAdmin() &&
         (base::win::GetVersion() >= base::win::VERSION_VISTA) &&
         !cmd_line.HasSwitch(installer_util::switches::kRunAsAdmin)) {
-      std::wstring exe = cmd_line.GetProgram().value();
-      std::wstring params(cmd_params);
+      CommandLine new_cmd(CommandLine::NO_PROGRAM);
+      new_cmd.AppendArguments(cmd_line, true);
       // Append --run-as-admin flag to let the new instance of setup.exe know
       // that we already tried to launch ourselves as admin.
-      params.append(L" --");
-      params.append(installer_util::switches::kRunAsAdmin);
+      new_cmd.AppendSwitch(installer_util::switches::kRunAsAdmin);
       // Append --remove-chrome-registration to remove registry keys only.
-      params.append(L" --");
-      params.append(installer_util::switches::kRemoveChromeRegistration);
+      new_cmd.AppendSwitch(installer_util::switches::kRemoveChromeRegistration);
       if (!suffix.empty()) {
-        params.append(L" --");
-        params.append(ASCIIToWide(
-            installer_util::switches::kRegisterChromeBrowserSuffix));
-        params.append(L"=\"" + suffix + L"\"");
+        new_cmd.AppendSwitchNative(
+            installer_util::switches::kRegisterChromeBrowserSuffix, suffix);
       }
       DWORD exit_code = installer_util::UNKNOWN_STATUS;
-      InstallUtil::ExecuteExeAsAdmin(exe, params, &exit_code);
+      InstallUtil::ExecuteExeAsAdmin(new_cmd, &exit_code);
     }
   }
 
   // Get the version of installed Chrome (if any)
   scoped_ptr<installer::Version>
       installed_version(InstallUtil::GetChromeVersion(system_uninstall));
 
   // Chrome is not in use so lets uninstall Chrome by deleting various files
   // and registry entries. Here we will just make best effort and keep going
   // in case of errors.
@@ skipping 90 matching lines @@
                                     distribution_data);
   }
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!local_state_path.empty())
     file_util::Delete(local_state_path, false);
 
   return ret;
 }