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

Unified Diff: chrome/test/automation/automation_handle_tracker.h

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
Index: chrome/test/automation/automation_handle_tracker.h
diff --git a/chrome/test/automation/automation_handle_tracker.h b/chrome/test/automation/automation_handle_tracker.h
index bfa319a4cfbc602b00047f9e4ec37c14089f70b5..9558af2cd5509a4f2dfb9e9d75fe769b15368307 100644
--- a/chrome/test/automation/automation_handle_tracker.h
+++ b/chrome/test/automation/automation_handle_tracker.h
@@ -12,8 +12,8 @@
#include <map>
#include "base/basictypes.h"
-#include "base/lock.h"
#include "base/ref_counted.h"
+#include "base/synchronization/lock.h"
#include "ipc/ipc_channel.h"
// This represents a value that the app's AutomationProvider returns
@@ -106,7 +106,7 @@ class AutomationHandleTracker {
HandleToObjectMap handle_to_object_;
- Lock map_lock_;
+ base::Lock map_lock_;
IPC::Channel* channel_;
DISALLOW_COPY_AND_ASSIGN(AutomationHandleTracker);
};
« no previous file with comments | « chrome/service/cloud_print/print_system_cups.cc ('k') | chrome/test/automation/automation_handle_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698