| Index: third_party/crashpad/crashpad/util/thread/thread_log_messages.cc
|
| diff --git a/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc b/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc
|
| index 7f67e458379bdda2a73498f1c7cbe28d05113b20..686ac24979fc0e44bdfa7421bff755fc608b621c 100644
|
| --- a/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc
|
| +++ b/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc
|
| @@ -41,19 +41,18 @@ class ThreadLogMessagesMaster {
|
| tls_.Initialize(nullptr);
|
| DCHECK(tls_.initialized());
|
|
|
| - DCHECK(!logging::GetLogMessageHandler());
|
| - logging::SetLogMessageHandler(LogMessageHandler);
|
| + logging::PushLogMessageHandler(LogMessageHandler);
|
| }
|
|
|
| ~ThreadLogMessagesMaster() {
|
| - DCHECK_EQ(logging::GetLogMessageHandler(), LogMessageHandler);
|
| - logging::SetLogMessageHandler(nullptr);
|
| + DCHECK_EQ(logging::GetTopLogMessageHandler(), LogMessageHandler);
|
| + logging::PopLogMessageHandler();
|
|
|
| tls_.Free();
|
| }
|
|
|
| void SetThreadMessageList(std::vector<std::string>* message_list) {
|
| - DCHECK_EQ(logging::GetLogMessageHandler(), LogMessageHandler);
|
| + DCHECK_EQ(logging::GetTopLogMessageHandler(), LogMessageHandler);
|
| DCHECK_NE(tls_.Get() != nullptr, message_list != nullptr);
|
| tls_.Set(message_list);
|
| }
|
|
|