Determine the path to setup.exe via PathService rather than the parsed

chrome/installer/setup/uninstall.cc

 // Copyright (c) 2012 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 <windows.h>
 
@@ skipping 1026 matching lines @@
       if (RegUnLoadKey(HKEY_USERS, profile_sid) == ERROR_SUCCESS)
         VLOG(1) << "Unloaded registry hive for " << profile_sid;
       else
         LOG(ERROR) << "Error unloading registry hive for " << profile_sid;
     }
   }
 }
 
 InstallStatus UninstallProduct(const InstallationState& original_state,
                                const InstallerState& installer_state,
-                               const base::FilePath& setup_path,
+                               const base::FilePath& setup_exe,
                                const Product& product,
                                bool remove_all,
                                bool force_uninstall,
                                const CommandLine& cmd_line) {
   InstallStatus status = installer::UNINSTALL_CONFIRMED;
   BrowserDistribution* browser_dist = product.distribution();
   const base::string16 chrome_exe(
       installer_state.target_path().Append(installer::kChromeExe).value());
 
   bool is_chrome = product.is_chrome();
@@ skipping 253 matching lines @@
   // (aka non-multi) installation or we are the Chrome Binaries.
 
   std::vector<base::FilePath> local_state_folders;
   GetLocalStateFolders(product, &local_state_folders);
   base::FilePath backup_state_file(BackupLocalStateFile(local_state_folders));
 
   if (product.is_chrome_app_host()) {
     DeleteAppHostFilesAndFolders(installer_state, product_state->version());
   } else if (!installer_state.is_multi_install() ||
              product.is_chrome_binaries()) {
-    base::FilePath setup_exe(base::MakeAbsoluteFilePath(cmd_line.GetProgram()));
     DeleteResult delete_result = DeleteChromeFilesAndFolders(
-        installer_state, setup_exe);
+        installer_state, base::MakeAbsoluteFilePath(setup_exe));
     if (delete_result == DELETE_FAILED) {
       ret = installer::UNINSTALL_FAILED;
     } else if (delete_result == DELETE_REQUIRES_REBOOT) {
       ret = installer::UNINSTALL_REQUIRES_REBOOT;
     }
   }
 
   if (delete_profile)
     DeleteLocalState(local_state_folders, product.is_chrome_frame());
 
   if (!force_uninstall) {
     VLOG(1) << "Uninstallation complete. Launching post-uninstall operations.";
     browser_dist->DoPostUninstallOperations(product_state->version(),
         backup_state_file, distribution_data);
   }
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!backup_state_file.empty())
     base::DeleteFile(backup_state_file, false);
 
   return ret;
 }
 
 void CleanUpInstallationDirectoryAfterUninstall(
     const InstallationState& original_state,
     const InstallerState& installer_state,
-    const CommandLine& cmd_line,
+    const base::FilePath& setup_exe,
     InstallStatus* uninstall_status) {
   if (*uninstall_status != UNINSTALL_SUCCESSFUL &&
       *uninstall_status != UNINSTALL_REQUIRES_REBOOT) {
     return;
   }
   const base::FilePath target_path(installer_state.target_path());
   if (target_path.empty()) {
     LOG(ERROR) << "No installation destination path.";
     *uninstall_status = UNINSTALL_FAILED;
     return;
   }
-  base::FilePath setup_exe(base::MakeAbsoluteFilePath(cmd_line.GetProgram()));
-  if (!target_path.IsParent(setup_exe)) {
+  if (!target_path.IsParent(base::MakeAbsoluteFilePath(setup_exe))) {
     VLOG(1) << "setup.exe is not in target path. Skipping installer cleanup.";
     return;
   }
   base::FilePath install_directory(setup_exe.DirName());
 
   bool remove_setup = true;
   bool remove_archive = true;
   CheckShouldRemoveSetupAndArchive(original_state, installer_state,
                                    &remove_setup, &remove_archive);
   if (!remove_archive)
@@ skipping 39 matching lines @@
     // If we need a reboot to continue, schedule the parent directories for
     // deletion unconditionally. If they are not empty, the session manager
     // will not delete them on reboot.
     ScheduleParentAndGrandparentForDeletion(target_path);
   } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) {
     *uninstall_status = UNINSTALL_FAILED;
   }
 }
 
 }  // namespace installer