diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-21 19:17:30 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-21 19:17:30 +0000 |
| commit | 536621852f376efdbc760a33a1cc6c6f9a68b9a6 (patch) | |
| tree | 5b2baaf76659761a686d4a68fe1bd62831572391 | |
| parent | 1f0f4846cab443ea3c394b378e81958c76388e7a (diff) | |
| download | chromium_src-536621852f376efdbc760a33a1cc6c6f9a68b9a6.zip chromium_src-536621852f376efdbc760a33a1cc6c6f9a68b9a6.tar.gz chromium_src-536621852f376efdbc760a33a1cc6c6f9a68b9a6.tar.bz2 | |
Merge 264565 "[Win] Fix reporting of the crash client ID/guid fo..."
> [Win] Fix reporting of the crash client ID/guid for non-browser crash reports.
>
> BUG=364493
>
> Review URL: https://codereview.chromium.org/238253014
TBR=rsesek@chromium.org
Review URL: https://codereview.chromium.org/245563004
git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@265041 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/child_process_logging_win.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/child_process_logging_win.cc b/chrome/common/child_process_logging_win.cc index 4cf9b0a..1befb33 100644 --- a/chrome/common/child_process_logging_win.cc +++ b/chrome/common/child_process_logging_win.cc @@ -10,6 +10,7 @@ #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" namespace child_process_logging { @@ -63,6 +64,13 @@ void Init() { 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); } } // namespace child_process_logging |