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

chrome/installer/setup/setup_main.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.
 
 #include <string>
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 704 matching lines @@
                         IDS_UNINSTALL_COMPLETE_BASE).c_str(),
                     dist->GetApplicationName().c_str(),
                     MB_OK);
     }
   }
 
   int return_code = 0;
   // MSI demands that custom actions always return 0 (ERROR_SUCCESS) or it will
   // rollback the action. If we're uninstalling we want to avoid this, so always
   // report success, squashing any more informative return codes.
-  if (!(InstallUtil::IsMSIProcess() &&
+  if (!(InstallUtil::IsMSIProcess(system_install) &&
         parsed_command_line.HasSwitch(installer_util::switches::kUninstall))) {
     // Note that we allow the status installer_util::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is never
     // invoked directly by Google Update.
     dist->GetInstallReturnCode(install_status);
   }
 
   LOG(INFO) << "Installation complete, returning: " << return_code;
   return return_code;
 }