Index: chrome/browser/sync/glue/autofill_model_associator.cc |
diff --git a/chrome/browser/sync/glue/autofill_model_associator.cc b/chrome/browser/sync/glue/autofill_model_associator.cc |
index 289d5fba28b6c124a2d59fc2d3c579fae5bab118..58f890b1deccfff6d2234f9c70e681bb6468ee1e 100644 |
--- a/chrome/browser/sync/glue/autofill_model_associator.cc |
+++ b/chrome/browser/sync/glue/autofill_model_associator.cc |
@@ -137,7 +137,7 @@ bool AutofillModelAssociator::AssociateModels() { |
VLOG(1) << "Associating Autofill Models"; |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); |
{ |
- AutoLock lock(abort_association_pending_lock_); |
+ base::AutoLock lock(abort_association_pending_lock_); |
abort_association_pending_ = false; |
} |
@@ -402,7 +402,7 @@ bool AutofillModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) { |
void AutofillModelAssociator::AbortAssociation() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- AutoLock lock(abort_association_pending_lock_); |
+ base::AutoLock lock(abort_association_pending_lock_); |
abort_association_pending_ = true; |
} |
@@ -455,7 +455,7 @@ bool AutofillModelAssociator::GetSyncIdForTaggedNode(const std::string& tag, |
} |
bool AutofillModelAssociator::IsAbortPending() { |
- AutoLock lock(abort_association_pending_lock_); |
+ base::AutoLock lock(abort_association_pending_lock_); |
return abort_association_pending_; |
} |