summaryrefslogtreecommitdiffstats
path: root/content/common/socket_stream_dispatcher.cc
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 /content/common/socket_stream_dispatcher.cc
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 'content/common/socket_stream_dispatcher.cc')
-rw-r--r--content/common/socket_stream_dispatcher.cc14
1 files changed, 5 insertions, 9 deletions
diff --git a/content/common/socket_stream_dispatcher.cc b/content/common/socket_stream_dispatcher.cc
index a45a3f5..d2a332f 100644
--- a/content/common/socket_stream_dispatcher.cc
+++ b/content/common/socket_stream_dispatcher.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.
@@ -57,17 +57,13 @@ class IPCWebSocketStreamHandleBridge
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(