Retrieve client_id from GoogleUpdateSettings when its missing from Local State.

chrome/app/client_util.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 <windows.h>
 #include <shlwapi.h>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
@@ skipping 16 matching lines @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "components/breakpad/app/breakpad_client.h"
 #include "components/breakpad/app/breakpad_win.h"
+#include "components/metrics/client_info.h"
 #include "content/public/app/startup_helper_win.h"
 #include "sandbox/win/src/sandbox.h"
 
 namespace {
 // The entry point signature of chrome.dll.
 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*);
 
 typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)();
 
 base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
@@ skipping 21 matching lines @@
 
   // Return true if the build time predates the expiration time..
   return build_time < expiration_time;
 }
 
 // Get random unit values, i.e., in the range (0, 1), denoting a die-toss for
 // being in an experiment population and experimental group thereof.
 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::LoadMetricsClientId(&metrics_id);
+  scoped_ptr<metrics::ClientInfo> client_info =
+      GoogleUpdateSettings::LoadMetricsClientInfo();
 
-  // 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);
+  std::string random_value(client_info ? client_info->client_id
+                                       : base::RandBytesAsString(kLength));
 
   // To interpret the value as a random number we hash it and read the first 8
   // bytes of the hash as a unit-interval representing a die-toss for being in
   // the experiment population and the second 8 bytes as a die-toss for being
   // in various experiment groups.
   unsigned char sha1_hash[base::kSHA1Length];
   base::SHA1HashBytes(
       reinterpret_cast<const unsigned char*>(random_value.c_str()),
       random_value.size() * sizeof(random_value[0]),
       sha1_hash);
@@ skipping 266 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }