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

content/gpu/gpu_child_thread.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 "content/gpu/gpu_child_thread.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 42 matching lines @@
 #include "media/base/android/media_client_android.h"
 #include "media/gpu/avda_surface_tracker.h"
 #endif
 
 namespace content {
 namespace {
 
 static base::LazyInstance<scoped_refptr<ThreadSafeSender> >
     g_thread_safe_sender = LAZY_INSTANCE_INITIALIZER;
 
-bool GpuProcessLogMessageHandler(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);
-
-  g_thread_safe_sender.Get()->Send(
-      new GpuHostMsg_OnLogMessage(severity, header, message));
-
-  return false;
-}
-
 // Message filter used to to handle GpuMsg_CreateGpuMemoryBuffer messages
 // on the IO thread. This allows the UI thread in the browser process to remain
 // fast at all times.
 class GpuMemoryBufferMessageFilter : public IPC::MessageFilter {
  public:
   explicit GpuMemoryBufferMessageFilter(
       gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
       : gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
         sender_(nullptr) {}
 
@@ skipping 48 matching lines @@
                                            ->GetMessageFilter();
   if (message_filter)
     builder.AddStartupFilter(message_filter);
 #endif
 
   return builder.Build();
 }
 
 }  // namespace
 
+void GpuProcessLogMessageListener::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);
+
+  g_thread_safe_sender.Get()->Send(
+      new GpuHostMsg_OnLogMessage(severity, header, message));
+}
+
 GpuChildThread::GpuChildThread(
     GpuWatchdogThread* watchdog_thread,
     bool dead_on_arrival,
     const gpu::GPUInfo& gpu_info,
     const DeferredMessages& deferred_messages,
     gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
     : ChildThreadImpl(GetOptions(gpu_memory_buffer_factory)),
       dead_on_arrival_(dead_on_arrival),
       gpu_info_(gpu_info),
       deferred_messages_(deferred_messages),
@@ skipping 36 matching lines @@
 
 GpuChildThread::~GpuChildThread() {
   while (!deferred_messages_.empty()) {
     delete deferred_messages_.front();
     deferred_messages_.pop();
   }
 }
 
 void GpuChildThread::Shutdown() {
   ChildThreadImpl::Shutdown();
-  logging::SetLogMessageHandler(NULL);
+  if (!in_browser_process_)
+    log_listener_.reset();
 }
 
 void GpuChildThread::Init(const base::Time& process_start_time) {
   process_start_time_ = process_start_time;
 
 #if defined(OS_ANDROID)
   // When running in in-process mode, this has been set in the browser at
   // ChromeBrowserMainPartsAndroid::PreMainMessageLoopRun().
   if (!in_browser_process_)
     media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid());
@@ skipping 135 matching lines @@
 
   if (dead_on_arrival_) {
     LOG(ERROR) << "Exiting GPU process due to errors during initialization";
     base::MessageLoop::current()->QuitWhenIdle();
     return;
   }
 
   // We don't need to pipe log messages if we are running the GPU thread in
   // the browser process.
   if (!in_browser_process_)
-    logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
+    log_listener_ = base::MakeUnique<GpuProcessLogMessageListener>();
 
   gpu::SyncPointManager* sync_point_manager = nullptr;
   // Note SyncPointManager from ContentGpuClient cannot be owned by this.
   if (GetContentClient()->gpu())
     sync_point_manager = GetContentClient()->gpu()->GetSyncPointManager();
   if (!sync_point_manager) {
     if (!owned_sync_point_manager_) {
       owned_sync_point_manager_.reset(new gpu::SyncPointManager(false));
     }
     sync_point_manager = owned_sync_point_manager_.get();
@@ skipping 189 matching lines @@
 
 void GpuChildThread::BindServiceFactoryRequest(
     shell::mojom::ServiceFactoryRequest request) {
   DVLOG(1) << "GPU: Binding shell::mojom::ServiceFactoryRequest";
   DCHECK(service_factory_);
   service_factory_bindings_.AddBinding(service_factory_.get(),
                                        std::move(request));
 }
 
 }  // namespace content