summaryrefslogtreecommitdiffstats
path: root/chrome/browser/metrics
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-26 01:56:19 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-26 01:56:19 +0000
commit67f92bc3e4a932b3a12693c0517653f08af87a83 (patch)
treea0715e22db3af318f69ceb02abf5c07983b4ac1d /chrome/browser/metrics
parent0f23fd7440d40e701c1dc455f41dc3127f71cb02 (diff)
downloadchromium_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 'chrome/browser/metrics')
-rw-r--r--chrome/browser/metrics/metrics_log.cc3
-rw-r--r--chrome/browser/metrics/thread_watcher.cc3
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc
index b550421..77a0ea2 100644
--- a/chrome/browser/metrics/metrics_log.cc
+++ b/chrome/browser/metrics/metrics_log.cc
@@ -66,8 +66,7 @@ PluginPrefs* GetPluginPrefs() {
} // namespace
-static base::LazyInstance<std::string,
- base::LeakyLazyInstanceTraits<std::string > >
+static base::LazyInstance<std::string>::Leaky
g_version_extension = LAZY_INSTANCE_INITIALIZER;
MetricsLog::MetricsLog(const std::string& client_id, int session_id)
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
index c33bc59..e9e1f4b 100644
--- a/chrome/browser/metrics/thread_watcher.cc
+++ b/chrome/browser/metrics/thread_watcher.cc
@@ -707,8 +707,7 @@ void ThreadWatcherObserver::Observe(
// WatchDogThread methods and members.
// This lock protects g_watchdog_thread.
-static base::LazyInstance<base::Lock,
- base::LeakyLazyInstanceTraits<base::Lock> >
+static base::LazyInstance<base::Lock>::Leaky
g_watchdog_lock = LAZY_INSTANCE_INITIALIZER;
// The singleton of this class.