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

net/tools/stress_cache/stress_cache.cc

Index: net/tools/stress_cache/stress_cache.cc
diff --git a/net/tools/stress_cache/stress_cache.cc b/net/tools/stress_cache/stress_cache.cc
index fefcd72f23d7177f48a743d6bc33cf610fe72b67..99271f9cd7fd87d292af425eed94aff21fb7e09c 100644
--- a/net/tools/stress_cache/stress_cache.cc
+++ b/net/tools/stress_cache/stress_cache.cc
@@ -384,19 +384,24 @@ void CrashHandler(const std::string& str) {
   base::debug::BreakDebugger();
 }
 
-bool MessageHandler(int severity, const char* file, int line,
-                    size_t message_start, const std::string& str) {
-  const size_t kMaxMessageLen = 48;
-  char message[kMaxMessageLen];
-  size_t len = std::min(str.length() - message_start, kMaxMessageLen - 1);
-
-  memcpy(message, str.c_str() + message_start, len);
-  message[len] = '\0';
+class MessageListener : logging::LogMessageListener {
+ public:
+  void OnMessage(int severity,
+                 const char* file,
+                 int line,
+                 size_t message_start,
+                 const std::string& str) override {
+    const size_t kMaxMessageLen = 48;
+    char message[kMaxMessageLen];
+    size_t len = std::min(str.length() - message_start, kMaxMessageLen - 1);
+
+    memcpy(message, str.c_str() + message_start, len);
+    message[len] = '\0';
 #if !defined(DISK_CACHE_TRACE_TO_LOG)
-  disk_cache::Trace("%s", message);
+    disk_cache::Trace("%s", message);
 #endif
-  return false;
-}
+  }
+};
 
 // -----------------------------------------------------------------------
 
@@ -415,7 +420,7 @@ int main(int argc, const char* argv[]) {
     return MasterCode();
 
   logging::SetLogAssertHandler(CrashHandler);
-  logging::SetLogMessageHandler(MessageHandler);
+  MessageListener listener;
 
 #if defined(OS_WIN)
   logging::LogEventProvider::Initialize(kStressCacheTraceProviderName);