Index: chrome/browser/sync/glue/autofill_model_associator.h |
diff --git a/chrome/browser/sync/glue/autofill_model_associator.h b/chrome/browser/sync/glue/autofill_model_associator.h |
index fb660e6dbdea892e2387ba816b43ed66d54747b7..a0eee277ed77802b11e923062fb81b92658de73f 100644 |
--- a/chrome/browser/sync/glue/autofill_model_associator.h |
+++ b/chrome/browser/sync/glue/autofill_model_associator.h |
@@ -12,8 +12,8 @@ |
#include <vector> |
#include "base/basictypes.h" |
-#include "base/lock.h" |
#include "base/ref_counted.h" |
+#include "base/synchronization/lock.h" |
#include "chrome/browser/autofill/personal_data_manager.h" |
#include "chrome/browser/sync/engine/syncapi.h" |
#include "chrome/browser/sync/glue/model_associator.h" |
@@ -183,7 +183,7 @@ class AutofillModelAssociator |
// Abort association pending flag and lock. If this is set to true |
// (via the AbortAssociation method), return from the |
// AssociateModels method as soon as possible. |
- Lock abort_association_pending_lock_; |
+ base::Lock abort_association_pending_lock_; |
bool abort_association_pending_; |
int number_of_entries_created_; |