Convert all remaining explicit LeakyLazyInstanceTraits users to ::Leaky

content/common/socket_stream_dispatcher.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 "content/common/socket_stream_dispatcher.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/id_map.h"
 #include "base/lazy_instance.h"
@@ skipping 38 matching lines @@
   virtual ~IPCWebSocketStreamHandleBridge();
 
   void DoConnect(const GURL& url);
   void DoClose();
   int socket_id_;
 
   ChildThread* child_thread_;
   WebKit::WebSocketStreamHandle* handle_;
   webkit_glue::WebSocketStreamHandleDelegate* delegate_;
 
-  static base::LazyInstance<
-      IDMap<IPCWebSocketStreamHandleBridge>,
-      base::LeakyLazyInstanceTraits<IDMap<IPCWebSocketStreamHandleBridge> > >
-          all_bridges;
+  static base::LazyInstance<IDMap<IPCWebSocketStreamHandleBridge> >::Leaky
+      all_bridges;
 };
 
 // static
-base::LazyInstance<
-    IDMap<IPCWebSocketStreamHandleBridge>,
-    base::LeakyLazyInstanceTraits<IDMap<IPCWebSocketStreamHandleBridge> > >
-        IPCWebSocketStreamHandleBridge::all_bridges = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<IDMap<IPCWebSocketStreamHandleBridge> >::Leaky
+    IPCWebSocketStreamHandleBridge::all_bridges = LAZY_INSTANCE_INITIALIZER;
 
 /* static */
 IPCWebSocketStreamHandleBridge* IPCWebSocketStreamHandleBridge::FromSocketId(
     int id) {
   return all_bridges.Get().Lookup(id);
 }
 
 IPCWebSocketStreamHandleBridge::~IPCWebSocketStreamHandleBridge() {
   DVLOG(1) << "IPCWebSocketStreamHandleBridge destructor socket_id="
            << socket_id_;
@@ skipping 140 matching lines @@
 }
 
 void SocketStreamDispatcher::OnClosed(int socket_id) {
   IPCWebSocketStreamHandleBridge* bridge =
       IPCWebSocketStreamHandleBridge::FromSocketId(socket_id);
   if (bridge)
     bridge->OnClosed();
   else
     DLOG(ERROR) << "No SocketStreamHandleBridge for socket_id=" << socket_id;
 }