diff options
Diffstat (limited to 'net/proxy')
-rw-r--r-- | net/proxy/polling_proxy_config_service.cc | 8 | ||||
-rw-r--r-- | net/proxy/sync_host_resolver_bridge.cc | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/net/proxy/polling_proxy_config_service.cc b/net/proxy/polling_proxy_config_service.cc index 01acac2..7526c19 100644 --- a/net/proxy/polling_proxy_config_service.cc +++ b/net/proxy/polling_proxy_config_service.cc @@ -4,10 +4,10 @@ #include "net/proxy/polling_proxy_config_service.h" -#include "base/lock.h" #include "base/message_loop_proxy.h" #include "base/observer_list.h" #include "base/scoped_ptr.h" +#include "base/synchronization/lock.h" #include "base/threading/worker_pool.h" #include "net/proxy/proxy_config.h" @@ -32,7 +32,7 @@ class PollingProxyConfigService::Core // Called when the parent PollingProxyConfigService is destroyed // (observers should not be called past this point). void Orphan() { - AutoLock l(lock_); + base::AutoLock l(lock_); origin_loop_proxy_ = NULL; } @@ -99,7 +99,7 @@ class PollingProxyConfigService::Core ProxyConfig config; func(&config); - AutoLock l(lock_); + base::AutoLock l(lock_); if (origin_loop_proxy_) { origin_loop_proxy_->PostTask( FROM_HERE, @@ -145,7 +145,7 @@ class PollingProxyConfigService::Core base::TimeTicks last_poll_time_; base::TimeDelta poll_interval_; - Lock lock_; + base::Lock lock_; scoped_refptr<base::MessageLoopProxy> origin_loop_proxy_; bool have_initialized_origin_loop_; diff --git a/net/proxy/sync_host_resolver_bridge.cc b/net/proxy/sync_host_resolver_bridge.cc index 37a847f..80270f6 100644 --- a/net/proxy/sync_host_resolver_bridge.cc +++ b/net/proxy/sync_host_resolver_bridge.cc @@ -6,8 +6,8 @@ #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/lock.h" #include "base/message_loop.h" +#include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" @@ -26,7 +26,7 @@ class SyncHostResolverBridge::Core // Returns true if Shutdown() has been called. bool HasShutdown() const { - AutoLock l(lock_); + base::AutoLock l(lock_); return HasShutdownLocked(); } @@ -66,7 +66,7 @@ class SyncHostResolverBridge::Core bool has_shutdown_; // Mutex to guard accesses to |has_shutdown_|. - mutable Lock lock_; + mutable base::Lock lock_; DISALLOW_COPY_AND_ASSIGN(Core); }; @@ -121,7 +121,7 @@ int SyncHostResolverBridge::Core::WaitForResolveCompletion() { event_.Wait(); { - AutoLock l(lock_); + base::AutoLock l(lock_); if (HasShutdownLocked()) return ERR_ABORTED; event_.Reset(); @@ -139,7 +139,7 @@ void SyncHostResolverBridge::Core::Shutdown() { } { - AutoLock l(lock_); + base::AutoLock l(lock_); has_shutdown_ = true; } |