Retrieve client_id from GoogleUpdateSettings when its missing from Local State.

chrome/common/child_process_logging_win.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/common/child_process_logging.h"
 
 #include <windows.h>
 
 #include "base/debug/crash_logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/installer/util/google_update_settings.h"
+#include "components/metrics/client_info.h"
 
 namespace child_process_logging {
 
 namespace {
 
 // exported in breakpad_win.cc:
 //    void __declspec(dllexport) __cdecl SetCrashKeyValueImpl.
 typedef void (__cdecl *SetCrashKeyValue)(const wchar_t*, const wchar_t*);
 
 // exported in breakpad_win.cc:
@@ skipping 38 matching lines @@
   // in ChromeBreakpadClient. But on Windows, that is before the DLL module is
   // loaded, which is a prerequisite of the crash key system.
   crash_keys::RegisterChromeCrashKeys();
   base::debug::SetCrashKeyReportingFunctions(
       &SetCrashKeyValueTrampoline, &ClearCrashKeyValueTrampoline);
 
   // This would be handled by BreakpadClient::SetCrashClientIdFromGUID(), but
   // because of the aforementioned issue, crash keys aren't ready yet at the
   // time of Breakpad initialization, load the client id backed up in Google
   // Update settings instead.
-  std::string client_guid;
-  if (GoogleUpdateSettings::LoadMetricsClientId(&client_guid))
-    crash_keys::SetCrashClientIdFromGUID(client_guid);
+  scoped_ptr<metrics::ClientInfo> client_info =
+      GoogleUpdateSettings::LoadMetricsClientInfo();
+  if (client_info)
+    crash_keys::SetCrashClientIdFromGUID(client_info->client_id);
 }
 
 }  // namespace child_process_logging