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

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/strings/utf_string_conversions.h"
@@ skipping 47 matching lines @@
 }  // namespace
 
 void Init() {
   // Note: on other platforms, this is set up during Breakpad initialization,
   // 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::SetClientID(), but because of the
-  // aforementioned issue, crash keys aren't ready yet at the time of Breakpad
-  // initialization.
-  std::string client_id;
-  if (GoogleUpdateSettings::GetMetricsId(&client_id))
-    base::debug::SetCrashKeyValue(crash_keys::kClientID, client_id);
+  // This would be handled by BreakpadClient::SetBreakpadClientID(), but because

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

SetBreakpadClientID -> SetBreakpadClientIdFromGUID

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

Done.

+  // 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);
 }
 
 }  // namespace child_process_logging