Allow multiple logging::LogMessage{Handler,Listener}s

base/trace_event/trace_event_unittest.cc

Index: base/trace_event/trace_event_unittest.cc
diff --git a/base/trace_event/trace_event_unittest.cc b/base/trace_event/trace_event_unittest.cc
index 25a6d5f3f6213508b9fcc838179038a597252ec1..721436835b580f2913a8a48803832d5bb6371988 100644
--- a/base/trace_event/trace_event_unittest.cc
+++ b/base/trace_event/trace_event_unittest.cc
@@ -2992,9 +2992,7 @@ bool MockLogMessageHandler(int, const char*, int, size_t,
 }
 
 TEST_F(TraceEventTestFixture, EchoToConsole) {
-  logging::LogMessageHandlerFunction old_log_message_handler =
-      logging::GetLogMessageHandler();
-  logging::SetLogMessageHandler(MockLogMessageHandler);
+  logging::PushLogMessageHandler(MockLogMessageHandler);
 
   TraceLog::GetInstance()->SetEnabled(
       TraceConfig(kRecordAllCategoryFilter, ECHO_TO_CONSOLE),
@@ -3017,7 +3015,7 @@ TEST_F(TraceEventTestFixture, EchoToConsole) {
 
   EndTraceAndFlush();
   delete g_log_buffer;
-  logging::SetLogMessageHandler(old_log_message_handler);
+  logging::PopLogMessageHandler();
   g_log_buffer = NULL;
 }
 
@@ -3028,9 +3026,7 @@ bool LogMessageHandlerWithTraceEvent(int, const char*, int, size_t,
 }
 
 TEST_F(TraceEventTestFixture, EchoToConsoleTraceEventRecursion) {
-  logging::LogMessageHandlerFunction old_log_message_handler =
-      logging::GetLogMessageHandler();
-  logging::SetLogMessageHandler(LogMessageHandlerWithTraceEvent);
+  logging::PushLogMessageHandler(LogMessageHandlerWithTraceEvent);
 
   TraceLog::GetInstance()->SetEnabled(
       TraceConfig(kRecordAllCategoryFilter, ECHO_TO_CONSOLE),
@@ -3041,7 +3037,7 @@ TEST_F(TraceEventTestFixture, EchoToConsoleTraceEventRecursion) {
   }
 
   EndTraceAndFlush();
-  logging::SetLogMessageHandler(old_log_message_handler);
+  logging::PopLogMessageHandler();
 }
 
 TEST_F(TraceEventTestFixture, TimeOffset) {