Index: chrome/browser/sync/glue/autofill_profile_model_associator.cc |
diff --git a/chrome/browser/sync/glue/autofill_profile_model_associator.cc b/chrome/browser/sync/glue/autofill_profile_model_associator.cc |
index c517e2c81ed377cf580103098f2b95be01b51bc5..d6a679230692a04eeabf54908503fb773bf7e181 100644 |
--- a/chrome/browser/sync/glue/autofill_profile_model_associator.cc |
+++ b/chrome/browser/sync/glue/autofill_profile_model_associator.cc |
@@ -129,7 +129,7 @@ bool AutofillProfileModelAssociator::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; |
} |
@@ -458,7 +458,7 @@ int64 AutofillProfileModelAssociator::GetSyncIdFromChromeId( |
void AutofillProfileModelAssociator::AbortAssociation() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- AutoLock lock(abort_association_pending_lock_); |
+ base::AutoLock lock(abort_association_pending_lock_); |
abort_association_pending_ = true; |
} |
@@ -469,7 +469,7 @@ const std::string* AutofillProfileModelAssociator::GetChromeNodeFromSyncId( |
} |
bool AutofillProfileModelAssociator::IsAbortPending() { |
- AutoLock lock(abort_association_pending_lock_); |
+ base::AutoLock lock(abort_association_pending_lock_); |
return abort_association_pending_; |
} |