Add support for --critical-update-version to installer.

chrome/installer/util/installer_state.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "base/version.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/product.h"
 #include "chrome/installer/util/util_constants.h"
 
 #if defined(OS_WIN)
 #include <windows.h>  // NOLINT
 #endif
 
 class CommandLine;
 class Version;
@@ skipping 110 matching lines @@
 
   const Products& products() const { return products_.get(); }
 
   // Returns the product of the desired type, or NULL if none found.
   const Product* FindProduct(BrowserDistribution::Type distribution_type) const;
 
   // Returns the currently installed version in |target_path|, or NULL if no
   // products are installed.  Ownership is passed to the caller.
   Version* GetCurrentVersion(const InstallationState& machine_state) const;
 
+  // Returns the critical update version if all of the following are true:
+  // - --critical-update-version=CUV was specified on the command-line.
+  // - current_version == NULL or current_version < CUV.

[Finnur, 2011/11/11 10:31:01]

Wait... current_version can be NULL? How come? Is that the 'fresh install' case?

[grt (UTC plus 2), 2011/11/11 11:40:08]

It's a case where the registry data for the current install is missing (due to
the user nuking registry keys, most likely).  

[Finnur, 2011/11/11 12:12:47]

I see.

On 2011/11/11 11:40:08, grt wrote:

+  // - new_version >= CUV.

[Finnur, 2011/11/11 10:31:01]

nit: Maybe use * for bullets instead of - so that "- --critical" doesn't look so
weird? :)

[grt (UTC plus 2), 2011/11/11 11:40:08]

Done.

+  // Otherwise, returns an invalid version.
+  Version DetermineCriticalVersion(const Version* current_version,
+                                   const Version& new_version) const;
+
   // Returns whether or not there is currently a Chrome Frame instance running.
   // Note that there isn't a mechanism to lock Chrome Frame in place, so Chrome
   // Frame may either exit or start up after this is called.
   bool IsChromeFrameRunning(const InstallationState& machine_state) const;
 
   // Returns the path to the installer under Chrome version folder
   // (for example <target_path>\Google\Chrome\Application\<Version>\Installer)
   FilePath GetInstallerDirectory(const Version& version) const;
 
   // Try to delete all directories under |temp_path| whose versions are less
@@ skipping 47 matching lines @@
   // Sets this object's package type and updates the multi_package_distribution_
   // accordingly.
   void set_package_type(PackageType type);
 
   Operation operation_;
   FilePath target_path_;
   std::wstring state_key_;
   BrowserDistribution::Type state_type_;
   ScopedVector<Product> products_;
   BrowserDistribution* multi_package_distribution_;
+  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_