sync/internal_api/sync_encryption_handler_impl.h - Issue 10905191: [Sync] Add keystore migration conflict support.

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/internal_api/sync_encryption_handler_impl.h

Issue 10905191: [Sync] Add keystore migration conflict support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

Index: sync/internal_api/sync_encryption_handler_impl.h

diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h

index 8c9edd1091666c2d4388bd0ee88cf49fab51ab39..f54055b9afdaab82647e0088a353b499de792524 100644

--- a/sync/internal_api/sync_encryption_handler_impl.h

+++ b/sync/internal_api/sync_encryption_handler_impl.h

@@ -116,6 +116,8 @@ class SyncEncryptionHandlerImpl

SetImplicitPassAfterMigrationNoKeystoreKey);

FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,

MigrateOnEncryptEverythingKeystorePassphrase);

+ FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,

+ ReceiveMigratedNigoriWithOldPassphrase);

// Container for members that require thread safety protection. All members

// that can be accessed from more than one thread should be held here and