| 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
|
|
|