Fix the uninstall failures caused by elevated uninstaller.

chrome/installer/setup/main.cc

 // Copyright (c) 2006-2008 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 <string>
 #include <windows.h>
 #include <msi.h>
 #include <shlobj.h>
 
 #include "base/at_exit.h"
@@ skipping 440 matching lines @@
   dist->UpdateDiffInstallStatus(system_install, incremental_install,
                                 install_status);
   return install_status;
 }
 
 installer_util::InstallStatus UninstallChrome(const CommandLine& cmd_line,
                                               const wchar_t* cmd_params, 
                                               const installer::Version* version,
                                               bool system_install) {
   LOG(INFO) << "Uninstalling Chome";
-  if (!version) {
+  bool force = cmd_line.HasSwitch(installer_util::switches::kForceUninstall);
+  if (!version && !force) {
     LOG(ERROR) << "No Chrome installation found for uninstall.";
     InstallUtil::WriteInstallerResult(system_install,
                                       installer_util::CHROME_NOT_INSTALLED,
                                       IDS_UNINSTALL_FAILED_BASE, NULL);
     return installer_util::CHROME_NOT_INSTALLED;
   }
 
   bool remove_all = !cmd_line.HasSwitch(
       installer_util::switches::kDoNotRemoveSharedItems);
-  bool force = cmd_line.HasSwitch(installer_util::switches::kForceUninstall);
-
-  // Check if we need admin rights to cleanup HKLM. Try to elevate - if it works
-  // exit from this process, if not just continue uninstalling in the current
-  // process itself.
-  if (remove_all &&
-      ShellUtil::AdminNeededForRegistryCleanup() &&
-      !IsUserAnAdmin() &&
-      (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) &&
-      !cmd_line.HasSwitch(installer_util::switches::kRunAsAdmin)) {
-    std::wstring exe = cmd_line.program();
-    std::wstring params(cmd_params);
-    // 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);
-    DWORD exit_code = installer_util::UNKNOWN_STATUS;
-    if (InstallUtil::ExecuteExeAsAdmin(exe, params, &exit_code))
-      return static_cast<installer_util::InstallStatus>(exit_code);
-  }
-
   return installer_setup::UninstallChrome(cmd_line.program(), system_install,
-                                          *version, remove_all, force);
+                                          remove_all, force,
+                                          cmd_line, cmd_params);
 }
 
 installer_util::InstallStatus ShowEULADialog(const std::wstring& inner_frame) {
   LOG(INFO) << "About to show EULA";
   std::wstring eula_path = installer_util::GetLocalizedEulaResource();
   if (eula_path.empty()) {
     LOG(ERROR) << "No EULA path available";
     return installer_util::EULA_REJECTED;
   }
   // Newer versions of the caller pass an inner frame parameter that must
@@ skipping 119 matching lines @@
   } else {
     install_status = InstallChrome(parsed_command_line,
                                    installed_version.get(),
                                    options);
   }
 
   CoUninitialize();
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   return dist->GetInstallReturnCode(install_status);
 }