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

chrome/installer/setup/install_worker_unittest.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/install_worker.h"
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
@@ skipping 130 matching lines @@
     uninstall_command_.AppendSwitch(option);
   }
 };
 
 // Okay, so this isn't really a mock as such, but it does add setter methods
 // to make it easier to build custom InstallationStates.
 class MockInstallationState : public InstallationState {
  public:
   // Included for testing.
   void SetProductState(bool system_install,
-                       BrowserDistribution::Type type,
                        const ProductState& product_state) {
-    ProductState& target = (system_install ? system_products_ :
-        user_products_)[IndexFromDistType(type)];
+    ProductState& target = system_install ? system_chrome_ : user_chrome_;
     target.CopyFrom(product_state);
   }
 };
 
 class MockInstallerState : public InstallerState {
  public:
   void set_level(Level level) {
     InstallerState::set_level(level);
   }
 
@@ skipping 40 matching lines @@
     base::FilePath install_path =
         installer::GetChromeInstallPath(system_level, dist);
     product_state.SetUninstallProgram(
       install_path.AppendASCII(current_version_->GetString())
           .Append(installer::kInstallerDir)
           .Append(installer::kSetupExe));
     product_state.AddUninstallSwitch(installer::switches::kUninstall);
     if (system_level)
       product_state.AddUninstallSwitch(installer::switches::kSystemLevel);
 
-    installation_state->SetProductState(system_level,
-                                        BrowserDistribution::CHROME_BROWSER,
-                                        product_state);
+    installation_state->SetProductState(system_level, product_state);
   }
 
   MockInstallationState* BuildChromeInstallationState(bool system_level) {
     std::unique_ptr<MockInstallationState> installation_state(
         new MockInstallationState());
     AddChromeToInstallationState(system_level, installation_state.get());
     return installation_state.release();
   }
 
   static MockInstallerState* BuildBasicInstallerState(
@@ skipping 10 matching lines @@
     // Hope this next one isn't checked for now.
     installer_state->set_state_key(L"PROBABLY_INVALID_REG_PATH");
     return installer_state.release();
   }
 
   static void AddChromeToInstallerState(
       const InstallationState& machine_state,
       MockInstallerState* installer_state) {
     // Fresh install or upgrade?
     const ProductState* chrome =
-        machine_state.GetProductState(installer_state->system_install(),
-                                      BrowserDistribution::CHROME_BROWSER);
+        machine_state.GetProductState(installer_state->system_install());
     if (chrome) {
       installer_state->AddProductFromState(*chrome);
     } else {
       BrowserDistribution* dist = BrowserDistribution::GetDistribution();
       installer_state->AddProduct(base::MakeUnique<Product>(dist));
     }
   }
 
   static MockInstallerState* BuildChromeInstallerState(
       bool system_install,
@@ skipping 59 matching lines @@
   AddInstallWorkItems(*installation_state.get(),
                       *installer_state.get(),
                       setup_path_,
                       archive_path_,
                       src_path_,
                       temp_dir_,
                       current_version_.get(),
                       *new_version_.get(),
                       &work_item_list);
 }