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

chrome/installer/setup/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/setup/installer_state.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 62 matching lines @@
   VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
           << " distribution: " << dist->GetDisplayName();
 
   state_key_ = dist->GetStateKey();
 
   if (is_uninstall) {
     operation_ = UNINSTALL;
   } else {
     operation_ = SINGLE_INSTALL_OR_UPDATE;
     // Is this a migration from multi-install to single-install?
-    const ProductState* state =
-        machine_state.GetProductState(system_install(), dist->GetType());
+    const ProductState* state = machine_state.GetProductState(system_install());
     is_migrating_to_single_ = state && state->is_multi_install();
   }
 
   // Parse --critical-update-version=W.X.Y.Z
   std::string critical_version_value(
       command_line.GetSwitchValueASCII(switches::kCriticalUpdateVersion));
   critical_update_version_ = base::Version(critical_version_value);
 }
 
 void InstallerState::set_level(Level level) {
@@ skipping 62 matching lines @@
 Product* InstallerState::AddProductFromPreferences(
     const MasterPreferences& prefs,
     const InstallationState& machine_state) {
   std::unique_ptr<Product> product_ptr(
       new Product(BrowserDistribution::GetDistribution()));
   product_ptr->InitializeFromPreferences(prefs);
 
   Product* product = AddProductInDirectory(nullptr, std::move(product_ptr));
 
   if (product != NULL && !msi_) {
-    const ProductState* product_state = machine_state.GetProductState(
-        system_install(), BrowserDistribution::CHROME_BROWSER);
+    const ProductState* product_state =
+        machine_state.GetProductState(system_install());
     if (product_state != NULL)
       msi_ = product_state->is_msi();
   }
 
   return product;
 }
 
 Product* InstallerState::AddProductFromState(
     const ProductState& state) {
   std::unique_ptr<Product> product_ptr(
@@ skipping 15 matching lines @@
 
 bool InstallerState::system_install() const {
   DCHECK(level_ == USER_LEVEL || level_ == SYSTEM_LEVEL);
   return level_ == SYSTEM_LEVEL;
 }
 
 base::Version* InstallerState::GetCurrentVersion(
     const InstallationState& machine_state) const {
   DCHECK(product_);
   std::unique_ptr<base::Version> current_version;
-  const ProductState* product_state = machine_state.GetProductState(
-      level_ == SYSTEM_LEVEL, BrowserDistribution::CHROME_BROWSER);
+  const ProductState* product_state =
+      machine_state.GetProductState(level_ == SYSTEM_LEVEL);
 
   if (product_state != NULL) {
     const base::Version* version = NULL;
 
     // Be aware that there might be a pending "new_chrome.exe" already in the
     // installation path.  If so, we use old_version, which holds the version of
     // "chrome.exe" itself.
     if (base::PathExists(target_path().Append(kChromeNewExe)))
       version = product_state->old_version();
 
@@ skipping 108 matching lines @@
 #endif
   }
   install_list->Do();
 }
 
 bool InstallerState::RequiresActiveSetup() const {
   return system_install();
 }
 
 }  // namespace installer