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

Unified Diff: chrome/browser/sync/glue/password_model_associator.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
« no previous file with comments | « chrome/browser/sync/glue/password_model_associator.h ('k') | chrome/browser/sync/glue/sync_backend_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/password_model_associator.cc
diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc
index 3c9d01ab6bed247caa5458a904ffd69f9c75288f..d6708b5c7b0fd6c4ad5ba439d49b10ebd4005e79 100644
--- a/chrome/browser/sync/glue/password_model_associator.cc
+++ b/chrome/browser/sync/glue/password_model_associator.cc
@@ -41,7 +41,7 @@ PasswordModelAssociator::~PasswordModelAssociator() {}
bool PasswordModelAssociator::AssociateModels() {
DCHECK(expected_loop_ == MessageLoop::current());
{
- AutoLock lock(abort_association_pending_lock_);
+ base::AutoLock lock(abort_association_pending_lock_);
abort_association_pending_ = false;
}
@@ -194,7 +194,7 @@ bool PasswordModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) {
void PasswordModelAssociator::AbortAssociation() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- AutoLock lock(abort_association_pending_lock_);
+ base::AutoLock lock(abort_association_pending_lock_);
abort_association_pending_ = true;
}
@@ -210,7 +210,7 @@ bool PasswordModelAssociator::InitSyncNodeFromChromeId(
}
bool PasswordModelAssociator::IsAbortPending() {
- AutoLock lock(abort_association_pending_lock_);
+ base::AutoLock lock(abort_association_pending_lock_);
return abort_association_pending_;
}
« no previous file with comments | « chrome/browser/sync/glue/password_model_associator.h ('k') | chrome/browser/sync/glue/sync_backend_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698