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

chrome/installer/setup/setup_main.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/setup_main.h"
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 472 matching lines @@
 bool CheckPreInstallConditions(const InstallationState& original_state,
                                const InstallerState& installer_state,
                                installer::InstallStatus* status) {
   if (!installer_state.system_install()) {
     // This is a user-level installation. Make sure that we are not installing
     // on top of an existing system-level installation.
     const Product& product = installer_state.product();
     BrowserDistribution* browser_dist = product.distribution();
 
     const ProductState* user_level_product_state =
-        original_state.GetProductState(false, browser_dist->GetType());
+        original_state.GetProductState(false);
     const ProductState* system_level_product_state =
-        original_state.GetProductState(true, browser_dist->GetType());
+        original_state.GetProductState(true);
 
     // Allow upgrades to proceed so that out-of-date versions are not left
     // around.
     if (user_level_product_state)
       return true;
 
     // This is a new user-level install...
 
     if (system_level_product_state) {
       // ... and the product already exists at system-level.
@@ skipping 55 matching lines @@
 
 installer::InstallStatus UninstallProduct(
     const InstallationState& original_state,
     const InstallerState& installer_state,
     const base::FilePath& setup_exe,
     const base::CommandLine& cmd_line,
     bool remove_all,
     bool force_uninstall,
     const Product& product) {
   const ProductState* product_state =
-      original_state.GetProductState(installer_state.system_install(),
-                                     product.distribution()->GetType());
+      original_state.GetProductState(installer_state.system_install());
   if (product_state != NULL) {
     VLOG(1) << "version on the system: "
             << product_state->version().GetString();
   } else if (!force_uninstall) {
     LOG(ERROR) << product.distribution()->GetDisplayName()
                << " not found for uninstall.";
     return installer::CHROME_NOT_INSTALLED;
   }
 
   return installer::UninstallProduct(
@@ skipping 145 matching lines @@
 
 installer::InstallStatus RegisterDevChrome(
     const InstallationState& original_state,
     const InstallerState& installer_state,
     const base::FilePath& setup_exe,
     const base::CommandLine& cmd_line) {
   BrowserDistribution* chrome_dist = BrowserDistribution::GetDistribution();
 
   // Only proceed with registering a dev chrome if no real Chrome installation
   // of the same distribution are present on this system.
-  const ProductState* existing_chrome =
-      original_state.GetProductState(false,
-                                     BrowserDistribution::CHROME_BROWSER);
-  if (!existing_chrome) {
-    existing_chrome =
-      original_state.GetProductState(true, BrowserDistribution::CHROME_BROWSER);
-  }
+  const ProductState* existing_chrome = original_state.GetProductState(false);
+  if (!existing_chrome)
+    existing_chrome = original_state.GetProductState(true);
   if (existing_chrome) {
     static const wchar_t kPleaseUninstallYourChromeMessage[] =
         L"You already have a full-installation (non-dev) of %1ls, please "
         L"uninstall it first using Add/Remove Programs in the control panel.";
     base::string16 name(chrome_dist->GetDisplayName());
     base::string16 message(
         base::StringPrintf(kPleaseUninstallYourChromeMessage, name.c_str()));
 
     LOG(ERROR) << "Aborting operation: another installation of " << name
                << " was found, as a last resort (if the product is not present "
@@ skipping 412 matching lines @@
     LOG(ERROR) << "Did not find any valid version in installer.";
     install_status = INVALID_ARCHIVE;
     installer_state.WriteInstallerResult(install_status,
         IDS_INSTALL_INVALID_ARCHIVE_BASE, NULL);
   } else {
     VLOG(1) << "version to install: " << installer_version->GetString();
     bool proceed_with_installation = true;
 
     if (!IsDowngradeAllowed(prefs)) {
       const Product& product = installer_state.product();
-      const ProductState* product_state = original_state.GetProductState(
-          system_install, product.distribution()->GetType());
+      const ProductState* product_state =
+          original_state.GetProductState(system_install);
       if (product_state != NULL &&
           (product_state->version().CompareTo(*installer_version) > 0)) {
         LOG(ERROR) << "Higher version of "
                    << product.distribution()->GetDisplayName()
                    << " is already installed.";
         int message_id = IDS_INSTALL_HIGHER_VERSION_BASE;
         proceed_with_installation = false;
         install_status = HIGHER_VERSION_EXISTS;
         installer_state.WriteInstallerResult(install_status, message_id, NULL);
       }
@@ skipping 307 matching lines @@
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
   }
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }