[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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113550 0039d316-1c4b-4281-b951-d872f2087c98

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