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

content/gpu/gpu_main.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 <stddef.h>
 #include <stdlib.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 84 matching lines @@
 
 #if defined(OS_LINUX)
 bool StartSandboxLinux(gpu::GpuWatchdogThread*);
 #elif defined(OS_WIN)
 bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*);
 #endif
 
 base::LazyInstance<GpuChildThread::DeferredMessages> deferred_messages =
     LAZY_INSTANCE_INITIALIZER;
 
-bool GpuProcessLogMessageHandler(int severity,
-                                 const char* file, int line,
-                                 size_t message_start,
-                                 const std::string& str) {
+class GpuMainLogMessageListener : logging::LogMessageListener {
+ public:
+  void OnMessage(int severity,
+                 const char* file,
+                 int line,
+                 size_t message_start,
+                 const std::string& str) override;
+};
+
+void GpuMainLogMessageListener::OnMessage(int severity,
+                                          const char* file,
+                                          int line,
+                                          size_t message_start,
+                                          const std::string& str) {
   std::string header = str.substr(0, message_start);
   std::string message = str.substr(message_start);
   deferred_messages.Get().push(
       new GpuHostMsg_OnLogMessage(severity, header, message));
-  return false;
 }
 
 class ContentSandboxHelper : public gpu::GpuSandboxHelper {
  public:
   ContentSandboxHelper() {}
   ~ContentSandboxHelper() override {}
 
 #if defined(OS_WIN)
   void set_sandbox_info(const sandbox::SandboxInterfaceInfo* info) {
     sandbox_info_ = info;
@@ skipping 61 matching lines @@
   // able to load a DLL.
   SetErrorMode(
       SEM_FAILCRITICALERRORS |
       SEM_NOGPFAULTERRORBOX |
       SEM_NOOPENFILEERRORBOX);
 #elif defined(USE_X11)
   ui::SetDefaultX11ErrorHandlers();
 
 #endif
 
-  logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
+  auto log_listener = base::MakeUnique<GpuMainLogMessageListener>();
 
   // We are experiencing what appear to be memory-stomp issues in the GPU
   // process. These issues seem to be impacting the message loop and listeners
   // registered to it. Create the message loop on the heap to guard against
   // this.
   // TODO(ericrk): Revisit this once we assess its impact on crbug.com/662802
   // and crbug.com/609252.
   std::unique_ptr<base::MessageLoop> main_message_loop;
   std::unique_ptr<ui::PlatformEventSource> event_source;
   if (command_line.HasSwitch(switches::kHeadless)) {
@@ skipping 52 matching lines @@
   // to tear down this process. However, we can not do so safely until the IPC
   // channel is set up, because the detection of early return of a child process
   // is implemented using an IPC channel error. If the IPC channel is not fully
   // set up between the browser and GPU process, and the GPU process crashes or
   // exits early, the browser process will never detect it.  For this reason we
   // defer tearing down the GPU process until receiving the GpuMsg_Initialize
   // message from the browser.
   const bool init_success = gpu_init.InitializeAndStartSandbox(command_line);
   const bool dead_on_arrival = !init_success;
 
-  logging::SetLogMessageHandler(NULL);
+  log_listener.reset();
   GetContentClient()->SetGpuInfo(gpu_init.gpu_info());
 
   std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory;
   if (init_success &&
       gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER)
     gpu_memory_buffer_factory = gpu::GpuMemoryBufferFactory::CreateNativeType();
 
   base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
   io_thread_priority = base::ThreadPriority::DISPLAY;
@@ skipping 77 matching lines @@
     return true;
   }
 
   return false;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace.
 
 }  // namespace content