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/openssl_memory_private_key_store.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/openssl_memory_private_key_store.cc')
| -rw-r--r-- | net/base/openssl_memory_private_key_store.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/base/openssl_memory_private_key_store.cc b/net/base/openssl_memory_private_key_store.cc index 6b65dbe..bc64b57 100644 --- a/net/base/openssl_memory_private_key_store.cc +++ b/net/base/openssl_memory_private_key_store.cc @@ -26,7 +26,7 @@ class OpenSSLMemoryKeyStore : public OpenSSLPrivateKeyStore { } virtual ~OpenSSLMemoryKeyStore() { - AutoLock lock(lock_); + base::AutoLock lock(lock_); for (std::vector<EVP_PKEY*>::iterator it = keys_.begin(); it != keys_.end(); ++it) { EVP_PKEY_free(*it); @@ -35,13 +35,13 @@ class OpenSSLMemoryKeyStore : public OpenSSLPrivateKeyStore { virtual bool StorePrivateKey(const GURL& url, EVP_PKEY* pkey) { CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); - AutoLock lock(lock_); + base::AutoLock lock(lock_); keys_.push_back(pkey); return true; } virtual EVP_PKEY* FetchPrivateKey(EVP_PKEY* pkey) { - AutoLock lock(lock_); + base::AutoLock lock(lock_); for (std::vector<EVP_PKEY*>::iterator it = keys_.begin(); it != keys_.end(); ++it) { if (EVP_PKEY_cmp(*it, pkey) == 1) |