Index: base/synchronization/condition_variable.h |
diff --git a/base/synchronization/condition_variable.h b/base/synchronization/condition_variable.h |
index 3acd0ac2c357e89b6b8f51d2c3a6b17262c47705..db75a49ae0b2e1566621de7172f98d4b6f19e6a6 100644 |
--- a/base/synchronization/condition_variable.h |
+++ b/base/synchronization/condition_variable.h |
@@ -75,7 +75,7 @@ |
#endif |
#include "base/basictypes.h" |
-#include "base/lock.h" |
+#include "base/synchronization/lock.h" |
namespace base { |
@@ -156,10 +156,10 @@ class ConditionVariable { |
RunState run_state_; |
// Private critical section for access to member data. |
- Lock internal_lock_; |
+ base::Lock internal_lock_; |
// Lock that is acquired before calling Wait(). |
- Lock& user_lock_; |
+ base::Lock& user_lock_; |
// Events that threads are blocked on. |
Event waiting_list_; |
@@ -176,7 +176,7 @@ class ConditionVariable { |
pthread_cond_t condition_; |
pthread_mutex_t* user_mutex_; |
#if !defined(NDEBUG) |
- Lock* user_lock_; // Needed to adjust shadow lock state on wait. |
+ base::Lock* user_lock_; // Needed to adjust shadow lock state on wait. |
#endif |
#endif |