chrome/browser/sync/glue/autofill_model_associator.cc - Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/glue/autofill_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/autofill_model_associator.h ('k') | chrome/browser/sync/glue/autofill_profile_model_associator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_;

}