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

chrome/installer/setup/setup_util_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/setup_util_unittest.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
 #include <memory>
@@ skipping 369 matching lines @@
     max_version_ = base::Version("47.0.1559.0");
 
     // Install the product according to the version.
     original_state_.reset(new FakeInstallationState());
     InstallProduct();
 
     // Prepare to update the product in the temp dir.
     installer_state_.reset(new installer::InstallerState(
         kSystemInstall_ ? installer::InstallerState::SYSTEM_LEVEL :
         installer::InstallerState::USER_LEVEL));
-    installer_state_->AddProductFromState(*original_state_->GetProductState(
-        kSystemInstall_, BrowserDistribution::CHROME_BROWSER));
+    installer_state_->AddProductFromState(
+        *original_state_->GetProductState(kSystemInstall_));
 
     // Create archives in the two version dirs.
     ASSERT_TRUE(
         base::CreateDirectory(GetProductVersionArchivePath().DirName()));
     ASSERT_EQ(1, base::WriteFile(GetProductVersionArchivePath(), "a", 1));
     ASSERT_TRUE(
         base::CreateDirectory(GetMaxVersionArchivePath().DirName()));
     ASSERT_EQ(1, base::WriteFile(GetMaxVersionArchivePath(), "b", 1));
   }
 
@@ skipping 11 matching lines @@
   base::FilePath GetMaxVersionArchivePath() const {
     return GetArchivePath(max_version_);
   }
 
   base::FilePath GetProductVersionArchivePath() const {
     return GetArchivePath(product_version_);
   }
 
   void InstallProduct() {
     FakeProductState* product = FakeProductState::FromProductState(
-        original_state_->GetNonVersionedProductState(
-            kSystemInstall_, BrowserDistribution::CHROME_BROWSER));
+        original_state_->GetNonVersionedProductState(kSystemInstall_));
 
     product->set_version(product_version_);
     base::CommandLine uninstall_command(
         test_dir_.GetPath()
             .AppendASCII(product_version_.GetString())
             .Append(installer::kInstallerDir)
             .Append(installer::kSetupExe));
     uninstall_command.AppendSwitch(installer::switches::kUninstall);
     product->set_uninstall_command(uninstall_command);
   }
 
   void UninstallProduct() {
     FakeProductState::FromProductState(
-        original_state_->GetNonVersionedProductState(
-            kSystemInstall_, BrowserDistribution::CHROME_BROWSER))
+        original_state_->GetNonVersionedProductState(kSystemInstall_))
         ->set_version(base::Version());
   }
 
   static const bool kSystemInstall_;
   base::ScopedTempDir test_dir_;
   base::Version product_version_;
   base::Version max_version_;
   std::unique_ptr<FakeInstallationState> original_state_;
   std::unique_ptr<installer::InstallerState> installer_state_;
 
@@ skipping 319 matching lines @@
   EXPECT_FALSE(HasBinariesVersionKey());
 #if defined(GOOGLE_CHROME_BUILD)
   EXPECT_FALSE(HasMultiGCFVersionKey());
   EXPECT_FALSE(HasAppLauncherVersionKey());
   EXPECT_FALSE(HasAppHostExe());
   EXPECT_FALSE(HasInstallExtensionCommand());
 #endif  // GOOGLE_CHROME_BUILD
 }
 
 }  // namespace installer