sync/engine/model_changing_syncer_command.cc - Issue 14046031: Worker changes to prepare for lock-free shutdown.

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: sync/engine/model_changing_syncer_command.cc

Issue 14046031: Worker changes to prepare for lock-free shutdown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 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:

Index: sync/engine/model_changing_syncer_command.cc

diff --git a/sync/engine/model_changing_syncer_command.cc b/sync/engine/model_changing_syncer_command.cc

index c2c2750b1288eacd6319f0b9b38b1c04576e6086..d3fcdda0da77d9bd4ab1c91b95e0bb8458bc57a5 100644

--- a/sync/engine/model_changing_syncer_command.cc

+++ b/sync/engine/model_changing_syncer_command.cc

@@ -38,7 +38,7 @@ SyncerError ModelChangingSyncerCommand::ExecuteImpl(

// unretained.

base::Unretained(this));

- SyncerError this_worker_result = worker->DoWorkAndWaitUntilDone(c);

+ SyncerError this_worker_result = worker->HandleWork(c);

// TODO(rlarocque): Figure out a better way to deal with errors from

// multiple models at once. See also: crbug.com/109422.

if (this_worker_result != SYNCER_OK)