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

base/test/mock_log.h

Index: base/test/mock_log.h
diff --git a/base/test/mock_log.h b/base/test/mock_log.h
index cda2fcd6259cbf080ba1bdc0c4195c00a12d69be..e680a67d651a05a6cfd215a5b68f4d1e084efa51 100644
--- a/base/test/mock_log.h
+++ b/base/test/mock_log.h
@@ -60,11 +60,9 @@ class MockLog {
   void StopCapturingLogs();
 
   // Log method is invoked for every log message before it's sent to other log
-  // destinations (if any).  The method should return true to signal that it
-  // handled the message and the message should not be sent to other log
-  // destinations.
+  // destinations (if any).
   MOCK_METHOD5(Log,
-               bool(int severity,
+               void(int severity,
                     const char* file,
                     int line,
                     size_t message_start,
@@ -77,20 +75,17 @@ class MockLog {
   // Lock protecting access to g_instance_.
   static Lock g_lock;
 
-  // Static function which is set as the logging message handler.
+  // Static function which is set as the logging message listener.
   // Called once for each message.
-  static bool LogMessageHandler(int severity,
-                                const char* file,
-                                int line,
-                                size_t message_start,
-                                const std::string& str);
+  static void LogMessageListener(int severity,
+                                 const char* file,
+                                 int line,
+                                 size_t message_start,
+                                 const std::string& str);
 
   // True if this object is currently capturing logs.
   bool is_capturing_logs_;
 
-  // The previous handler to restore when the MockLog is destroyed.
-  logging::LogMessageHandlerFunction previous_handler_;
-
   DISALLOW_COPY_AND_ASSIGN(MockLog);
 };