Remove uses of BrowserDistribution::CHROME_BINARIES in installer_util.

chrome/installer/util/google_update_settings.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
 #define CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 163 matching lines @@
   static bool SetClient(const base::string16& client);
 
   // Returns in 'client' the RLZ referral available for some distribution
   // partners. This value does not exist for most chrome or chromium installs.
   static bool GetReferral(base::string16* referral);
 
   // Overwrites the current value of the referral with an empty string. Returns
   // true if this operation succeeded.
   static bool ClearReferral();
 
-  // Convenience routine: UpdateDidRunStateForApp() specialized for the current
-  // BrowserDistribution, and also updates Chrome Binary's did_run if the
-  // current distribution is multi-install.
+  // Updates Chrome's "did run" state, returning true if the update succeeds.
   static bool UpdateDidRunState(bool did_run, bool system_level);
 
-  // Returns only the channel name: "" (stable), "dev", "beta", "canary", or
-  // "unknown" if unknown. This value will not be modified by "-m" for a
-  // multi-install. See kChromeChannel* in util_constants.h
+  // Returns the channel name: "" (stable), "dev", "beta", "canary", or
+  // "unknown" if unknown. See kChromeChannel* in util_constants.h
   static base::string16 GetChromeChannel(bool system_install);
 
-  // Return a human readable modifier for the version string, e.g.
-  // the channel (dev, beta, stable). Returns true if this operation succeeded,
-  // on success, channel contains one of "", "unknown", "dev" or "beta" (unless
-  // it is a multi-install product, in which case it will return "m",
-  // "unknown-m", "dev-m", or "beta-m").
-  static bool GetChromeChannelAndModifiers(bool system_install,
-                                           base::string16* channel);
-
   // This method changes the Google Update "ap" value to move the installation
   // on to or off of one of the recovery channels.
   // - If incremental installer fails we append a magic string ("-full"), if
   // it is not present already, so that Google Update server next time will send
   // full installer to update Chrome on the local machine
   // - If we are currently running full installer, we remove this magic
   // string (if it is present) regardless of whether installer failed or not.
   // There is no fall-back for full installer :)
   // - Unconditionally remove "-multifail" since we haven't crashed.
   // |state_key| should be obtained via InstallerState::state_key().
@@ skipping 136 matching lines @@
   // this will do nothing to |experiment_labels|. This will return true if the
   // label did not exist, or was successfully read.
   static bool ReadExperimentLabels(bool system_install,
                                    base::string16* experiment_labels);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);
 };
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_