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

chrome/test/chromedriver/logging.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/logging.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ skipping 78 matching lines @@
   return session->driver_log.get();
 }
 
 bool InternalIsVLogOn(int vlog_level) {
   WebDriverLog* session_log = GetSessionLog();
   Log::Level session_level = session_log ? session_log->min_level() : Log::kOff;
   Log::Level level = g_log_level < session_level ? g_log_level : session_level;
   return GetLevelFromSeverity(vlog_level * -1) >= level;
 }
 
-bool HandleLogMessage(int severity,
-                      const char* file,
-                      int line,
-                      size_t message_start,
-                      const std::string& str) {
+class LogMessageHandler : logging::LogMessageHandler {
+  bool OnMessage(int severity,
+                 const char* file,
+                 int line,
+                 size_t message_start,
+                 const std::string& str) override;
+};
+
+bool LogMessageHandler::OnMessage(int severity,
+                                  const char* file,
+                                  int line,
+                                  size_t message_start,
+                                  const std::string& str) {
   Log::Level level = GetLevelFromSeverity(severity);
   std::string message = str.substr(message_start);
 
   if (level >= g_log_level) {
     const char* level_name = LevelToName(level);
     std::string entry = base::StringPrintf(
         "[%.3lf][%s]: %s",
         base::TimeDelta(base::TimeTicks::Now() -
                         base::TimeTicks::FromInternalValue(g_start_time))
             .InSecondsF(),
@@ skipping 116 matching lines @@
     g_log_level = Log::kAll;
 
   // Turn on VLOG for chromedriver. This is parsed during logging::InitLogging.
   cmd_line->AppendSwitchASCII("vmodule", "*/chrome/test/chromedriver/*=3");
 
   logging::SetMinLogLevel(logging::LOG_WARNING);
   logging::SetLogItems(false,   // enable_process_id
                        false,   // enable_thread_id
                        false,   // enable_timestamp
                        false);  // enable_tickcount
-  logging::SetLogMessageHandler(&HandleLogMessage);
+  auto* handler = new LogMessageHandler();  // Intentionally leak this instance.
+  CHECK(handler);

[brettw, 2016/11/14 22:01:31]

Normally we wouldn't bother asserting the malloc returns null. I'd just do
  new LogMessageHandler();  // Intentionally leak this instance.
(unless this causes compiler warnings?).

[wychen, 2016/11/18 21:14:00]

Done.

 
   logging::LoggingSettings logging_settings;
   logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   return logging::InitLogging(logging_settings);
 }
 
 Status CreateLogs(const Capabilities& capabilities,
                   const Session* session,
                   ScopedVector<WebDriverLog>* out_logs,
                   ScopedVector<DevToolsEventListener>* out_devtools_listeners,
@@ skipping 40 matching lines @@
   logs.push_back(browser_log);
   // If the level is OFF, don't even bother listening for DevTools events.
   if (browser_log_level != Log::kOff)
     devtools_listeners.push_back(new ConsoleLogger(browser_log));
 
   out_logs->swap(logs);
   out_devtools_listeners->swap(devtools_listeners);
   out_command_listeners->swap(command_listeners);
   return Status(kOk);
 }