diff options
Diffstat (limited to 'net/url_request')
-rw-r--r-- | net/url_request/url_request_file_job.cc | 7 | ||||
-rw-r--r-- | net/url_request/url_request_job_manager.cc | 8 | ||||
-rw-r--r-- | net/url_request/url_request_job_manager.h | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc index adc6f44..7a1599a 100644 --- a/net/url_request/url_request_file_job.cc +++ b/net/url_request/url_request_file_job.cc @@ -23,6 +23,7 @@ #include "base/message_loop.h" #include "base/platform_file.h" #include "base/string_util.h" +#include "base/synchronization/lock.h" #include "base/threading/worker_pool.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" @@ -50,7 +51,7 @@ class URLRequestFileJob::AsyncResolver void Resolve(const FilePath& file_path) { base::PlatformFileInfo file_info; bool exists = file_util::GetFileInfo(file_path, &file_info); - AutoLock locked(lock_); + base::AutoLock locked(lock_); if (owner_loop_) { owner_loop_->PostTask(FROM_HERE, NewRunnableMethod( this, &AsyncResolver::ReturnResults, exists, file_info)); @@ -60,7 +61,7 @@ class URLRequestFileJob::AsyncResolver void Cancel() { owner_ = NULL; - AutoLock locked(lock_); + base::AutoLock locked(lock_); owner_loop_ = NULL; } @@ -76,7 +77,7 @@ class URLRequestFileJob::AsyncResolver URLRequestFileJob* owner_; - Lock lock_; + base::Lock lock_; MessageLoop* owner_loop_; }; #endif diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc index c630ba2..f311cc4 100644 --- a/net/url_request/url_request_job_manager.cc +++ b/net/url_request/url_request_job_manager.cc @@ -152,7 +152,7 @@ net::URLRequestJob* URLRequestJobManager::MaybeInterceptResponse( bool URLRequestJobManager::SupportsScheme(const std::string& scheme) const { // The set of registered factories may change on another thread. { - AutoLock locked(lock_); + base::AutoLock locked(lock_); if (factories_.find(scheme) != factories_.end()) return true; } @@ -171,7 +171,7 @@ net::URLRequest::ProtocolFactory* URLRequestJobManager::RegisterProtocolFactory( DCHECK(IsAllowedThread()); #endif - AutoLock locked(lock_); + base::AutoLock locked(lock_); net::URLRequest::ProtocolFactory* old_factory; FactoryMap::iterator i = factories_.find(scheme); @@ -194,7 +194,7 @@ void URLRequestJobManager::RegisterRequestInterceptor( DCHECK(IsAllowedThread()); #endif - AutoLock locked(lock_); + base::AutoLock locked(lock_); DCHECK(std::find(interceptors_.begin(), interceptors_.end(), interceptor) == interceptors_.end()); @@ -207,7 +207,7 @@ void URLRequestJobManager::UnregisterRequestInterceptor( DCHECK(IsAllowedThread()); #endif - AutoLock locked(lock_); + base::AutoLock locked(lock_); InterceptorList::iterator i = std::find(interceptors_.begin(), interceptors_.end(), interceptor); diff --git a/net/url_request/url_request_job_manager.h b/net/url_request/url_request_job_manager.h index 34e3a58..e4efcf5 100644 --- a/net/url_request/url_request_job_manager.h +++ b/net/url_request/url_request_job_manager.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/lock.h" +#include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" #include "net/url_request/url_request.h" @@ -76,7 +76,7 @@ class URLRequestJobManager { URLRequestJobManager(); ~URLRequestJobManager(); - mutable Lock lock_; + mutable base::Lock lock_; FactoryMap factories_; InterceptorList interceptors_; bool enable_file_access_; |