[Sync] Special case nigori when calculating commit id's.

chrome/browser/sync/engine/get_commit_ids_command.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/engine/get_commit_ids_command.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 76 matching lines @@
     // The local and server versions don't match. The item must be in
     // conflict, so there's no point in attempting to commit.
     DCHECK(entry.Get(syncable::IS_UNAPPLIED_UPDATE));  // In conflict.
     // TODO(zea): switch this to DVLOG once it's clear bug 100660 is fixed.
     DVLOG(1) << "Excluding entry from commit due to version mismatch "
              << entry;
     return false;
   }
 
   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
     // due to the cryptographer not being initialized or the user hasn't
     // provided the most recent passphrase).
     // TODO(zea): switch this to DVLOG once it's clear bug 100660 is fixed.
     DVLOG(1) << "Excluding entry from commit due to lack of encryption "
              << entry;
     return false;
   }
@@ skipping 242 matching lines @@
 
   // Add moves and creates, and prepend their uncommitted parents.
   AddCreatesAndMoves(unsynced_handles, write_transaction, routes,
                      throttled_types);
 
   // Add all deletes.
   AddDeletes(unsynced_handles, write_transaction);
 }
 
 }  // namespace browser_sync