Uninstall multi-install Chrome Frame when updated.

chrome/installer/util/installer_state.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.
 
 #include "chrome/installer/util/installer_state.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 54 matching lines @@
     }
   }
 
   VLOG(2) << "It seems that the package is being updated.";
 
   return true;
 }
 
 InstallerState::InstallerState()
     : operation_(UNINITIALIZED),
+      state_type_(BrowserDistribution::CHROME_BROWSER),
       multi_package_distribution_(NULL),
       level_(UNKNOWN_LEVEL),
       package_type_(UNKNOWN_PACKAGE_TYPE),
-      state_type_(BrowserDistribution::CHROME_BROWSER),
       root_key_(NULL),
       msi_(false),
       verbose_logging_(false),
       ensure_google_update_present_(false) {
 }
 
 InstallerState::InstallerState(Level level)
     : operation_(UNINITIALIZED),
+      state_type_(BrowserDistribution::CHROME_BROWSER),
       multi_package_distribution_(NULL),
       level_(UNKNOWN_LEVEL),
       package_type_(UNKNOWN_PACKAGE_TYPE),
-      state_type_(BrowserDistribution::CHROME_BROWSER),
       root_key_(NULL),
       msi_(false),
       verbose_logging_(false),
       ensure_google_update_present_(false) {
   // Use set_level() so that root_key_ is updated properly.
   set_level(level);
 }
 
 void InstallerState::Initialize(const CommandLine& command_line,
                                 const MasterPreferences& prefs,
                                 const InstallationState& machine_state) {
+  Clear();
+
   bool pref_bool;
   if (!prefs.GetBool(master_preferences::kSystemLevel, &pref_bool))
     pref_bool = false;
   set_level(pref_bool ? SYSTEM_LEVEL : USER_LEVEL);
 
   if (!prefs.GetBool(master_preferences::kVerboseLogging, &verbose_logging_))
     verbose_logging_ = false;
 
   if (!prefs.GetBool(master_preferences::kMultiInstall, &pref_bool))
     pref_bool = false;
@@ skipping 479 matching lines @@
 
 bool InstallerState::IsChromeFrameRunning(
     const InstallationState& machine_state) const {
   return AnyExistsAndIsInUse(machine_state, CHROME_FRAME_DLL);
 }
 
 bool InstallerState::AreBinariesInUse(
     const InstallationState& machine_state) const {
   return AnyExistsAndIsInUse(
       machine_state,
-      CHROME_FRAME_DLL | CHROME_FRAME_HELPER_EXE | CHROME_DLL);
+      (CHROME_FRAME_HELPER_EXE | CHROME_FRAME_HELPER_DLL |
+       CHROME_FRAME_DLL | CHROME_DLL));
 }
 
 base::FilePath InstallerState::GetInstallerDirectory(
     const Version& version) const {
   return target_path().Append(ASCIIToWide(version.GetString()))
       .Append(kInstallerDir);
 }
 
 // static
 bool InstallerState::IsFileInUse(const base::FilePath& file) {
   // Call CreateFile with a share mode of 0 which should cause this to fail
   // with ERROR_SHARING_VIOLATION if the file exists and is in-use.
   return !base::win::ScopedHandle(CreateFile(file.value().c_str(),
                                              GENERIC_WRITE, 0, NULL,
                                              OPEN_EXISTING, 0, 0)).IsValid();
 }
 
+void InstallerState::Clear() {
+  operation_ = UNINITIALIZED;
+  target_path_.clear();
+  state_key_.clear();
+  state_type_ = BrowserDistribution::CHROME_BROWSER;
+  products_.clear();
+  multi_package_distribution_ = NULL;
+  critical_update_version_ = base::Version();
+  level_ = UNKNOWN_LEVEL;
+  package_type_ = UNKNOWN_PACKAGE_TYPE;
+  root_key_ = NULL;
+  msi_ = false;
+  verbose_logging_ = false;
+  ensure_google_update_present_ = false;
+}
+
 bool InstallerState::AnyExistsAndIsInUse(
     const InstallationState& machine_state,
     uint32 file_bits) const {
   static const wchar_t* const kBinaryFileNames[] = {
+    kChromeDll,
     kChromeFrameDll,
+    kChromeFrameHelperDll,
     kChromeFrameHelperExe,
-    kChromeDll,
   };
   DCHECK_NE(file_bits, 0U);
   DCHECK_LT(file_bits, 1U << NUM_BINARIES);
-  COMPILE_ASSERT(CHROME_FRAME_DLL == 1,no_youre_out_of_order);
-  COMPILE_ASSERT(CHROME_FRAME_HELPER_EXE == 2, no_youre_out_of_order);
-  COMPILE_ASSERT(CHROME_DLL == 4, no_youre_out_of_order);
+  COMPILE_ASSERT(CHROME_DLL == 1, no_youre_out_of_order);
+  COMPILE_ASSERT(CHROME_FRAME_DLL == 2, no_youre_out_of_order);
+  COMPILE_ASSERT(CHROME_FRAME_HELPER_DLL == 4, no_youre_out_of_order);
+  COMPILE_ASSERT(CHROME_FRAME_HELPER_EXE == 8, no_youre_out_of_order);
 
   // Check only for the current version (i.e., the version we are upgrading
   // _from_). Later versions from pending in-use updates need not be checked
   // since the current version is guaranteed to be in use if any such are.
   bool in_use = false;
   scoped_ptr<Version> current_version(GetCurrentVersion(machine_state));
   if (!current_version)
     return false;
   base::FilePath directory(
       target_path().AppendASCII(current_version->GetString()));
@@ skipping 184 matching lines @@
   }
   if (!install_list->Do())
     LOG(ERROR) << "Failed to record installer error information in registry.";
 }
 
 bool InstallerState::RequiresActiveSetup() const {
   return system_install() && FindProduct(BrowserDistribution::CHROME_BROWSER);
 }
 
 }  // namespace installer