Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(545)

Unified Diff: net/base/host_resolver_impl_unittest.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/host_resolver_impl.cc ('k') | net/base/keygen_handler_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/host_resolver_impl_unittest.cc
diff --git a/net/base/host_resolver_impl_unittest.cc b/net/base/host_resolver_impl_unittest.cc
index 4d26ab9bdc21d43d82eb2f0bdb0996dc5f4d8b67..8d418e9c510882915aa34bd0191314dc9e4f35e2 100644
--- a/net/base/host_resolver_impl_unittest.cc
+++ b/net/base/host_resolver_impl_unittest.cc
@@ -92,7 +92,7 @@ class CapturingHostResolverProc : public HostResolverProc {
int* os_error) {
event_.Wait();
{
- AutoLock l(lock_);
+ base::AutoLock l(lock_);
capture_list_.push_back(CaptureEntry(hostname, address_family));
}
return ResolveUsingPrevious(hostname, address_family,
@@ -102,7 +102,7 @@ class CapturingHostResolverProc : public HostResolverProc {
CaptureList GetCaptureList() const {
CaptureList copy;
{
- AutoLock l(lock_);
+ base::AutoLock l(lock_);
copy = capture_list_;
}
return copy;
@@ -112,7 +112,7 @@ class CapturingHostResolverProc : public HostResolverProc {
~CapturingHostResolverProc() {}
CaptureList capture_list_;
- mutable Lock lock_;
+ mutable base::Lock lock_;
base::WaitableEvent event_;
};
« no previous file with comments | « net/base/host_resolver_impl.cc ('k') | net/base/keygen_handler_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698