diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-17 20:42:01 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-17 20:42:01 +0000 |
| commit | be72dd2fdf5afb3db30579ac11fa4df5f3559e26 (patch) | |
| tree | 1d3acffbc6939b7e510874aeba3c01e3716fa6b8 /sync/internal_api/sync_encryption_handler_impl.h | |
| parent | be973f5a168edcaed5f19a04b4e8d49ae240de77 (diff) | |
| download | chromium_src-be72dd2fdf5afb3db30579ac11fa4df5f3559e26.zip chromium_src-be72dd2fdf5afb3db30579ac11fa4df5f3559e26.tar.gz chromium_src-be72dd2fdf5afb3db30579ac11fa4df5f3559e26.tar.bz2 | |
[Sync] Add keystore migration conflict support.
We rely on the encryption handler's rollback detection for any cases
where conflicts might lose data and we can't merge. Else, we merge the
data as needed.
BUG=129665
Review URL: https://chromiumcodereview.appspot.com/10905191
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/sync_encryption_handler_impl.h')
| -rw-r--r-- | sync/internal_api/sync_encryption_handler_impl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h index 8c9edd1..f54055b 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 |