Remove support for non-browser products from InstallationState and ProductState.

chrome/installer/util/installation_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_INSTALLATION_STATE_H_
 #define CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_
 
 #include <memory>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "chrome/installer/util/app_commands.h"
-#include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/channel_info.h"
 
 namespace base {
 class Version;
-namespace win {
-class RegKey;
-}
 }
 
 namespace installer {
 
 class InstallationState;
 
-// A representation of a product's state on the machine based on the contents
-// of the Windows registry.
+// A representation of Chrome's state on the machine based on the contents of
+// the Windows registry.
 // TODO(grt): Pull this out into its own file.
+// TODO(grt): Evaluate whether this is still needed. If yes, rename to
+// ChromeState or somesuch.
 class ProductState {
  public:
   ProductState();
   ~ProductState();
 
   // Returns true if the product is installed (i.e., the product's Clients key
   // exists and has a "pv" value); false otherwise.
-  bool Initialize(bool system_install,
-                  BrowserDistribution::Type type);
-  bool Initialize(bool system_install,
-                  BrowserDistribution* distribution);
+  bool Initialize(bool system_install);
 
   // Returns the product's channel info (i.e., the Google Update "ap" value).
   const ChannelInfo& channel() const { return channel_; }
 
   // Returns the path to the product's "setup.exe"; may be empty.
   base::FilePath GetSetupPath() const;
 
   // Returns the product's version.  This method may only be called on an
   // instance that has been initialized for an installed product.
   const base::Version& version() const;
@@ skipping 41 matching lines @@
   // Returns the set of Google Update commands.
   const AppCommands& commands() const { return commands_; }
 
   // Returns this object a la operator=().
   ProductState& CopyFrom(const ProductState& other);
 
   // Clears the state of this object.
   void Clear();
 
  protected:
-  static bool InitializeCommands(const base::win::RegKey& version_key,
-                                 AppCommands* commands);
-
   ChannelInfo channel_;
   std::unique_ptr<base::Version> version_;
   std::unique_ptr<base::Version> old_version_;
   std::wstring brand_;
   std::wstring rename_cmd_;
   std::wstring oem_install_;
   base::CommandLine uninstall_command_;
   AppCommands commands_;
   DWORD eula_accepted_;
   DWORD usagestats_;
@@ skipping 13 matching lines @@
 // TODO(grt): Rename this to MachineState and put it in its own file.
 class InstallationState {
  public:
   InstallationState();
 
   // Initializes this object with the machine's current state.
   void Initialize();
 
   // Returns the state of a product or NULL if not installed.
   // Caller does NOT assume ownership of returned pointer.
-  const ProductState* GetProductState(bool system_install,
-                                      BrowserDistribution::Type type) const;
+  const ProductState* GetProductState(bool system_install) const;
 
   // Returns the state of a product, even one that has not yet been installed.
   // This is useful during first install, when some but not all ProductState
   // information has been written by Omaha. Notably absent from the
   // ProductState returned here are the version numbers. Do NOT try to access
   // the version numbers from a ProductState returned by this method.
   // Caller does NOT assume ownership of returned pointer. This method will
   // never return NULL.
-  const ProductState* GetNonVersionedProductState(
-      bool system_install, BrowserDistribution::Type type) const;
+  const ProductState* GetNonVersionedProductState(bool system_install) const;
 
  protected:
-  enum {
-    CHROME_BROWSER_INDEX,
-    CHROME_FRAME_INDEX,
-    CHROME_BINARIES_INDEX,
-    NUM_PRODUCTS
-  };
-
-  static int IndexFromDistType(BrowserDistribution::Type type);
-
-  ProductState user_products_[NUM_PRODUCTS];
-  ProductState system_products_[NUM_PRODUCTS];
+  ProductState user_chrome_;
+  ProductState system_chrome_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstallationState);
 };  // class InstallationState
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALLATION_STATE_H_