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

remoting/client/plugin/chromoting_instance.h

Index: remoting/client/plugin/chromoting_instance.h
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index 2d2043afefe4a352276149a505a97e13c12e2970..5c91643839d2f900f58ab126c04171bfc4876617 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -64,6 +64,7 @@ class PepperAudioPlayer;
 class ChromotingClient;
 class ClientContext;
 class DelegatingSignalStrategy;
+class LogToUI;
 class PepperAudioPlayer;
 class PepperMouseLocker;
 
@@ -136,12 +137,12 @@ class ChromotingInstance : public ClientUserInterface,
   void OnVideoFrameDirtyRegion(
       const webrtc::DesktopRegion& dirty_region) override;
 
-  // Registers a global log message handler that redirects the log output to
+  // Registers a global log message listener that redirects the log output to
   // our plugin instance.
   // This is called by the plugin's PPP_InitializeModule.
   // Note that no logging will be processed unless a ChromotingInstance has been
   // registered for logging (see RegisterLoggingInstance).
-  static void RegisterLogMessageHandler();
+  static void RegisterLogMessageListener();
 
   // Registers this instance so it processes messages sent by the global log
   // message handler. This overwrites any previously registered instance.
@@ -152,12 +153,6 @@ class ChromotingInstance : public ClientUserInterface,
   // then the currently registered instance will stay in effect.
   void UnregisterLoggingInstance();
 
-  // A Log Message Handler that is called after each LOG message has been
-  // processed. This must be of type LogMessageHandlerFunction defined in
-  // base/logging.h.
-  static bool LogToUI(int severity, const char* file, int line,
-                      size_t message_start, const std::string& str);
-
   // Requests the webapp to fetch a third-party token.
   void FetchThirdPartyToken(
       const std::string& host_public_key,
@@ -293,6 +288,8 @@ class ChromotingInstance : public ClientUserInterface,
   // Weak reference to this instance, used for global logging and task posting.
   base::WeakPtrFactory<ChromotingInstance> weak_factory_;
 
+  std::unique_ptr<LogToUI> log_to_ui_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromotingInstance);
 };