diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-22 18:32:18 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-22 18:32:18 +0000 |
| commit | 45dbaf9cae272a5942d41e2316fe83e9d0340cdc (patch) | |
| tree | 36b8eb2738950bec5f8c01948ef6bb9e11ef16c2 /chrome/browser/sync/engine | |
| parent | 7e11bf57a0d649706afe8d3f00e708095dc1305c (diff) | |
| download | chromium_src-45dbaf9cae272a5942d41e2316fe83e9d0340cdc.zip chromium_src-45dbaf9cae272a5942d41e2316fe83e9d0340cdc.tar.gz chromium_src-45dbaf9cae272a5942d41e2316fe83e9d0340cdc.tar.bz2 | |
Merge 113550 - [Sync] Special case nigori when calculating commit id's.
We special case the nigori node because even though it is considered an
"encrypted type", not all nigori node changes require valid encryption
(ex: sync_tabs).
BUG=106619
TEST=none.
Review URL: http://codereview.chromium.org/8856007
TBR=zea@chromium.org
Review URL: http://codereview.chromium.org/9025021
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine')
| -rw-r--r-- | chrome/browser/sync/engine/get_commit_ids_command.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/get_commit_ids_command.cc b/chrome/browser/sync/engine/get_commit_ids_command.cc index 3000649..4c280ec 100644 --- a/chrome/browser/sync/engine/get_commit_ids_command.cc +++ b/chrome/browser/sync/engine/get_commit_ids_command.cc @@ -94,7 +94,11 @@ bool IsEntryReadyForCommit(const syncable::ModelTypeSet& encrypted_types, } syncable::ModelType type = entry.GetModelType(); - if (encrypted_types.count(type) > 0 && + // We special case the nigori node because even though it is considered an + // "encrypted type", not all nigori node changes require valid encryption + // (ex: sync_tabs). + if (type != syncable::NIGORI && + encrypted_types.count(type) > 0 && (passphrase_missing || syncable::EntryNeedsEncryption(encrypted_types, entry))) { // This entry requires encryption but is not properly encrypted (possibly |