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

remoting/client/plugin/chromoting_instance.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 "remoting/client/plugin/chromoting_instance.h"
 
 #include <nacl_io/nacl_io.h>
 #include <sys/mount.h>
 
 #include <string>
@@ skipping 152 matching lines @@
       text_input_controller_(this),
       use_async_pin_dialog_(false),
       weak_factory_(this) {
   // In NaCl global resources need to be initialized differently because they
   // are not shared with Chrome.
   thread_task_runner_handle_.reset(
       new base::ThreadTaskRunnerHandle(plugin_task_runner_));
   thread_wrapper_ =
       jingle_glue::JingleThreadWrapper::WrapTaskRunner(plugin_task_runner_);
 
-  // Register a global log handler.
-  ChromotingInstance::RegisterLogMessageHandler();
+  // Register a log listener.
+  log_to_ui_ = base::MakeUnique<LogToUI>();
 
   nacl_io_init_ppapi(pp_instance, pp::Module::Get()->get_browser_interface());
   mount("", "/etc", "memfs", 0, "");
   mount("", "/usr", "memfs", 0, "");
 
   // Register for mouse, wheel and keyboard events.
   RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL);
   RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD);
 
   // Disable the client-side IME in Chrome.
@@ skipping 845 matching lines @@
   data->SetDouble("maxEncodeLatency", perf_tracker_.video_encode_ms().Max());
   data->SetDouble("decodeLatency", perf_tracker_.video_decode_ms().Average());
   data->SetDouble("maxDecodeLatency", perf_tracker_.video_decode_ms().Max());
   data->SetDouble("renderLatency", perf_tracker_.video_paint_ms().Average());
   data->SetDouble("maxRenderLatency", perf_tracker_.video_paint_ms().Max());
   data->SetDouble("roundtripLatency", perf_tracker_.round_trip_ms().Average());
   data->SetDouble("maxRoundtripLatency", perf_tracker_.round_trip_ms().Max());
   PostLegacyJsonMessage("onPerfStats", std::move(data));
 }
 
-// static
-void ChromotingInstance::RegisterLogMessageHandler() {
-  base::AutoLock lock(g_logging_lock.Get());
-
-  // Set up log message handler.
-  // This is not thread-safe so we need it within our lock.
-  logging::SetLogMessageHandler(&LogToUI);
-}
-
 void ChromotingInstance::RegisterLoggingInstance() {
   base::AutoLock lock(g_logging_lock.Get());
   g_logging_instance = pp_instance();
 }
 
 void ChromotingInstance::UnregisterLoggingInstance() {
   base::AutoLock lock(g_logging_lock.Get());
 
   // Don't unregister unless we're the currently registered instance.
   if (pp_instance() != g_logging_instance)
     return;
 
   // Unregister this instance for logging.
   g_logging_instance = 0;
 }
 
-// static
-bool ChromotingInstance::LogToUI(int severity, const char* file, int line,
-                                 size_t message_start,
-                                 const std::string& str) {
+class LogToUI : logging::LogMessageListener {
+ public:
+  void OnMessage(int severity,
+                 const char* file,
+                 int line,
+                 size_t message_start,
+                 const std::string& str) override;
+};
+
+void LogToUI::OnMessage(int severity,
+                        const char* file,
+                        int line,
+                        size_t message_start,
+                        const std::string& str) {
   PP_LogLevel log_level = PP_LOGLEVEL_ERROR;
   switch (severity) {
     case logging::LOG_INFO:
       log_level = PP_LOGLEVEL_TIP;
       break;
     case logging::LOG_WARNING:
       log_level = PP_LOGLEVEL_WARNING;
       break;
     case logging::LOG_ERROR:
     case logging::LOG_FATAL:
@@ skipping 12 matching lines @@
         pp::Module::Get()->GetBrowserInterface(PPB_CONSOLE_INTERFACE));
     if (console)
       console->Log(pp_instance, log_level, pp::Var(str).pp_var());
   }
 
   // If this is a fatal message the log handler is going to crash after this
   // function returns. In that case sleep for 1 second, Otherwise the plugin
   // may crash before the message is delivered to the console.
   if (severity == logging::LOG_FATAL)
     base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
-
-  return false;
 }
 
 bool ChromotingInstance::IsConnected() {
   return client_ &&
          (client_->connection_state() == protocol::ConnectionToHost::CONNECTED);
 }
 
 void ChromotingInstance::UpdateUmaEnumHistogram(
     const std::string& histogram_name,
     int64_t value,
@@ skipping 14 matching lines @@
   if (is_custom_counts_histogram) {
     uma.HistogramCustomCounts(histogram_name, value, histogram_min,
                               histogram_max, histogram_buckets);
   } else {
     uma.HistogramCustomTimes(histogram_name, value, histogram_min,
                              histogram_max, histogram_buckets);
   }
 }
 
 }  // namespace remoting