summaryrefslogtreecommitdiffstats
path: root/net/url_request
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 /net/url_request
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 'net/url_request')
-rw-r--r--net/url_request/url_request.cc3
-rw-r--r--net/url_request/url_request_test_job.cc5
2 files changed, 3 insertions, 5 deletions
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 3db51b4..114efc4 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -57,8 +57,7 @@ void StripPostSpecificHeaders(HttpRequestHeaders* headers) {
uint64 g_next_url_request_identifier = 1;
// This lock protects g_next_url_request_identifier.
-base::LazyInstance<base::Lock,
- base::LeakyLazyInstanceTraits<base::Lock> >
+base::LazyInstance<base::Lock>::Leaky
g_next_url_request_identifier_lock = LAZY_INSTANCE_INITIALIZER;
// Returns an prior unused identifier for URL requests.
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
index 2c8efa6..4a0ba6e 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.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.
@@ -22,8 +22,7 @@ namespace net {
namespace {
typedef std::list<URLRequestTestJob*> URLRequestJobList;
-base::LazyInstance<URLRequestJobList,
- base::LeakyLazyInstanceTraits<URLRequestJobList> >
+base::LazyInstance<URLRequestJobList>::Leaky
g_pending_jobs = LAZY_INSTANCE_INITIALIZER;
} // namespace