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

chrome/installer/util/helper.cc

Index: chrome/installer/util/helper.cc
diff --git a/chrome/installer/util/helper.cc b/chrome/installer/util/helper.cc
index a62ce6a055b04b43c96c919cc8ccef2165091e1a..f3aaa0e44bc1f298015b690cab63d2c8746774d9 100644
--- a/chrome/installer/util/helper.cc
+++ b/chrome/installer/util/helper.cc
@@ -33,19 +33,15 @@ base::FilePath GetChromeInstallPath(bool system_install,
 }
 
 BrowserDistribution* GetBinariesDistribution(bool system_install) {
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   ProductState state;
 
   // If we're part of a multi-install, we need to poll using the multi-installer
-  // package's app guid rather than the browser's or Chrome Frame's app guid.
-  // If we can't read the app's state from the registry, assume it isn't
-  // multi-installed.
-  if (state.Initialize(system_install, dist) && state.is_multi_install()) {
-    return BrowserDistribution::GetSpecificDistribution(
-        BrowserDistribution::CHROME_BINARIES);
-  } else {
-    return dist;
-  }
+  // package's app guid rather than the browser's.  If we can't read the app's

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

NIT: Extra space after ".".

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

Done.

+  // state from the registry, assume it isn't multi-installed.
+  if (!state.Initialize(system_install) || !state.is_multi_install())
+    return BrowserDistribution::GetDistribution();
+  return BrowserDistribution::GetSpecificDistribution(
+      BrowserDistribution::CHROME_BINARIES);
 }
 
 std::wstring GetAppGuidForUpdates(bool system_install) {