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

Unified Diff: sync/engine/apply_updates_command.cc

Issue 10964057: sync: Refactor update application (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modify comments and rebase Created 8 years, 3 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 | « no previous file | sync/engine/syncer_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/apply_updates_command.cc
diff --git a/sync/engine/apply_updates_command.cc b/sync/engine/apply_updates_command.cc
index 7d4e72ec9290d063692d741e6a1fd037c1e40b52..639aef7c77fecb6dc5100e93181b126be2891011 100644
--- a/sync/engine/apply_updates_command.cc
+++ b/sync/engine/apply_updates_command.cc
@@ -66,11 +66,10 @@ SyncerError ApplyUpdatesCommand::ModelChangingExecuteImpl(
&trans, server_type_restriction, &handles);
UpdateApplicator applicator(
- session->context()->resolver(),
dir->GetCryptographer(&trans),
- handles.begin(), handles.end(), session->routing_info(),
+ session->routing_info(),
session->status_controller().group_restriction());
- while (applicator.AttemptOneApplication(&trans)) {}
+ applicator.AttemptApplications(&trans, handles);
applicator.SaveProgressIntoSessionState(
session->mutable_status_controller()->mutable_conflict_progress(),
session->mutable_status_controller()->mutable_update_progress());
« no previous file with comments | « no previous file | sync/engine/syncer_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698