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

remoting/host/native_messaging/log_message_handler.h

Index: remoting/host/native_messaging/log_message_handler.h
diff --git a/remoting/host/native_messaging/log_message_handler.h b/remoting/host/native_messaging/log_message_handler.h
index 7c5cea08c1256471d4a47889fb17f0d7efa74b75..ac8f01e46fed4038a8f4c5f421442c1dcea141b4 100644
--- a/remoting/host/native_messaging/log_message_handler.h
+++ b/remoting/host/native_messaging/log_message_handler.h
@@ -20,22 +20,26 @@ class SingleThreadTaskRunner;
 
 namespace remoting {
 
-// Helper class for logging::SetLogMessageHandler to deliver log messages to
+// Helper class for logging::LogMessageListener to deliver log messages to
 // a consistent thread in a thread-safe way and in a format suitable for sending
 // over a Native Messaging channel.
-class LogMessageHandler {
+class LogMessageListener : logging::LogMessageListener {
  public:
   typedef base::Callback<void(std::unique_ptr<base::Value> message)> Delegate;
 
-  explicit LogMessageHandler(const Delegate& delegate);
-  ~LogMessageHandler();
+  explicit LogMessageListener(const Delegate& delegate);
+  ~LogMessageListener() override;
 
   static const char* kDebugMessageTypeName;
 
+  // logging::LogMessageListener
+  void OnMessage(int severity,
+                 const char* file,
+                 int line,
+                 size_t message_start,
+                 const std::string& str) override;
+
  private:
-  static bool OnLogMessage(
-      int severity, const char* file, int line,
-      size_t message_start, const std::string& str);
   void PostLogMessageToCorrectThread(
       int severity, const char* file, int line,
       size_t message_start, const std::string& str);
@@ -46,8 +50,7 @@ class LogMessageHandler {
   Delegate delegate_;
   bool suppress_logging_;
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
-  logging::LogMessageHandlerFunction previous_log_message_handler_;
-  base::WeakPtrFactory<LogMessageHandler> weak_ptr_factory_;
+  base::WeakPtrFactory<LogMessageListener> weak_ptr_factory_;
 };
 
 }  // namespace remoting