Revert of Delete old files after an update.

chrome/installer/util/installer_state.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_
 #define CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_
 
 #include <stdint.h>
 
+#include <set>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/version.h"
@@ skipping 150 matching lines @@
   bool IsChromeFrameRunning(const InstallationState& machine_state) const;
 
   // Returns true if any of the binaries from a multi-install Chrome Frame that
   // has been migrated to single-install are still in use.
   bool AreBinariesInUse(const InstallationState& machine_state) const;
 
   // Returns the path to the installer under Chrome version folder
   // (for example <target_path>\Google\Chrome\Application\<Version>\Installer)
   base::FilePath GetInstallerDirectory(const base::Version& version) const;
 
+  // Try to delete all directories under |temp_path| whose versions are less
+  // than |new_version| and not equal to |existing_version|. |existing_version|
+  // may be NULL.
+  void RemoveOldVersionDirectories(const base::Version& new_version,
+                                   base::Version* existing_version,
+                                   const base::FilePath& temp_path) const;
+
   // Adds to |com_dll_list| the list of COM DLLs that are to be registered
   // and/or unregistered. The list may be empty.
   void AddComDllList(std::vector<base::FilePath>* com_dll_list) const;
 
   // See InstallUtil::UpdateInstallerStage.
   void UpdateStage(installer::InstallerStage stage) const;
 
   // For a MULTI_INSTALL or MULTI_UPDATE operation, updates the Google Update
   // "ap" values for all products being operated on.
   void UpdateChannels() const;
@@ skipping 38 matching lines @@
                      const base::FilePath* product_dir) const;
   Product* AddProductInDirectory(const base::FilePath* product_dir,
                                  scoped_ptr<Product>* product);
   Product* AddProductFromPreferences(
       BrowserDistribution::Type distribution_type,
       const MasterPreferences& prefs,
       const InstallationState& machine_state);
   bool IsMultiInstallUpdate(const MasterPreferences& prefs,
                             const InstallationState& machine_state);
 
+  // Enumerates all files named one of
+  // [chrome.exe, old_chrome.exe, new_chrome.exe] in target_path_ and
+  // returns their version numbers in a set.
+  void GetExistingExeVersions(std::set<std::string>* existing_versions) const;
+
   // Sets this object's level and updates the root_key_ accordingly.
   void set_level(Level level);
 
   // Sets this object's package type and updates the multi_package_distribution_
   // accordingly.
   void set_package_type(PackageType type);
 
   Operation operation_;
   base::FilePath target_path_;
   base::string16 state_key_;
   BrowserDistribution::Type state_type_;
   ScopedVector<Product> products_;
   BrowserDistribution* multi_package_distribution_;
   base::Version critical_update_version_;
   Level level_;
   PackageType package_type_;
 #if defined(OS_WIN)
   HKEY root_key_;
 #endif
   bool msi_;
   bool verbose_logging_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstallerState);
 };  // class InstallerState
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALLER_STATE_H_