Convert all remaining explicit LeakyLazyInstanceTraits users to ::Leaky

chrome/browser/chromeos/web_socket_proxy.cc

-// 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.
 
 #include "chrome/browser/chromeos/web_socket_proxy.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <algorithm>
@@ skipping 417 matching lines @@
   bool do_tls_;
 
   // We try to DNS resolve hostname in both IPv4 and IPv6 domains.
   // Track resolution failures here.
   bool destresolution_ipv4_failed_;
   bool destresolution_ipv6_failed_;
 
   // Used to schedule a timeout for initial phase of connection.
   scoped_ptr<struct event> destconnect_timeout_event_;
 
-  static base::LazyInstance<EventKeyMap,
-                            base::LeakyLazyInstanceTraits<EventKeyMap> >
-      evkey_map_;
+  static base::LazyInstance<EventKeyMap>::Leaky evkey_map_;
   static EventKey last_evkey_;
 
   DISALLOW_COPY_AND_ASSIGN(Conn);
 };
 
 class SSLChan : public MessageLoopForIO::Watcher {
  public:
   static void Start(const net::AddressList& address_list,
                     const net::HostPortPair& host_port_pair,
                     int read_pipe,
@@ skipping 1436 matching lines @@
     cs->master_->ZapConn(cs);
   else
     cs->Shut(WS_CLOSE_DESTINATION_ERROR,
              "Failure reported on destination channel");
 }
 
 // static
 Conn::EventKey Conn::last_evkey_ = 0;
 
 // static
-base::LazyInstance<Conn::EventKeyMap,
-                   base::LeakyLazyInstanceTraits<Conn::EventKeyMap> >
+base::LazyInstance<Conn::EventKeyMap>::Leaky
     Conn::evkey_map_ = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 WebSocketProxy::WebSocketProxy(const std::vector<std::string>& allowed_origins)
     : impl_(new Serv(allowed_origins)) {
 }
 
 WebSocketProxy::~WebSocketProxy() {
   delete static_cast<Serv*>(impl_);
   impl_ = NULL;
 }
 
 void WebSocketProxy::Run() {
   static_cast<Serv*>(impl_)->Run();
 }
 
 void WebSocketProxy::Shutdown() {
   static_cast<Serv*>(impl_)->Shutdown();
 }
 
 void WebSocketProxy::OnNetworkChange() {
   static_cast<Serv*>(impl_)->OnNetworkChange();
 }
 
 }  // namespace chromeos