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

4 files changed, 7 insertions, 13 deletions

diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 524130e..e64425b 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -47,8 +47,7 @@ static logging::LogMessageHandlerFunction g_logging_old_handler = NULL;
 
 const char ChromotingInstance::kMimeType[] = "pepper-application/x-chromoting";
 
-static base::LazyInstance<base::Lock,
-                          base::LeakyLazyInstanceTraits<base::Lock> >
+static base::LazyInstance<base::Lock>::Leaky
     g_logging_lock = LAZY_INSTANCE_INITIALIZER;
 
 ChromotingInstance::ChromotingInstance(PP_Instance pp_instance)
diff --git a/remoting/host/local_input_monitor_mac.mm b/remoting/host/local_input_monitor_mac.mm
index 132a0d0..57c7053 100644
--- a/remoting/host/local_input_monitor_mac.mm
+++ b/remoting/host/local_input_monitor_mac.mm
@@ -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.
 
@@ -157,9 +157,7 @@ class LocalInputMonitorMac : public remoting::LocalInputMonitor {
   DISALLOW_COPY_AND_ASSIGN(LocalInputMonitorMac);
 };
 
-base::LazyInstance<base::Lock,
-                   base::LeakyLazyInstanceTraits<base::Lock> >
-    monitor_lock = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<base::Lock>::Leaky monitor_lock = LAZY_INSTANCE_INITIALIZER;
 LocalInputMonitorImpl* local_input_monitor = NULL;
 
 }  // namespace
diff --git a/remoting/host/local_input_monitor_thread_win.cc b/remoting/host/local_input_monitor_thread_win.cc
index 490b891..656b60f 100644
--- a/remoting/host/local_input_monitor_thread_win.cc
+++ b/remoting/host/local_input_monitor_thread_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.
 
@@ -13,9 +13,7 @@ using namespace remoting;
 
 namespace {
 LocalInputMonitorThread* g_local_input_monitor_thread = NULL;
-base::LazyInstance<base::Lock,
-                   base::LeakyLazyInstanceTraits<base::Lock> >
-    g_thread_lock = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<base::Lock>::Leaky g_thread_lock = LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
 
diff --git a/remoting/host/plugin/host_log_handler.cc b/remoting/host/plugin/host_log_handler.cc
index 557af5a..9240b01 100644
--- a/remoting/host/plugin/host_log_handler.cc
+++ b/remoting/host/plugin/host_log_handler.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.
 
@@ -16,8 +16,7 @@ namespace remoting {
 static bool g_has_logging_scriptable_object = false;
 
 // The lock that protects the logging globals.
-static base::LazyInstance<base::Lock,
-                          base::LeakyLazyInstanceTraits<base::Lock> >
+static base::LazyInstance<base::Lock>::Leaky
     g_logging_lock = LAZY_INSTANCE_INITIALIZER;
 
 // The scriptable object that will display the log information to the user.