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

content/browser/browsing_instance.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BROWSING_INSTANCE_H_
 #define CONTENT_BROWSER_BROWSING_INSTANCE_H_
 #pragma once
 
 #include "base/hash_tables.h"
+#include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 
 class GURL;
 class SiteInstance;
 
 namespace content {
 class BrowserContext;
 }
 
@@ skipping 105 matching lines @@
 
   // Map of site to SiteInstance, to ensure we only have one SiteInstance per
   // site.  The site string should be the possibly_invalid_spec() of a GURL
   // obtained with SiteInstance::GetSiteForURL.  Note that this map may not
   // contain every active SiteInstance, because a race exists where two
   // SiteInstances can be assigned to the same site.  This is ok in rare cases.
   // This field is only used if we are not using process-per-site.
   SiteInstanceMap site_instance_map_;
 
   // Global map of BrowserContext to SiteInstanceMap, for process-per-site.
-  static ContextSiteInstanceMap context_site_instance_map_;
+  static base::LazyInstance<

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

private + static + in a .h file suggests that this can be made a non-member in
an anonymous namespace of the .cc file. It’s an implementation detail that
doesn’t need to be exposed here.

This occurs elsewhere in this change and I may not have marked each occurrence.

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

I tried that everywhere, but it wasn't trivially possible in all cases. Here,
the type ContextSiteInstanceMap was private to the class, and for some reason I
thought it was used in other places in the .h as well. In this case, I could
indeed move everything to the cc (done), but it wasn't always possible.

[Nico, 2011/11/07 23:37:41]

Ah, the problem was that the type depends on SiteInstanceMap, which is a private
typedef. Undid this.

+      ContextSiteInstanceMap,
+      base::LeakyLazyInstanceTraits<ContextSiteInstanceMap> >
+          context_site_instance_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingInstance);
 };
 
 #endif  // CONTENT_BROWSER_BROWSING_INSTANCE_H_