diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-31 20:30:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
| commit | 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch) | |
| tree | 382278a54ce7a744d62fa510a9a80688cc12434b /net/base/cert_database_mac.cc | |
| parent | c4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff) | |
| download | external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2 | |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Diffstat (limited to 'net/base/cert_database_mac.cc')
| -rw-r--r-- | net/base/cert_database_mac.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/cert_database_mac.cc b/net/base/cert_database_mac.cc index b0afd50..e90a712 100644 --- a/net/base/cert_database_mac.cc +++ b/net/base/cert_database_mac.cc @@ -7,8 +7,8 @@ #include <Security/Security.h> #include "base/crypto/cssm_init.h" -#include "base/lock.h" #include "base/logging.h" +#include "base/synchronization/lock.h" #include "net/base/net_errors.h" #include "net/base/x509_certificate.h" @@ -43,7 +43,7 @@ int CertDatabase::CheckUserCert(X509Certificate* cert) { int CertDatabase::AddUserCert(X509Certificate* cert) { OSStatus err; { - AutoLock locked(base::GetMacSecurityServicesLock()); + base::AutoLock locked(base::GetMacSecurityServicesLock()); err = SecCertificateAddToKeychain(cert->os_cert_handle(), NULL); } switch (err) { |