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

content/browser/browsing_instance.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/browsing_instance.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/browser/browser_context.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/webui/web_ui_factory.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 
 // static
-BrowsingInstance::ContextSiteInstanceMap
-    BrowsingInstance::context_site_instance_map_;
+base::LazyInstance<
+    BrowsingInstance::ContextSiteInstanceMap,
+    base::LeakyLazyInstanceTraits<BrowsingInstance::ContextSiteInstanceMap> >
+        BrowsingInstance::context_site_instance_map_(base::LINKER_INITIALIZED);
 
 BrowsingInstance::BrowsingInstance(content::BrowserContext* browser_context)
     : browser_context_(browser_context) {
 }
 
 bool BrowsingInstance::ShouldUseProcessPerSite(const GURL& url) {
   // Returns true if we should use the process-per-site model.  This will be
   // the case if the --process-per-site switch is specified, or in
   // process-per-site-instance for particular sites (e.g., the new tab page).
 
@@ skipping 24 matching lines @@
 BrowsingInstance::SiteInstanceMap* BrowsingInstance::GetSiteInstanceMap(
     content::BrowserContext* browser_context, const GURL& url) {
   if (!ShouldUseProcessPerSite(SiteInstance::GetEffectiveURL(browser_context,
                                                              url))) {
     // Not using process-per-site, so use a map specific to this instance.
     return &site_instance_map_;
   }
 
   // Otherwise, process-per-site is in use, at least for this URL.  Look up the
   // global map for this context, creating an entry if necessary.
-  return &context_site_instance_map_[browser_context];
+  return &context_site_instance_map_.Get()[browser_context];
 }
 
 bool BrowsingInstance::HasSiteInstance(const GURL& url) {
   std::string site =
       SiteInstance::GetSiteForURL(browser_context_, url)
           .possibly_invalid_spec();
 
   SiteInstanceMap* map = GetSiteInstanceMap(browser_context_, url);
   SiteInstanceMap::iterator i = map->find(site);
   return (i != map->end());
@@ skipping 48 matching lines @@
 
   // We look for the site instance in both the local site_instance_map_ and also
   // the static context_site_instance_map_ - this is because the logic in
   // ShouldUseProcessPerSite() can produce different results over the lifetime
   // of Chrome (e.g. installation of apps with web extents can change our
   // process-per-site policy for a given domain), so we don't know which map
   // the site was put into when it was originally registered.
   if (!RemoveSiteInstanceFromMap(&site_instance_map_, site, site_instance)) {
     // Wasn't in our local map, so look in the static per-browser context map.
     RemoveSiteInstanceFromMap(
-        &context_site_instance_map_[browser_context_], site, site_instance);
+        &context_site_instance_map_.Get()[browser_context_],
+        site,
+        site_instance);
   }
 }
 
 bool BrowsingInstance::RemoveSiteInstanceFromMap(SiteInstanceMap* map,
                                                  const std::string& site,
                                                  SiteInstance* site_instance) {
   SiteInstanceMap::iterator i = map->find(site);
   if (i != map->end() && i->second == site_instance) {
     // Matches, so erase it.
     map->erase(i);
     return true;
   }
   return false;
 }
 
 BrowsingInstance::~BrowsingInstance() {
   // We should only be deleted when all of the SiteInstances that refer to
   // us are gone.
   DCHECK(site_instance_map_.empty());
 }