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

net/socket/ssl_client_socket_win.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/socket/ssl_client_socket_win.h"
 
 #include <schnlsp.h>
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
-#include "base/lock.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
+#include "base/synchronization/lock.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_log.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/ssl_info.h"
@@ skipping 117 matching lines @@
     STLDeleteContainerPairSecondPointers(client_cert_creds_.begin(),
                                          client_cert_creds_.end());
   }
 
   int GetHandle(PCCERT_CONTEXT client_cert,
                 int ssl_version_mask,
                 CredHandle** handle_ptr) {
     DCHECK(0 < ssl_version_mask &&
            ssl_version_mask < arraysize(anonymous_creds_));
     CredHandleClass* handle;
-    AutoLock lock(lock_);
+    base::AutoLock lock(lock_);
     if (client_cert) {
       CredHandleMapKey key = std::make_pair(client_cert, ssl_version_mask);
       CredHandleMap::const_iterator it = client_cert_creds_.find(key);
       if (it == client_cert_creds_.end()) {
         handle = new CredHandleClass;
         client_cert_creds_[key] = handle;
       } else {
         handle = it->second;
       }
     } else {
@@ skipping 14 matching lines @@
   //   int ssl_version_mask
   typedef std::pair<PCCERT_CONTEXT, int> CredHandleMapKey;
 
   typedef std::map<CredHandleMapKey, CredHandleClass*> CredHandleMap;
 
   // Returns OK on success or a network error code on failure.
   static int InitializeHandle(CredHandle* handle,
                               PCCERT_CONTEXT client_cert,
                               int ssl_version_mask);
 
-  Lock lock_;
+  base::Lock lock_;
 
   // Anonymous (no client certificate) CredHandles for all possible
   // combinations of SSL versions.  Defined as an array for fast lookup.
   CredHandleClass anonymous_creds_[SSL_VERSION_MASKS];
 
   // CredHandles that use a client certificate.
   CredHandleMap client_cert_creds_;
 };
 
 static base::LazyInstance<CredHandleTable> g_cred_handle_table(
@@ skipping 1315 matching lines @@
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2_CA);
 }
 
 void SSLClientSocketWin::FreeSendBuffer() {
   SECURITY_STATUS status = FreeContextBuffer(send_buffer_.pvBuffer);
   DCHECK(status == SEC_E_OK);
   memset(&send_buffer_, 0, sizeof(send_buffer_));
 }
 
 }  // namespace net