Retrieve client_id from GoogleUpdateSettings when its missing from Local State.
Precursor refactoring CL @ https://codereview.chromium.org/365133005/
Precursor kInstallDate move to metrics_pref_names @ https://codereview.chromium.org/370813003/
This is the Windows implementation, POSIX implementation to follow in https://codereview.chromium.org/377713002/ (easier to develop and test on Linux in a follow-up CL)
BUG=391338
Review URL: https://codereview.chromium.org/372473004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284805 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/common/child_process_logging_win.cc b/chrome/common/child_process_logging_win.cc
index b8497342..37a8d3e 100644
--- a/chrome/common/child_process_logging_win.cc
+++ b/chrome/common/child_process_logging_win.cc
@@ -7,10 +7,12 @@
#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 {
@@ -69,9 +71,10 @@
// 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
