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

chrome/installer/util/google_update_settings.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/google_update_settings.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 142 matching lines @@
              KEY_READ | KEY_WRITE | KEY_WOW64_32KEY);
   if (!key.HasValue(name))
     return true;
   return (key.DeleteValue(name) == ERROR_SUCCESS);
 }
 
 // Initializes |channel_info| based on |system_install| and |dist|. Also
 // returns whether the install is a multi-install via output parameter
 // |is_multi_install|. Returns false on failure.
 bool InitChannelInfo(bool system_install,
-                     BrowserDistribution* dist,
                      installer::ChannelInfo* channel_info,
                      bool* is_multi_install) {
   // Determine whether or not chrome is multi-install. If so, updates are
   // delivered under the binaries' app guid, so that's where the relevant
   // channel is found.
   installer::ProductState state;
-  ignore_result(state.Initialize(system_install, dist));
+  ignore_result(state.Initialize(system_install));
   if (!state.is_multi_install()) {
     // Use the channel info that was just read for this single-install chrome.
     *channel_info = state.channel();
   } else {
     // Read the channel info from the binaries' state key.
     HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-    dist = BrowserDistribution::GetSpecificDistribution(
+    BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
         BrowserDistribution::CHROME_BINARIES);
     RegKey key(root_key, dist->GetStateKey().c_str(),
                KEY_READ | KEY_WOW64_32KEY);
 
     if (!channel_info->Initialize(key))
       return false;
   }
   *is_multi_install = state.is_multi_install();
   return true;
 }
 
 bool GetChromeChannelInternal(bool system_install,
                               bool add_multi_modifier,
                               base::string16* channel) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
 
   // Shortcut in case this distribution knows what channel it is (canary).
   if (dist->GetChromeChannel(channel))
     return true;
 
   installer::ChannelInfo channel_info;
   bool is_multi_install = false;
-  if (!InitChannelInfo(system_install, dist, &channel_info,
-                       &is_multi_install)) {
+  if (!InitChannelInfo(system_install, &channel_info, &is_multi_install)) {
     channel->assign(installer::kChromeChannelUnknown);
     return false;
   }
 
   if (!channel_info.GetChannelName(channel))
     channel->assign(installer::kChromeChannelUnknown);
 
   // Tag the channel name if this is a multi-install.
   if (add_multi_modifier && is_multi_install) {
     if (!channel->empty())
@@ skipping 141 matching lines @@
   // When opting out, clear registry backup of client id and related values.
   if (result == ERROR_SUCCESS && !consented)
     StoreMetricsClientInfo(metrics::ClientInfo());
 
   return (result == ERROR_SUCCESS);
 }
 
 // static
 bool GoogleUpdateSettings::GetCollectStatsConsentDefault(
     bool* stats_consent_default) {
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   installer::ChannelInfo channel_info;
   bool is_multi_install = false;
-  if (InitChannelInfo(IsSystemInstall(), dist, &channel_info,
-                      &is_multi_install)) {
+  if (InitChannelInfo(IsSystemInstall(), &channel_info, &is_multi_install)) {
     base::string16 stats_default = channel_info.GetStatsDefault();
     if (stats_default == L"0" || stats_default == L"1") {
       *stats_consent_default = (stats_default == L"1");
       return true;
     }
   }
   return false;
 }
 
 std::unique_ptr<metrics::ClientInfo>
@@ skipping 655 matching lines @@
   }
 
   // If the key or value was not present, return the empty string.
   if (result == ERROR_FILE_NOT_FOUND || result == ERROR_PATH_NOT_FOUND) {
     experiment_labels->clear();
     return true;
   }
 
   return result == ERROR_SUCCESS;
 }