sync/engine/conflict_resolver.cc - Issue 10827266: [Sync] Add SyncEncryptionHandler

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/conflict_resolver.cc

Issue 10827266: [Sync] Add SyncEncryptionHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments 2 Created 8 years, 4 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/conflict_resolver.cc

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

index 2a3c62d836b196da22ff4842037c1f660882b725..5912e466c0abbfaaf0c183f6b1cdc6a2bddbc077 100644

--- a/sync/engine/conflict_resolver.cc

+++ b/sync/engine/conflict_resolver.cc

@@ -229,7 +229,7 @@ ConflictResolver::ProcessSimpleConflict(WriteTransaction* trans,

sync_pb::NigoriSpecifics* server_nigori = specifics.mutable_nigori();

// Store the merged set of encrypted types (cryptographer->Update(..) will

// have merged the local types already).

- cryptographer->UpdateNigoriFromEncryptedTypes(server_nigori);

+ cryptographer->UpdateNigoriFromEncryptedTypes(server_nigori, trans);

// The cryptographer has the both the local and remote encryption keys

// (added at cryptographer->Update(..) time).

// If the cryptographer is ready, then it already merged both sets of keys