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

3 files changed, 6 insertions, 9 deletions

diff --git a/webkit/glue/worker_task_runner.cc b/webkit/glue/worker_task_runner.cc
index 3836e61..cfd729b 100644
--- a/webkit/glue/worker_task_runner.cc
+++ b/webkit/glue/worker_task_runner.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.
 
@@ -59,9 +59,8 @@ int WorkerTaskRunner::CurrentWorkerId() {
 }
 
 WorkerTaskRunner* WorkerTaskRunner::Instance() {
-  static base::LazyInstance<WorkerTaskRunner,
-      base::LeakyLazyInstanceTraits<WorkerTaskRunner> >
-          worker_task_runner = LAZY_INSTANCE_INITIALIZER;
+  static base::LazyInstance<WorkerTaskRunner>::Leaky
+      worker_task_runner = LAZY_INSTANCE_INITIALIZER;
   return worker_task_runner.Pointer();
 }
 
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index 353148b..510f642 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -207,8 +207,7 @@ const int32 kTransferBufferSize = 1024 * 1024;
 static base::LazyInstance<
     std::set<WebGraphicsContext3DInProcessCommandBufferImpl*> >
         g_all_shared_contexts = LAZY_INSTANCE_INITIALIZER;
-static base::LazyInstance<base::Lock,
-                          base::LeakyLazyInstanceTraits<base::Lock> >
+static base::LazyInstance<base::Lock>::Leaky
     g_all_shared_contexts_lock = LAZY_INSTANCE_INITIALIZER;
 
 // Singleton used to initialize and terminate the gles2 library.
diff --git a/webkit/plugins/npapi/webplugin_ime_win.cc b/webkit/plugins/npapi/webplugin_ime_win.cc
index 2920166..229cb6e 100644
--- a/webkit/plugins/npapi/webplugin_ime_win.cc
+++ b/webkit/plugins/npapi/webplugin_ime_win.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.
 
@@ -21,8 +21,7 @@ namespace npapi {
 
 // A critical section that prevents two or more plug-ins from accessing a
 // WebPluginIMEWin instance through our patch function.
-base::LazyInstance<base::Lock,
-                   base::LeakyLazyInstanceTraits<base::Lock> >
+base::LazyInstance<base::Lock>::Leaky
     g_webplugin_ime_lock = LAZY_INSTANCE_INITIALIZER;
 
 WebPluginIMEWin* WebPluginIMEWin::instance_ = NULL;