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

Unified Diff: chrome/browser/sync/glue/autofill_data_type_controller.cc

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/browser/sync/glue/autofill_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.cc b/chrome/browser/sync/glue/autofill_data_type_controller.cc
index 8661e14bfc0fe7169c0d8ab2f1f9de68c1603610..1c57df2f704e3dddb533d2837521e4a0d796ea98 100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller.cc
+++ b/chrome/browser/sync/glue/autofill_data_type_controller.cc
@@ -109,7 +109,7 @@ void AutofillDataTypeController::Stop() {
// thread to finish the StartImpl() task.
if (state_ == ASSOCIATING) {
{
- AutoLock lock(abort_association_lock_);
+ base::AutoLock lock(abort_association_lock_);
abort_association_ = true;
if (model_associator_.get())
model_associator_->AbortAssociation();
@@ -189,7 +189,7 @@ void AutofillDataTypeController::StartImpl() {
// No additional services need to be started before we can proceed
// with model association.
{
- AutoLock lock(abort_association_lock_);
+ base::AutoLock lock(abort_association_lock_);
if (abort_association_) {
abort_association_complete_.Signal();
return;
@@ -232,7 +232,7 @@ void AutofillDataTypeController::StartDone(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
abort_association_complete_.Signal();
- AutoLock lock(abort_association_lock_);
+ base::AutoLock lock(abort_association_lock_);
if (!abort_association_) {
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
NewRunnableMethod(
« no previous file with comments | « chrome/browser/sync/glue/autofill_data_type_controller.h ('k') | chrome/browser/sync/glue/autofill_model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698