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

Unified Diff: chrome/test/automation/automation_handle_tracker.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 | « chrome/test/automation/automation_handle_tracker.h ('k') | chrome/test/automation/tab_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/automation_handle_tracker.cc
diff --git a/chrome/test/automation/automation_handle_tracker.cc b/chrome/test/automation/automation_handle_tracker.cc
index 0ad75921ccece7897ae6ad6e9c45a0df0553aca2..6f01e7bef8cd6f7b8b14d76d6f1ca9bd8a97e555 100644
--- a/chrome/test/automation/automation_handle_tracker.cc
+++ b/chrome/test/automation/automation_handle_tracker.cc
@@ -34,12 +34,12 @@ AutomationHandleTracker::~AutomationHandleTracker() {
}
void AutomationHandleTracker::Add(AutomationResourceProxy* proxy) {
- AutoLock lock(map_lock_);
+ base::AutoLock lock(map_lock_);
handle_to_object_.insert(MapEntry(proxy->handle(), proxy));
}
void AutomationHandleTracker::Remove(AutomationResourceProxy* proxy) {
- AutoLock lock(map_lock_);
+ base::AutoLock lock(map_lock_);
HandleToObjectMap::iterator iter = handle_to_object_.find(proxy->handle());
if (iter != handle_to_object_.end()) {
AutomationHandle proxy_handle = proxy->handle();
@@ -51,7 +51,7 @@ void AutomationHandleTracker::Remove(AutomationResourceProxy* proxy) {
void AutomationHandleTracker::InvalidateHandle(AutomationHandle handle) {
// Called in background thread.
- AutoLock lock(map_lock_);
+ base::AutoLock lock(map_lock_);
HandleToObjectMap::iterator iter = handle_to_object_.find(handle);
if (iter != handle_to_object_.end()) {
scoped_refptr<AutomationResourceProxy> proxy = iter->second;
@@ -62,7 +62,7 @@ void AutomationHandleTracker::InvalidateHandle(AutomationHandle handle) {
AutomationResourceProxy* AutomationHandleTracker::GetResource(
AutomationHandle handle) {
- AutoLock lock(map_lock_);
+ base::AutoLock lock(map_lock_);
HandleToObjectMap::iterator iter = handle_to_object_.find(handle);
if (iter == handle_to_object_.end())
return NULL;
« no previous file with comments | « chrome/test/automation/automation_handle_tracker.h ('k') | chrome/test/automation/tab_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698