Refactor SetClientID such that metrics rather than crash backs up the client id in Google Update set

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 <string>
 
 #include "base/basictypes.h"
@@ skipping 68 matching lines @@
   // crash dumps to Google. This information is collected by the web server
   // used to download the chrome installer.
   static bool GetCollectStatsConsentAtLevel(bool system_install);
 
   // Sets the user consent to send UMA and crash dumps to Google. Returns
   // false if the setting could not be recorded.
   static bool SetCollectStatsConsentAtLevel(bool system_install,
                                             bool consented);
 #endif
 
-  // Returns the metrics id set in the registry (that can be used in crash
-  // reports). If none found, returns empty string.
-  static bool GetMetricsId(std::string* metrics_id);
+  // Returns the metrics client-id backed up in the registry. If none found,

[grt (UTC plus 2), 2014/07/09 12:59:59]

nit: "client-id" doesn't seem to be used elsewhere. please use whichever of
"client id", "Client ID", "ClientID", etc... is most prevalent.

[gab, 2014/07/09 14:42:39]

Done.

+  // returns empty string.
+  static bool LoadMetricsClientId(std::string* metrics_id);
 
-  // Sets the metrics id to be used in crash reports.
-  static bool SetMetricsId(const std::string& metrics_id);
+  // Stores a backup of the metrics client-id in the registry.
+  static bool StoreMetricsClientId(const std::string& metrics_id);
 
   // Sets the machine-wide EULA consented flag required on OEM installs.
   // Returns false if the setting could not be recorded.
   static bool SetEULAConsent(const installer::InstallationState& machine_state,
                              BrowserDistribution* dist,
                              bool consented);
 
   // Returns the last time chrome was run in days. It uses a recorded value
   // set by SetLastRunTime(). Returns -1 if the value was not found or if
   // the value is corrupted.
@@ skipping 201 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_