gpu: Allow GpuProcessHostUIShim to leak during teardown.

content/browser/gpu/gpu_process_host_ui_shim.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/browser/gpu/gpu_process_host_ui_shim.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 25 matching lines @@
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/gpu_platform_support_host.h"
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace content {
 
 namespace {
 
-// One of the linux specific headers defines this as a macro.
-#ifdef DestroyAll
-#undef DestroyAll
-#endif
-
-base::LazyInstance<IDMap<GpuProcessHostUIShim*>>::DestructorAtExit
-    g_hosts_by_id = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<IDMap<GpuProcessHostUIShim*>>::Leaky g_hosts_by_id =
+    LAZY_INSTANCE_INITIALIZER;
 
 #if defined(OS_ANDROID)
 template <typename Interface>
 void BindJavaInterface(mojo::InterfaceRequest<Interface> request) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::GetGlobalJavaInterfaces()->GetInterface(std::move(request));
 }
 #endif
 
 }  // namespace
@@ skipping 31 matching lines @@
 #if defined(USE_OZONE)
   ui::OzonePlatform::GetInstance()
       ->GetGpuPlatformSupportHost()
       ->OnChannelDestroyed(host_id);
 #endif
 
   delete FromID(host_id);
 }
 
 // static
-void GpuProcessHostUIShim::DestroyAll() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  while (!g_hosts_by_id.Pointer()->IsEmpty()) {
-    IDMap<GpuProcessHostUIShim*>::iterator it(g_hosts_by_id.Pointer());
-    delete it.GetCurrentValue();
-  }
-}
-
-// static
 GpuProcessHostUIShim* GpuProcessHostUIShim::FromID(int host_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return g_hosts_by_id.Pointer()->Lookup(host_id);
 }
 
-bool GpuProcessHostUIShim::OnMessageReceived(const IPC::Message& message) {
+void GpuProcessHostUIShim::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
 
 #if defined(USE_OZONE)
   if (ui::OzonePlatform::GetInstance()
           ->GetGpuPlatformSupportHost()
           ->OnMessageReceived(message))
-    return true;
+    return;
 #endif
 
-  if (message.routing_id() != MSG_ROUTING_CONTROL)
-    return false;
-
-  NOTREACHED() << "Invalid message with type = " << message.type();
-  return true;
+  if (message.routing_id() == MSG_ROUTING_CONTROL) {
+    NOTREACHED() << "Invalid message with type = " << message.type();
+  }
 }
 
 GpuProcessHostUIShim::~GpuProcessHostUIShim() {
   DCHECK(CalledOnValidThread());
   g_hosts_by_id.Pointer()->Remove(host_id_);
 }
 
 // static
 void GpuProcessHostUIShim::RegisterUIThreadMojoInterfaces(
     service_manager::BinderRegistry* registry) {
   auto task_runner = BrowserThread::GetTaskRunnerForThread(BrowserThread::UI);
 
   registry->AddInterface(base::Bind(&FieldTrialRecorder::Create), task_runner);
   registry->AddInterface(
       base::Bind(
           &memory_instrumentation::CoordinatorImpl::BindCoordinatorRequest,
           base::Unretained(
               memory_instrumentation::CoordinatorImpl::GetInstance())),
       task_runner);
 #if defined(OS_ANDROID)
   registry->AddInterface(
       base::Bind(&BindJavaInterface<media::mojom::AndroidOverlayProvider>),
       task_runner);
 #endif
 }
 
 }  // namespace content