Remove static initializers from GpuProcessHost and GpuProcessHostUIShim.

content/browser/gpu/gpu_process_host_ui_shim.cc

 // Copyright (c) 2011 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/id_map.h"
 #include "base/process_util.h"
 #include "base/debug/trace_event.h"
+#include "base/lazy_instance.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/gpu/gpu_data_manager.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/gpu/gpu_messages.h"
 
 #if defined(TOOLKIT_USES_GTK)
 // These two #includes need to come after gpu_messages.h.
 #include <gdk/gdkwindow.h>  // NOLINT
 #include <gdk/gdkx.h>  // NOLINT
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/size.h"
 #endif
 namespace {
 
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
 #endif
 
-IDMap<GpuProcessHostUIShim> g_hosts_by_id;
+base::LazyInstance<IDMap<GpuProcessHostUIShim> > g_hosts_by_id(
+    base::LINKER_INITIALIZED);
 
 class SendOnIOThreadTask : public Task {
  public:
   SendOnIOThreadTask(int host_id, IPC::Message* msg)
       : host_id_(host_id),
         msg_(msg) {
   }
 
  private:
   void Run() {
@@ skipping 19 matching lines @@
 }
 
 void RouteToGpuProcessHostUIShimTask::Run() {
   GpuProcessHostUIShim* ui_shim = GpuProcessHostUIShim::FromID(host_id_);
   if (ui_shim)
     ui_shim->OnMessageReceived(msg_);
 }
 
 GpuProcessHostUIShim::GpuProcessHostUIShim(int host_id)
     : host_id_(host_id) {
-  g_hosts_by_id.AddWithID(this, host_id_);
+  g_hosts_by_id.Pointer()->AddWithID(this, host_id_);
 }
 
 // static
 GpuProcessHostUIShim* GpuProcessHostUIShim::Create(int host_id) {
   DCHECK(!FromID(host_id));
   return new GpuProcessHostUIShim(host_id);
 }
 
 // static
 void GpuProcessHostUIShim::Destroy(int host_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   delete FromID(host_id);
 }
 
 // static
 void GpuProcessHostUIShim::DestroyAll() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  while (!g_hosts_by_id.IsEmpty()) {
-    IDMap<GpuProcessHostUIShim>::iterator it(&g_hosts_by_id);
+  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(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  return g_hosts_by_id.Lookup(host_id);
+  return g_hosts_by_id.Pointer()->Lookup(host_id);
 }
 
 bool GpuProcessHostUIShim::Send(IPC::Message* msg) {
   DCHECK(CalledOnValidThread());
   return BrowserThread::PostTask(BrowserThread::IO,
                                  FROM_HERE,
                                  new SendOnIOThreadTask(host_id_, msg));
 }
 
 bool GpuProcessHostUIShim::OnMessageReceived(const IPC::Message& message) {
@@ skipping 18 matching lines @@
   if (!ui_shim)
     return;
 
   ui_shim->Send(msg);
 }
 
 #endif
 
 GpuProcessHostUIShim::~GpuProcessHostUIShim() {
   DCHECK(CalledOnValidThread());
-  g_hosts_by_id.Remove(host_id_);
+  g_hosts_by_id.Pointer()->Remove(host_id_);
 }
 
 bool GpuProcessHostUIShim::OnControlMessageReceived(
     const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
 
   IPC_BEGIN_MESSAGE_MAP(GpuProcessHostUIShim, message)
     IPC_MESSAGE_HANDLER(GpuHostMsg_OnLogMessage,
                         OnLogMessage)
 #if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI) || defined(OS_WIN)
@@ skipping 134 matching lines @@
                                                 params.render_view_id);
   if (!host)
     return;
   RenderWidgetHostView* view = host->view();
   if (!view)
     return;
   view->AcceleratedSurfaceRelease(params.identifier);
 }
 
 #endif