Retrieve client_id from GoogleUpdateSettings when its missing from Local State.

chrome/app/client_util.cc

Index: chrome/app/client_util.cc
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index 96295dcdd39d7c59c7519898ba15c8067142c3a4..187c2e5c076b2eb73c25bef12468b9a8eab3e3f7 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -76,10 +76,10 @@ void GetPreReadPopulationAndGroup(double* population, double* group) {
   // By default we use the metrics id for the user as stable pseudo-random
   // input to a hash.
   std::string metrics_id;
-  GoogleUpdateSettings::RetrieveMetricsID(&metrics_id);
+  GoogleUpdateSettings::RetrieveMetricsInfo(&metrics_id, NULL);
 
-  // If this user has not metrics id, we fall back to a purely random value
-  // per browser session.
+  // If this user has no metrics id, we fall back to a purely random value per
+  // browser session.
   const size_t kLength = 16;
   std::string random_value(metrics_id.empty() ? base::RandBytesAsString(kLength)
                                               : metrics_id);