diff options
| -rw-r--r-- | chrome/browser/sync/backend_migrator.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/sync/backend_migrator.cc b/chrome/browser/sync/backend_migrator.cc index 2ab4680..1bbda87 100644 --- a/chrome/browser/sync/backend_migrator.cc +++ b/chrome/browser/sync/backend_migrator.cc @@ -72,7 +72,7 @@ void BackendMigrator::MigrateTypes(const syncable::ModelTypeSet& types) { // Add nigori for config or not based upon if the server told us to migrate // nigori or not. - if (types.count(syncable::NIGORI) == 0) { + if (to_migrate_.count(syncable::NIGORI) == 0) { manager_->Configure(difference, sync_api::CONFIGURE_REASON_MIGRATION); } else { manager_->ConfigureWithoutNigori(difference, diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index 23cb43e..e769892 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -1211,6 +1211,8 @@ class SyncManager::SyncInternal bool UpdateCryptographerFromNigori(); // Set the datatypes we want to encrypt and encrypt any nodes as necessary. + // Note: |encrypted_types| will be unioned with the current set of encrypted + // types, as we do not currently support decrypting datatypes. void EncryptDataTypes(const syncable::ModelTypeSet& encrypted_types); // Try to set the current passphrase to |passphrase|, and record whether diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 98adf3d..be57312 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -399,6 +399,9 @@ void ProfileSyncService::Shutdown(bool sync_disabled) { data_type_manager_.reset(); } + // Shutdown the migrator before the backend to ensure it doesn't pull a null + // snapshot. + migrator_.reset(); js_event_handlers_.RemoveBackend(); // Move aside the backend so nobody else tries to use it while we are @@ -1341,4 +1344,3 @@ bool ProfileSyncService::ShouldPushChanges() { return data_type_manager_->state() == DataTypeManager::CONFIGURED; } - |