Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: net/base/cert_database_mac.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/capturing_net_log.cc ('k') | net/base/cert_verifier.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/cert_database_mac.cc
diff --git a/net/base/cert_database_mac.cc b/net/base/cert_database_mac.cc
index b0afd50f04d1f4978dcb2229283cbd37ded94ab7..e90a712bf19a6f071d4cbeae93ef6784010a71a5 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) {
« no previous file with comments | « net/base/capturing_net_log.cc ('k') | net/base/cert_verifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698