[Sync] The cryptographer should be able to handle empty or old nigori nodes.

chrome/browser/sync/util/cryptographer.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 "base/base64.h"
 #include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/browser/password_manager/encryptor.h"
 
 namespace browser_sync {
 
@@ skipping 363 matching lines @@
 
 syncable::ModelTypeSet Cryptographer::GetEncryptedTypes() const {
   return encrypted_types_;
 }
 
 void Cryptographer::SetEncryptedTypesForTest(
     const syncable::ModelTypeSet& encrypted_types) {
   SetEncryptedTypes(encrypted_types);
 }
 
 void Cryptographer::SetEncryptedTypes(

[akalin, 2011/11/17 03:09:20]

Rename this to "MergeEncryptedTypes"

[Nicolas Zea, 2011/11/17 05:10:00]

Done.

     const syncable::ModelTypeSet& encrypted_types) {
   if (encrypted_types_ == encrypted_types) {

[akalin, 2011/11/17 03:09:20]

should be:

if (std::includes(encrypted_types_.begin(), ..., encrypted_types.begin() ...)) {
  return;
}

[Nicolas Zea, 2011/11/17 05:10:00]

Done.

     return;
   }
-  encrypted_types_ = encrypted_types;
+  encrypted_types_.insert(encrypted_types.begin(), encrypted_types.end());
   EmitEncryptedTypesChangedNotification();
 }
 
 void Cryptographer::EmitEncryptedTypesChangedNotification() {
   FOR_EACH_OBSERVER(
       Observer, observers_,
       OnEncryptedTypesChanged(encrypted_types_, encrypt_everything_));
 }
 
 void Cryptographer::InstallKeys(const std::string& default_key_name,
@@ skipping 11 matching lines @@
         continue;
       }
       nigoris_[key.name()] = make_linked_ptr(new_nigori.release());
     }
   }
   DCHECK(nigoris_.end() != nigoris_.find(default_key_name));
   default_nigori_ = &*nigoris_.find(default_key_name);
 }
 
 }  // namespace browser_sync