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

chrome/installer/util/product_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/util/product.h"
 
 #include <memory>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
   EXPECT_EQ(std::wstring::npos,
             user_data_dir.value().find(program_files.value()));
 
   HKEY root = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   {
     RegistryOverrideManager override_manager;
     override_manager.OverrideRegistry(root);
 
     // 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(),
                        KEY_ALL_ACCESS);
     ASSERT_TRUE(version_key.Valid());
 
     const char kCurrentVersion[] = "1.2.3.4";
     base::Version current_version(kCurrentVersion);
     version_key.WriteValue(google_update::kRegVersionField,
                            base::UTF8ToWide(
                                current_version.GetString()).c_str());
 
     // 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);
       EXPECT_FALSE(chrome_state->is_msi());
     }
 
     // Create a make-believe client state key.
     RegKey key;
     std::wstring state_key_path(distribution->GetStateKey());
     ASSERT_EQ(ERROR_SUCCESS,
         key.Create(root, state_key_path.c_str(), KEY_ALL_ACCESS));
 
     // 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());
   }
 }
 
 TEST(ProductTest, LaunchChrome) {
   // TODO(tommi): Test Product::LaunchChrome and
   // Product::LaunchChromeAndWait.
   NOTIMPLEMENTED();
 }