From 20305ec6f1acf21392c2f3938a14a96f1e28e76d Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 21 Jan 2011 04:55:52 +0000 Subject: Remove obsolete base/lock.h and fix up callers to use the new header file and the base namespace. Fix several files including lock.h unnecessarily. BUG=none TEST=none Original review=http://codereview.chromium.org/6142009/ Patch by leviw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/polling_proxy_config_service.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'net/proxy/polling_proxy_config_service.cc') 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 origin_loop_proxy_; bool have_initialized_origin_loop_; -- cgit v1.1