diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
| commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
| tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /net/base/cert_verifier.cc | |
| parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
| download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 | |
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily.
BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/cert_verifier.cc')
| -rw-r--r-- | net/base/cert_verifier.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/base/cert_verifier.cc b/net/base/cert_verifier.cc index 3d22dec..044524f 100644 --- a/net/base/cert_verifier.cc +++ b/net/base/cert_verifier.cc @@ -5,9 +5,9 @@ #include "net/base/cert_verifier.h" #include "base/compiler_specific.h" -#include "base/lock.h" #include "base/message_loop.h" #include "base/stl_util-inl.h" +#include "base/synchronization/lock.h" #include "base/threading/worker_pool.h" #include "net/base/net_errors.h" #include "net/base/x509_certificate.h" @@ -145,7 +145,7 @@ class CertVerifierWorker { // deleted. void Cancel() { DCHECK_EQ(MessageLoop::current(), origin_loop_); - AutoLock locked(lock_); + base::AutoLock locked(lock_); canceled_ = true; } @@ -174,7 +174,7 @@ class CertVerifierWorker { // after the PostTask, but before unlocking |lock_|. If we do not lock in // this case, we will end up deleting a locked Lock, which can lead to // memory leaks or worse errors. - AutoLock locked(lock_); + base::AutoLock locked(lock_); if (!canceled_) { cert_verifier_->HandleResult(cert_, hostname_, flags_, error_, verify_result_); @@ -196,7 +196,7 @@ class CertVerifierWorker { bool canceled; { - AutoLock locked(lock_); + base::AutoLock locked(lock_); canceled = canceled_; if (!canceled) { origin_loop_->PostTask( @@ -215,7 +215,7 @@ class CertVerifierWorker { CertVerifier* const cert_verifier_; // lock_ protects canceled_. - Lock lock_; + base::Lock lock_; // If canceled_ is true, // * origin_loop_ cannot be accessed by the worker thread, |