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 101 matching lines @@
 bool CanAccessNvidiaDeviceFile();
 #endif
 bool StartSandboxLinux(const gpu::GPUInfo&, GpuWatchdogThread*, bool);
 #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;
 }
 
 }  // namespace anonymous
 
 // Main function for starting the Gpu process.
 int GpuMain(const MainFunctionParams& parameters) {
   TRACE_EVENT0("gpu", "GpuMain");
   base::trace_event::TraceLog::GetInstance()->SetProcessName("GPU Process");
   base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex(
       kTraceEventGpuProcessSortIndex);
@@ skipping 17 matching lines @@
 
 #if !defined(OS_CHROMEOS)
   DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kWindowDepth));
   DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kX11VisualID));
 #endif
 
 #endif
 
-  logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
+  auto log_listener = base::MakeUnique<GpuMainLogMessageListener>();
 
   if (command_line.HasSwitch(switches::kSupportsDualGpus)) {
     std::string types = command_line.GetSwitchValueASCII(
         switches::kGpuDriverBugWorkarounds);
     std::set<int> workarounds;
     gpu::StringToFeatureSet(types, &workarounds);
     if (workarounds.count(gpu::FORCE_DISCRETE_GPU) == 1)
       ui::GpuSwitchingManager::GetInstance()->ForceUseOfDiscreteGpu();
     else if (workarounds.count(gpu::FORCE_INTEGRATED_GPU) == 1)
       ui::GpuSwitchingManager::GetInstance()->ForceUseOfIntegratedGpu();
@@ skipping 198 matching lines @@
     }
 #elif defined(OS_WIN)
     gpu_info.sandboxed = StartSandboxWindows(parameters.sandbox_info);
 #elif defined(OS_MACOSX)
     gpu_info.sandboxed = Sandbox::SandboxIsCurrentlyActive();
 #endif
   } else {
     dead_on_arrival = true;
   }
 
-  logging::SetLogMessageHandler(NULL);
+  log_listener.reset();
 
   std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory;
   if (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;
 #endif
 
@@ skipping 221 matching lines @@
     return true;
   }
 
   return false;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace.
 
 }  // namespace content