summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-17 17:35:30 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-17 17:35:30 +0000
commitd63b097e925a9e20892d4ece658cd12e20ff1b4a (patch)
tree955cad4c71c64ca10786b6725338d51ba06fc9f4
parent723f7c505ba9d21c820710fe88cedd3fd8b07e18 (diff)
downloadchromium_src-d63b097e925a9e20892d4ece658cd12e20ff1b4a.zip
chromium_src-d63b097e925a9e20892d4ece658cd12e20ff1b4a.tar.gz
chromium_src-d63b097e925a9e20892d4ece658cd12e20ff1b4a.tar.bz2
[Win] Fix reporting of the crash client ID/guid for non-browser crash reports.
BUG=364493 Review URL: https://codereview.chromium.org/238253014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264565 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/child_process_logging_win.cc8
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