Convert all remaining explicit LeakyLazyInstanceTraits users to ::Leaky

content/browser/browsing_instance.h

Index: content/browser/browsing_instance.h
diff --git a/content/browser/browsing_instance.h b/content/browser/browsing_instance.h
index d3baf8a944298cc05a078df86c5c0fd5b44a1b73..f7fee6f7b6b2c8b3bc4394086dc1369960ec1425 100644
--- a/content/browser/browsing_instance.h
+++ b/content/browser/browsing_instance.h
@@ -10,14 +10,11 @@
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/browser_context.h"

[Ami GONE FROM CHROMIUM, 2012/01/24 18:14:27]

This is needed to pick up the definition of hash<BrowserContext*>().

 
 class GURL;
 class SiteInstance;
 
-namespace content {
-class BrowserContext;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 //
 // BrowsingInstance class
@@ -135,10 +132,8 @@ class CONTENT_EXPORT BrowsingInstance
   SiteInstanceMap site_instance_map_;
 
   // Global map of BrowserContext to SiteInstanceMap, for process-per-site.
-  static base::LazyInstance<
-      ContextSiteInstanceMap,
-      base::LeakyLazyInstanceTraits<ContextSiteInstanceMap> >
-          context_site_instance_map_;
+  static base::LazyInstance<ContextSiteInstanceMap>::Leaky
+      context_site_instance_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingInstance);
 };