| Index: remoting/host/native_messaging/log_message_handler.cc
|
| diff --git a/remoting/host/native_messaging/log_message_handler.cc b/remoting/host/native_messaging/log_message_handler.cc
|
| index e2e3cd8b58c67d9c116d172610dba878b52c5fdf..fd73d4f798390f86d7aaa49cdef2a10b9ce80dbc 100644
|
| --- a/remoting/host/native_messaging/log_message_handler.cc
|
| +++ b/remoting/host/native_messaging/log_message_handler.cc
|
| @@ -36,18 +36,13 @@ LogMessageHandler::LogMessageHandler(
|
| LOG(FATAL) << "LogMessageHandler is already registered. Only one instance "
|
| << "per process is allowed.";
|
| }
|
| - previous_log_message_handler_ = logging::GetLogMessageHandler();
|
| - logging::SetLogMessageHandler(&LogMessageHandler::OnLogMessage);
|
| + logging::PushLogMessageHandler(&LogMessageHandler::OnLogMessage);
|
| g_log_message_handler = this;
|
| }
|
|
|
| LogMessageHandler::~LogMessageHandler() {
|
| base::AutoLock lock(g_log_message_handler_lock.Get());
|
| - if (logging::GetLogMessageHandler() != &LogMessageHandler::OnLogMessage) {
|
| - LOG(FATAL) << "LogMessageHandler is not the top-most message handler. "
|
| - << "Cannot unregister.";
|
| - }
|
| - logging::SetLogMessageHandler(previous_log_message_handler_);
|
| + logging::PopLogMessageHandler(&LogMessageHandler::OnLogMessage);
|
| g_log_message_handler = nullptr;
|
| }
|
|
|
|
|