diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 18:55:30 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-16 18:55:30 +0000 |
| commit | e2341182c3230772e3438c2888d02af60ad4ffc3 (patch) | |
| tree | e88741304a382eeb8b2eb155d5fc71ba186493f7 /chrome/browser/sync/backend_migrator.cc | |
| parent | 3744f914f8d4ec44ea474ded7f0f9e6fe8e6f5fa (diff) | |
| download | chromium_src-e2341182c3230772e3438c2888d02af60ad4ffc3.zip chromium_src-e2341182c3230772e3438c2888d02af60ad4ffc3.tar.gz chromium_src-e2341182c3230772e3438c2888d02af60ad4ffc3.tar.bz2 | |
sync: make sure migrator is shutdown before sync backend host
avoids crash where migrator pulls a null snapshot post-shutdown.
also make sure migrator examines the correct set of types to migrate when calling Configure.
BUG=85181
TEST=MigrationErrorsTest (sync_integration_tests)
Review URL: http://codereview.chromium.org/7170034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/backend_migrator.cc')
| -rw-r--r-- | chrome/browser/sync/backend_migrator.cc | 2 |
1 files changed, 1 insertions, 1 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, |