Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

net/base/cert_database_mac.cc

 // Copyright (c) 2010 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.
 
 #include "net/base/cert_database.h"
 
 #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"
 
 namespace net {
 
 CertDatabase::CertDatabase() {
 }
 
 int CertDatabase::CheckUserCert(X509Certificate* cert) {
   if (!cert)
@@ skipping 14 matching lines @@
     return ERR_CERT_INVALID;
   }
 
   CFRelease(identity);
   return OK;
 }
 
 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) {
     case noErr:
     case errSecDuplicateItem:
       return OK;
     default:
       LOG(ERROR) << "CertDatabase failed to add cert to keychain: " << err;
       // TODO(snej): Map the error code more intelligently.
       return ERR_ADD_USER_CERT_FAILED;
   }
 }
 
 }  // namespace net