FYI: Control Data + Per-Device Metadata

sync/util/cryptographer_unittest.cc

 // Copyright (c) 2012 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 "sync/util/cryptographer.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 256 matching lines @@
   cryptographer_.UpdateNigoriFromEncryptedTypes(&nigori);
   cryptographer2.UpdateEncryptedTypesFromNigori(nigori);
   EXPECT_TRUE(encrypted_types.Equals(cryptographer_.GetEncryptedTypes()));
   EXPECT_TRUE(encrypted_types.Equals(cryptographer2.GetEncryptedTypes()));
 
   Mock::VerifyAndClearExpectations(&observer);
   Mock::VerifyAndClearExpectations(&observer2);
 
   EXPECT_CALL(observer,
               OnEncryptedTypesChanged(
-                  HasModelTypes(ModelTypeSet::All()), false));
+                  HasModelTypes(syncer::EncryptableTypes()), false));
   EXPECT_CALL(observer2,
               OnEncryptedTypesChanged(
-                  HasModelTypes(ModelTypeSet::All()), false));
+                  HasModelTypes(syncer::EncryptableTypes()), false));
 
-  // Set all encrypted types
-  encrypted_types = ModelTypeSet::All();
+  // Set all encryptable types
+  encrypted_types = syncer::EncryptableTypes();
   cryptographer_.MergeEncryptedTypesForTest(encrypted_types);
   cryptographer_.UpdateNigoriFromEncryptedTypes(&nigori);
   cryptographer2.UpdateEncryptedTypesFromNigori(nigori);
   EXPECT_TRUE(encrypted_types.Equals(cryptographer_.GetEncryptedTypes()));
   EXPECT_TRUE(encrypted_types.Equals(cryptographer2.GetEncryptedTypes()));
 
    // Receiving an empty nigori should not reset any encrypted types or trigger
    // an observer notification.
    Mock::VerifyAndClearExpectations(&observer);
    nigori = sync_pb::NigoriSpecifics();
    cryptographer_.UpdateEncryptedTypesFromNigori(nigori);
    EXPECT_TRUE(encrypted_types.Equals(cryptographer_.GetEncryptedTypes()));
 }
 
 TEST_F(SyncCryptographerTest, EncryptEverythingExplicit) {
-  ModelTypeSet real_types = ModelTypeSet::All();
+  ModelTypeSet encryptable_types = syncer::EncryptableTypes();
   sync_pb::NigoriSpecifics specifics;
   specifics.set_encrypt_everything(true);
 
   StrictMock<MockObserver> observer;
   cryptographer_.AddObserver(&observer);
 
   EXPECT_CALL(observer,
               OnEncryptedTypesChanged(
-                  HasModelTypes(ModelTypeSet::All()), true));
+                  HasModelTypes(syncer::EncryptableTypes()), true));
 
   EXPECT_FALSE(cryptographer_.encrypt_everything());
   ModelTypeSet encrypted_types = cryptographer_.GetEncryptedTypes();
-  for (ModelTypeSet::Iterator iter = real_types.First();
+  for (ModelTypeSet::Iterator iter = encryptable_types.First();
        iter.Good(); iter.Inc()) {
     if (iter.Get() == PASSWORDS || iter.Get() == NIGORI)
       EXPECT_TRUE(encrypted_types.Has(iter.Get()));
     else
       EXPECT_FALSE(encrypted_types.Has(iter.Get()));
   }
 
   cryptographer_.UpdateEncryptedTypesFromNigori(specifics);
 
   EXPECT_TRUE(cryptographer_.encrypt_everything());
   encrypted_types = cryptographer_.GetEncryptedTypes();
-  for (ModelTypeSet::Iterator iter = real_types.First();
+  for (ModelTypeSet::Iterator iter = encryptable_types.First();
        iter.Good(); iter.Inc()) {
     EXPECT_TRUE(encrypted_types.Has(iter.Get()));
   }
 
   // Shouldn't trigger another notification.
   specifics.set_encrypt_everything(true);
 
   cryptographer_.RemoveObserver(&observer);
 }
 
 TEST_F(SyncCryptographerTest, EncryptEverythingImplicit) {
-  ModelTypeSet real_types = ModelTypeSet::All();
+  ModelTypeSet encryptable_types = syncer::EncryptableTypes();
   sync_pb::NigoriSpecifics specifics;
   specifics.set_encrypt_bookmarks(true);  // Non-passwords = encrypt everything
 
   StrictMock<MockObserver> observer;
   cryptographer_.AddObserver(&observer);
 
   EXPECT_CALL(observer,
               OnEncryptedTypesChanged(
-                  HasModelTypes(ModelTypeSet::All()), true));
+                  HasModelTypes(syncer::EncryptableTypes()), true));
 
   EXPECT_FALSE(cryptographer_.encrypt_everything());
   ModelTypeSet encrypted_types = cryptographer_.GetEncryptedTypes();
-  for (ModelTypeSet::Iterator iter = real_types.First();
+  for (ModelTypeSet::Iterator iter = encryptable_types.First();
        iter.Good(); iter.Inc()) {
     if (iter.Get() == PASSWORDS || iter.Get() == NIGORI)
       EXPECT_TRUE(encrypted_types.Has(iter.Get()));
     else
       EXPECT_FALSE(encrypted_types.Has(iter.Get()));
   }
 
   cryptographer_.UpdateEncryptedTypesFromNigori(specifics);
 
   EXPECT_TRUE(cryptographer_.encrypt_everything());
   encrypted_types = cryptographer_.GetEncryptedTypes();
-  for (ModelTypeSet::Iterator iter = real_types.First();
+  for (ModelTypeSet::Iterator iter = encryptable_types.First();
        iter.Good(); iter.Inc()) {
     EXPECT_TRUE(encrypted_types.Has(iter.Get()));
   }
 
   // Shouldn't trigger another notification.
   specifics.set_encrypt_everything(true);
 
   cryptographer_.RemoveObserver(&observer);
 }
 
@@ skipping 36 matching lines @@
         iter.Get() == BOOKMARKS)
       EXPECT_TRUE(encrypted_types.Has(iter.Get()));
     else
       EXPECT_FALSE(encrypted_types.Has(iter.Get()));
   }
 
   cryptographer_.RemoveObserver(&observer);
 }
 
 }  // namespace syncer