diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 18:08:11 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 18:08:11 +0000 |
| commit | dc39dd1b800ee76d17d2d8ee0fd3a6a273190274 (patch) | |
| tree | da0d5fa5bc2a4de56cbbf85d553c335eae2e0106 /chrome/browser/sync/engine/syncapi.cc | |
| parent | 4947c7fdd2e02b30168407431823ed6c7b4086bf (diff) | |
| download | chromium_src-dc39dd1b800ee76d17d2d8ee0fd3a6a273190274.zip chromium_src-dc39dd1b800ee76d17d2d8ee0fd3a6a273190274.tar.gz chromium_src-dc39dd1b800ee76d17d2d8ee0fd3a6a273190274.tar.bz2 | |
sync: Fix Nigori download sequencing.
Only drop SetPassphrase requests if we hadn't requested NIGORI nodes
in routing info. The reasoning is that NIGORI will be on-by-default always, meaning you cannot disable it, so once it is present it will remain, and it only ever gets added during init. Hence, if sync setup has completed, and NIGORI is in the routing info, we are good to go.
Also make sure we remove passphrase notification observers when shutting down to avoid re-registration problems.
BUG=58098, 48702
TEST=ProfileSyncPasswordsTest, point chrome at passwords-enabled server, run with --enable-sync-passwords, and successfully sync passwords.
Review URL: http://codereview.chromium.org/3569022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncapi.cc')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index f91d0f8..dabb926 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -1863,7 +1863,7 @@ void SyncManager::SyncInternal::HandleChannelEvent(const SyncerEvent& event) { sync_api::ReadTransaction trans(GetUserShare()); sync_api::ReadNode node(&trans); if (!node.InitByTagLookup(kNigoriTag)) { - NOTREACHED(); + DCHECK(!event.snapshot->is_share_usable); return; } const sync_pb::NigoriSpecifics& nigori = node.GetNigoriSpecifics(); |