Additional changes to support Chrome / CF installation wrapped in an MSI:...

chrome/installer/setup/uninstall.cc

 // Copyright (c) 2009 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 321 matching lines @@
       return installer_util::UNINSTALL_DELETE_PROFILE;
     }
   } else {
     LOG(ERROR) << "Failed to launch chrome.exe for uninstall confirmation.";
   }
 
   return installer_util::UNINSTALL_CONFIRMED;
 }
 
 bool ShouldDeleteProfile(const CommandLine& cmd_line,
-                         installer_util::InstallStatus status) {
+                         installer_util::InstallStatus status,
+                         bool system_uninstall) {
   bool should_delete = false;
 
   // Chrome Frame uninstallations always want to delete the profile (we have no
   // UI to prompt otherwise and the profile stores no useful data anyway)
   // unless they are managed by MSI. MSI uninstalls will explicitly include
   // the --delete-profile flag to distinguish them from MSI upgrades.
-  if (InstallUtil::IsChromeFrameProcess() && !InstallUtil::IsMSIProcess()) {
+  if (InstallUtil::IsChromeFrameProcess() &&
+      !InstallUtil::IsMSIProcess(system_uninstall)) {
     should_delete = true;
   } else {
     should_delete =
         status == installer_util::UNINSTALL_DELETE_PROFILE ||
         cmd_line.HasSwitch(installer_util::switches::kDeleteProfile);
   }
 
   return should_delete;
 }
 
@@ skipping 202 matching lines @@
         dll_list->Do();
       }
     }
   }
 
   if (!installed_version.get())
     return installer_util::UNINSTALL_SUCCESSFUL;
 
   // Finally delete all the files from Chrome folder after moving setup.exe
   // and the user's Local State to a temp location.
-  bool delete_profile = ShouldDeleteProfile(cmd_line, status);
+  bool delete_profile = ShouldDeleteProfile(cmd_line, status, system_uninstall);
   std::wstring local_state_path;
   ret = installer_util::UNINSTALL_SUCCESSFUL;
 
   DeleteResult delete_result = DeleteFilesAndFolders(exe_path,
       system_uninstall, *installed_version, &local_state_path, delete_profile);
   if (delete_result == DELETE_FAILED) {
     ret = installer_util::UNINSTALL_FAILED;
   } else if (delete_result == DELETE_REQUIRES_REBOOT) {
     ret = installer_util::UNINSTALL_REQUIRES_REBOOT;
   }
 
   if (!force_uninstall) {
     LOG(INFO) << "Uninstallation complete. Launching Uninstall survey.";
     dist->DoPostUninstallOperations(*installed_version, local_state_path,
                                     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;
 }