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

chrome/installer/setup/uninstall.cc

Index: chrome/installer/setup/uninstall.cc
===================================================================
--- chrome/installer/setup/uninstall.cc	(revision 45608)
+++ chrome/installer/setup/uninstall.cc	(working copy)
@@ -339,14 +339,16 @@
 }
 
 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 =
@@ -569,7 +571,7 @@
 
   // 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;