diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /net/proxy/sync_host_resolver_bridge.cc | |
parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 |
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
Diffstat (limited to 'net/proxy/sync_host_resolver_bridge.cc')
-rw-r--r-- | net/proxy/sync_host_resolver_bridge.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |