diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 01:56:19 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 01:56:19 +0000 |
| commit | 67f92bc3e4a932b3a12693c0517653f08af87a83 (patch) | |
| tree | a0715e22db3af318f69ceb02abf5c07983b4ac1d /content/browser/debugger | |
| parent | 0f23fd7440d40e701c1dc455f41dc3127f71cb02 (diff) | |
| download | chromium_src-67f92bc3e4a932b3a12693c0517653f08af87a83.zip chromium_src-67f92bc3e4a932b3a12693c0517653f08af87a83.tar.gz chromium_src-67f92bc3e4a932b3a12693c0517653f08af87a83.tar.bz2 | |
Convert all remaining explicit LeakyLazyInstanceTraits users to ::Leaky
and hide LeakyLazyInstanceTraits in base::internal to discourage cargo-culting
new users.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9117038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/debugger')
| -rw-r--r-- | content/browser/debugger/devtools_http_handler_impl.cc | 18 | ||||
| -rw-r--r-- | content/browser/debugger/render_view_devtools_agent_host.cc | 7 |
2 files changed, 8 insertions, 17 deletions
diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/debugger/devtools_http_handler_impl.cc index 6661e94..6d0bc99 100644 --- a/content/browser/debugger/devtools_http_handler_impl.cc +++ b/content/browser/debugger/devtools_http_handler_impl.cc @@ -116,23 +116,17 @@ class TabContentsIDHelper : public content::WebContentsObserver { int id_; typedef std::map<int, TabContents*> IdToTabContentsMap; - static base::LazyInstance<IdToTabContentsMap, - base::LeakyLazyInstanceTraits<IdToTabContentsMap> > + static base::LazyInstance<IdToTabContentsMap>::Leaky id_to_tabcontents_; typedef std::map<TabContents*, int> TabContentsToIdMap; - static base::LazyInstance<TabContentsToIdMap, - base::LeakyLazyInstanceTraits<TabContentsToIdMap> > + static base::LazyInstance<TabContentsToIdMap>::Leaky tabcontents_to_id_; }; -base::LazyInstance< - TabContentsIDHelper::IdToTabContentsMap, - base::LeakyLazyInstanceTraits<TabContentsIDHelper::IdToTabContentsMap> > - TabContentsIDHelper::id_to_tabcontents_ = LAZY_INSTANCE_INITIALIZER; -base::LazyInstance< - TabContentsIDHelper::TabContentsToIdMap, - base::LeakyLazyInstanceTraits<TabContentsIDHelper::TabContentsToIdMap> > - TabContentsIDHelper::tabcontents_to_id_ = LAZY_INSTANCE_INITIALIZER; +base::LazyInstance<TabContentsIDHelper::IdToTabContentsMap>::Leaky + TabContentsIDHelper::id_to_tabcontents_ = LAZY_INSTANCE_INITIALIZER; +base::LazyInstance<TabContentsIDHelper::TabContentsToIdMap>::Leaky + TabContentsIDHelper::tabcontents_to_id_ = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/content/browser/debugger/render_view_devtools_agent_host.cc b/content/browser/debugger/render_view_devtools_agent_host.cc index 943930f..54e4c79 100644 --- a/content/browser/debugger/render_view_devtools_agent_host.cc +++ b/content/browser/debugger/render_view_devtools_agent_host.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -23,9 +23,7 @@ namespace content { typedef std::map<RenderViewHost*, RenderViewDevToolsAgentHost*> Instances; namespace { -base::LazyInstance<Instances, - base::LeakyLazyInstanceTraits<Instances> > - g_instances = LAZY_INSTANCE_INITIALIZER; +base::LazyInstance<Instances>::Leaky g_instances = LAZY_INSTANCE_INITIALIZER; } // namespace // static @@ -142,4 +140,3 @@ void RenderViewDevToolsAgentHost::OnClearBrowserCookies() { } } // namespace content - |