content: Remove 16 exit time destructors and 15 static initializers.

content/browser/debugger/render_view_devtools_agent_host.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/debugger/render_view_devtools_agent_host.h"
 
 #include "base/basictypes.h"
+#include "base/lazy_instance.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
-RenderViewDevToolsAgentHost::Instances RenderViewDevToolsAgentHost::instances_;
+typedef std::map<RenderViewHost*, RenderViewDevToolsAgentHost*> Instances;
+
+namespace {
+base::LazyInstance<Instances,
+                   base::LeakyLazyInstanceTraits<Instances> >
+    instances_(base::LINKER_INITIALIZED);

[Mark Mentovai, 2011/11/07 22:34:15]

This should not be named instances_ now.

[Nico, 2011/11/07 23:29:21]

Done.

+}  // namespace
 
 DevToolsAgentHost* RenderViewDevToolsAgentHost::FindFor(
     RenderViewHost* rvh) {
-  Instances::iterator it = instances_.find(rvh);
-  if (it != instances_.end())
+  Instances::iterator it = instances_.Get().find(rvh);
+  if (it != instances_.Get().end())
     return it->second;
   return new RenderViewDevToolsAgentHost(rvh);
 }
 
 bool RenderViewDevToolsAgentHost::IsDebuggerAttached(
     TabContents* tab_contents) {
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
   if (!devtools_manager)
     return false;
   RenderViewHostDelegate* delegate = tab_contents;
-  for (Instances::iterator it = instances_.begin();
-       it != instances_.end(); ++it) {
+  for (Instances::iterator it = instances_.Get().begin();
+       it != instances_.Get().end(); ++it) {
     if (it->first->delegate() != delegate)
       continue;
     if (devtools_manager->GetDevToolsClientHostFor(it->second))
       return true;
   }
   return false;
 }
 
 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)
     : RenderViewHostObserver(rvh),
       render_view_host_(rvh) {
-  instances_[rvh] = this;
+  instances_.Get()[rvh] = this;
 }
 
 void RenderViewDevToolsAgentHost::SendMessageToAgent(IPC::Message* msg) {
   msg->set_routing_id(render_view_host_->routing_id());
   render_view_host_->Send(msg);
 }
 
 void RenderViewDevToolsAgentHost::NotifyClientClosing() {
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING,
       content::Source<content::BrowserContext>(
           render_view_host_->site_instance()->GetProcess()->browser_context()),
       content::Details<RenderViewHost>(render_view_host_));
 }
 
 int RenderViewDevToolsAgentHost::GetRenderProcessId() {
   return render_view_host_->process()->id();
 }
 
 RenderViewDevToolsAgentHost::~RenderViewDevToolsAgentHost() {
-  instances_.erase(render_view_host_);
+  instances_.Get().erase(render_view_host_);
 }
 
 void RenderViewDevToolsAgentHost::RenderViewHostDestroyed(RenderViewHost* rvh) {
   NotifyCloseListener();
   delete this;
 }
 
 bool RenderViewDevToolsAgentHost::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
@@ skipping 21 matching lines @@
 }
 
 void RenderViewDevToolsAgentHost::OnClearBrowserCache() {
   content::GetContentClient()->browser()->ClearCache(render_view_host_);
 }
 
 void RenderViewDevToolsAgentHost::OnClearBrowserCookies() {
   content::GetContentClient()->browser()->ClearCookies(render_view_host_);
 }