chrome/browser/sync/engine/apply_updates_command.cc - Issue 2828021: Take 2: sync changes to support encryption

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/engine/apply_updates_command.cc

Issue 2828021: Take 2: sync changes to support encryption (Closed)

Patch Set: fix flaky password test under valgrind Created 10 years, 6 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: chrome/browser/sync/engine/apply_updates_command.cc

diff --git a/chrome/browser/sync/engine/apply_updates_command.cc b/chrome/browser/sync/engine/apply_updates_command.cc

index abce4db3b857e91763a425cd54c6e1218b0edf9a..1853f2c0c1d7885b035a015f834cdb6af096f815 100644

--- a/chrome/browser/sync/engine/apply_updates_command.cc

+++ b/chrome/browser/sync/engine/apply_updates_command.cc

@@ -28,8 +28,10 @@ void ApplyUpdatesCommand::ModelChangingExecuteImpl(SyncSession* session) {

syncable::Directory::UnappliedUpdateMetaHandles handles;

dir->GetUnappliedUpdateMetaHandles(&trans, &handles);

- UpdateApplicator applicator(session->context()->resolver(), handles.begin(),

- handles.end(), session->routing_info(),

+ UpdateApplicator applicator(

+ session->context()->resolver(),

+ session->context()->directory_manager()->cryptographer(),

+ handles.begin(), handles.end(), session->routing_info(),

session->status_controller()->group_restriction());

while (applicator.AttemptOneApplication(&trans)) {}

applicator.SaveProgressIntoSessionState(

« no previous file with comments | « no previous file | chrome/browser/sync/engine/apply_updates_command_unittest.cc » ('j') | no next file with comments »