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

Unified Diff: net/socket/ssl_client_socket_win.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/socket/ssl_client_socket_openssl.cc ('k') | net/socket_stream/socket_stream_job_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_win.cc
diff --git a/net/socket/ssl_client_socket_win.cc b/net/socket/ssl_client_socket_win.cc
index ae4d4b5905ed090246c7beec9b338c50cf704151..5a37de804bec4cc5ccee8f677b0544d3d755769c 100644
--- a/net/socket/ssl_client_socket_win.cc
+++ b/net/socket/ssl_client_socket_win.cc
@@ -9,9 +9,9 @@
#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"
@@ -149,7 +149,7 @@ class CredHandleTable {
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);
@@ -184,7 +184,7 @@ class CredHandleTable {
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.
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket_stream/socket_stream_job_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698