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

Unified Diff: net/socket_stream/socket_stream_job_manager.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_stream/socket_stream_job_manager.h ('k') | net/url_request/url_request_job_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket_stream/socket_stream_job_manager.cc
diff --git a/net/socket_stream/socket_stream_job_manager.cc b/net/socket_stream/socket_stream_job_manager.cc
index de2f0a87ad1b976707c395f1de8c99ee08bc32ba..105fc3eef217e15282d364fa3cc62893169d8409 100644
--- a/net/socket_stream/socket_stream_job_manager.cc
+++ b/net/socket_stream/socket_stream_job_manager.cc
@@ -31,7 +31,7 @@ SocketStreamJob* SocketStreamJobManager::CreateJob(
const std::string& scheme = url.scheme(); // already lowercase
- AutoLock locked(lock_);
+ base::AutoLock locked(lock_);
FactoryMap::const_iterator found = factories_.find(scheme);
if (found != factories_.end()) {
SocketStreamJob* job = found->second(url, delegate);
@@ -46,7 +46,7 @@ SocketStreamJob* SocketStreamJobManager::CreateJob(
SocketStreamJob::ProtocolFactory*
SocketStreamJobManager::RegisterProtocolFactory(
const std::string& scheme, SocketStreamJob::ProtocolFactory* factory) {
- AutoLock locked(lock_);
+ base::AutoLock locked(lock_);
SocketStreamJob::ProtocolFactory* old_factory;
FactoryMap::iterator found = factories_.find(scheme);
« no previous file with comments | « net/socket_stream/socket_stream_job_manager.h ('k') | net/url_request/url_request_job_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698