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

chrome/browser/chrome_browser_main_win.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/browser/chrome_browser_main_win.h"
 
 #include <shellapi.h>
 #include <stddef.h>
 #include <windows.h>
 
@@ skipping 442 matching lines @@
 
     // Exit as we are not launching the browser.
     return content::RESULT_CODE_NORMAL_EXIT;
   }
   // We don't hide icons so we shouldn't do anything special to show them
   return chrome::RESULT_CODE_UNSUPPORTED_PARAM;
 }
 
 // static
 bool ChromeBrowserMainPartsWin::CheckMachineLevelInstall() {
   // TODO(tommi): Check if using the default distribution is always the right

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

Is this TODO now irrelevant?

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

Yes!

   // thing to do.
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   base::Version version;
   InstallUtil::GetChromeVersion(dist, true, &version);
   if (version.IsValid()) {
     base::FilePath exe_path;
     PathService::Get(base::DIR_EXE, &exe_path);
     std::wstring exe = exe_path.value();
     base::FilePath user_exe_path(installer::GetChromeInstallPath(false, dist));
     if (base::FilePath::CompareEqualIgnoreCase(exe, user_exe_path.value())) {
       base::CommandLine uninstall_cmd(
-          InstallUtil::GetChromeUninstallCmd(false, dist->GetType()));
+          InstallUtil::GetChromeUninstallCmd(false));
       if (!uninstall_cmd.GetProgram().empty()) {
         uninstall_cmd.AppendSwitch(installer::switches::kSelfDestruct);
         uninstall_cmd.AppendSwitch(installer::switches::kForceUninstall);
         uninstall_cmd.AppendSwitch(
             installer::switches::kDoNotRemoveSharedItems);
 
         // Trigger Active Setup for the system-level Chrome to make sure
         // per-user shortcuts to the system-level Chrome are created. Skip this
         // if the system-level Chrome will undergo first run anyway, as Active
         // Setup is triggered on system-level Chrome's first run.
@@ skipping 39 matching lines @@
   if (resource_id)
     return l10n_util::GetStringUTF16(resource_id);
   return base::string16();
 }
 
 // static
 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
   CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
   installer::SetTranslationDelegate(&delegate);
 }