Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Unified Diff: components/crash/content/app/crashpad.cc

Issue 2034393004: Allow multiple logging::LogMessage{Handler,Listener}s Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up, MockLog uses listener Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/crash/content/app/crashpad.cc
diff --git a/components/crash/content/app/crashpad.cc b/components/crash/content/app/crashpad.cc
index 72d68fb89ab1d755238deddc883c80a829ab225e..ec3b1ba81fb9aeaaa5e81f3dd1a8681b98538c90 100644
--- a/components/crash/content/app/crashpad.cc
+++ b/components/crash/content/app/crashpad.cc
@@ -61,14 +61,14 @@ void ClearCrashKey(const base::StringPiece& key) {
g_simple_string_dictionary->RemoveKey(key.data());
}
-bool LogMessageHandler(int severity,
- const char* file,
- int line,
- size_t message_start,
- const std::string& string) {
+void LogMessageListener(int severity,
+ const char* file,
+ int line,
+ size_t message_start,
+ const std::string& string) {
// Only handle FATAL.
if (severity != logging::LOG_FATAL) {
- return false;
+ return;
}
// In case of an out-of-memory condition, this code could be reentered when
@@ -77,7 +77,7 @@ bool LogMessageHandler(int severity,
// should work.
static bool guarded = false;
if (guarded) {
- return false;
+ return;
}
base::AutoReset<bool> guard(&guarded, true);
@@ -96,7 +96,6 @@ bool LogMessageHandler(int severity,
// Rather than including the code to force the crash here, allow the caller to
// do it.
- return false;
}
void DumpWithoutCrashing() {
@@ -246,7 +245,7 @@ void InitializeCrashpadImpl(bool initial_client,
SetCrashKeyValue("pid", base::IntToString(::GetCurrentProcessId()));
#endif
- logging::SetLogMessageHandler(LogMessageHandler);
+ logging::AddLogMessageListener(LogMessageListener);
// If clients called CRASHPAD_SIMULATE_CRASH() instead of
// base::debug::DumpWithoutCrashing(), these dumps would appear as crashes in

Powered by Google App Engine
This is Rietveld 408576698