summaryrefslogtreecommitdiffstats
path: root/net/proxy/polling_proxy_config_service.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/proxy/polling_proxy_config_service.cc')
-rw-r--r--net/proxy/polling_proxy_config_service.cc8
1 files changed, 4 insertions, 4 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_;