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

chrome/installer/util/product_unittest.cc

Index: chrome/installer/util/product_unittest.cc
diff --git a/chrome/installer/util/product_unittest.cc b/chrome/installer/util/product_unittest.cc
index 6adaf01e6ae33bcbabacd579d0777d5f7ea8a589..edef13313f09492f2070c610f0c5b0125ba17a36 100644
--- a/chrome/installer/util/product_unittest.cc
+++ b/chrome/installer/util/product_unittest.cc
@@ -61,8 +61,7 @@ TEST(ProductTest, ProductInstallBasic) {
 
     // There should be no installed version in the registry.
     machine_state.Initialize();
-    EXPECT_TRUE(machine_state.GetProductState(
-        system_level, distribution->GetType()) == NULL);
+    EXPECT_TRUE(machine_state.GetProductState(system_level) == NULL);

[huangs, 2017/01/09 09:09:10]

InstallationState::GetProductState() is changed to returns nullptr, but I
presume you want to keep NULL usage consistent throughout file?

[grt (UTC plus 2), 2017/01/09 10:11:45]

NULL -> nullptr in this file

 
     // Let's pretend chrome is installed.
     RegKey version_key(root, distribution->GetVersionKey().c_str(),
@@ -78,7 +77,7 @@ TEST(ProductTest, ProductInstallBasic) {
     // We started out with a non-msi product.
     machine_state.Initialize();
     const installer::ProductState* chrome_state =
-        machine_state.GetProductState(system_level, distribution->GetType());
+        machine_state.GetProductState(system_level);
     EXPECT_TRUE(chrome_state != NULL);
     if (chrome_state != NULL) {
       EXPECT_EQ(chrome_state->version(), current_version);
@@ -94,8 +93,7 @@ TEST(ProductTest, ProductInstallBasic) {
     // Set the MSI marker, refresh, and verify that we now see the MSI marker.
     EXPECT_TRUE(product->SetMsiMarker(system_level, true));
     machine_state.Initialize();
-    chrome_state =
-        machine_state.GetProductState(system_level, distribution->GetType());
+    chrome_state = machine_state.GetProductState(system_level);
     EXPECT_TRUE(chrome_state != NULL);
     if (chrome_state != NULL)
       EXPECT_TRUE(chrome_state->is_msi());