FYI: Control Data + Per-Device Metadata

sync/util/cryptographer_unittest.cc

Index: sync/util/cryptographer_unittest.cc
diff --git a/sync/util/cryptographer_unittest.cc b/sync/util/cryptographer_unittest.cc
index 01190e9865fa1c200a83ac1016be32f670551e66..6a2d639c8e1ac9ecc473218008d1bc8105530c1f 100644
--- a/sync/util/cryptographer_unittest.cc
+++ b/sync/util/cryptographer_unittest.cc
@@ -274,13 +274,13 @@ TEST_F(SyncCryptographerTest, NigoriEncryptionTypes) {
 
   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);
@@ -296,7 +296,7 @@ TEST_F(SyncCryptographerTest, NigoriEncryptionTypes) {
 }
 
 TEST_F(SyncCryptographerTest, EncryptEverythingExplicit) {
-  ModelTypeSet real_types = ModelTypeSet::All();
+  ModelTypeSet encryptable_types = syncer::EncryptableTypes();
   sync_pb::NigoriSpecifics specifics;
   specifics.set_encrypt_everything(true);
 
@@ -305,11 +305,11 @@ TEST_F(SyncCryptographerTest, EncryptEverythingExplicit) {
 
   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()));
@@ -321,7 +321,7 @@ TEST_F(SyncCryptographerTest, EncryptEverythingExplicit) {
 
   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()));
   }
@@ -333,7 +333,7 @@ TEST_F(SyncCryptographerTest, EncryptEverythingExplicit) {
 }
 
 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
 
@@ -342,11 +342,11 @@ TEST_F(SyncCryptographerTest, EncryptEverythingImplicit) {
 
   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()));
@@ -358,7 +358,7 @@ TEST_F(SyncCryptographerTest, EncryptEverythingImplicit) {
 
   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()));
   }