Convert all remaining explicit LeakyLazyInstanceTraits users to ::Leaky

content/browser/browsing_instance.h

 // Copyright (c) 2012 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"
+#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
 //
 // A browsing instance corresponds to the notion of a "unit of related browsing
 // contexts" in the HTML 5 spec.  Intuitively, it represents a collection of
 // tabs and frames that can have script connections to each other.  In that
 // sense, it reflects the user interface, and not the contents of the tabs and
 // frames.
 //
@@ skipping 97 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 base::LazyInstance<
-      ContextSiteInstanceMap,
-      base::LeakyLazyInstanceTraits<ContextSiteInstanceMap> >
-          context_site_instance_map_;
+  static base::LazyInstance<ContextSiteInstanceMap>::Leaky
+      context_site_instance_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingInstance);
 };
 
 #endif  // CONTENT_BROWSER_BROWSING_INSTANCE_H_