sync: Introduce control data types

sync/internal_api/sync_encryption_handler_impl_unittest.cc

Index: sync/internal_api/sync_encryption_handler_impl_unittest.cc
diff --git a/sync/internal_api/sync_encryption_handler_impl_unittest.cc b/sync/internal_api/sync_encryption_handler_impl_unittest.cc
index c6ea24f8e3c9dffe27d7fd604fbe27ca0c186c3d..6dfa265b021d06d3117e7ac731430e3ce3345c50 100644
--- a/sync/internal_api/sync_encryption_handler_impl_unittest.cc
+++ b/sync/internal_api/sync_encryption_handler_impl_unittest.cc
@@ -153,13 +153,13 @@ TEST_F(SyncEncryptionHandlerImplTest, NigoriEncryptionTypes) {
 
   EXPECT_CALL(*observer(),
               OnEncryptedTypesChanged(
-                  HasModelTypes(ModelTypeSet::All()), false));
+                  HasModelTypes(UserTypes()), false));
   EXPECT_CALL(observer2,
               OnEncryptedTypesChanged(
-                  HasModelTypes(ModelTypeSet::All()), false));
+                  HasModelTypes(UserTypes()), false));
 
   // Set all encrypted types
-  encrypted_types = ModelTypeSet::All();
+  encrypted_types = UserTypes();
   {
     WriteTransaction trans(FROM_HERE, user_share());
     encryption_handler()->MergeEncryptedTypes(
@@ -190,24 +190,17 @@ TEST_F(SyncEncryptionHandlerImplTest, NigoriEncryptionTypes) {
 // Verify the encryption handler processes the encrypt everything field
 // properly.
 TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingExplicit) {
-  ModelTypeSet real_types = ModelTypeSet::All();
   sync_pb::NigoriSpecifics nigori;
   nigori.set_encrypt_everything(true);
 
   EXPECT_CALL(*observer(),
               OnEncryptedTypesChanged(
-                  HasModelTypes(ModelTypeSet::All()), true));
+                  HasModelTypes(UserTypes()), true));
 
   EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());
   ModelTypeSet encrypted_types =
       encryption_handler()->GetEncryptedTypesUnsafe();
-  for (ModelTypeSet::Iterator iter = real_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()));
-  }
+  EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(PASSWORDS)));
 
   {
     WriteTransaction trans(FROM_HERE, user_share());
@@ -218,10 +211,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingExplicit) {
 
   EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled());
   encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe();
-  for (ModelTypeSet::Iterator iter = real_types.First();
-       iter.Good(); iter.Inc()) {
-    EXPECT_TRUE(encrypted_types.Has(iter.Get()));
-  }
+  EXPECT_TRUE(encrypted_types.HasAll(UserTypes()));
 
   // Receiving the nigori node again shouldn't trigger another notification.
   Mock::VerifyAndClearExpectations(observer());
@@ -236,24 +226,17 @@ TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingExplicit) {
 // Verify the encryption handler can detect an implicit encrypt everything state
 // (from clients that failed to write the encrypt everything field).
 TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingImplicit) {
-  ModelTypeSet real_types = ModelTypeSet::All();
   sync_pb::NigoriSpecifics nigori;
   nigori.set_encrypt_bookmarks(true);  // Non-passwords = encrypt everything
 
   EXPECT_CALL(*observer(),
               OnEncryptedTypesChanged(
-                  HasModelTypes(ModelTypeSet::All()), true));
+                  HasModelTypes(UserTypes()), true));
 
   EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());
   ModelTypeSet encrypted_types =
       encryption_handler()->GetEncryptedTypesUnsafe();
-  for (ModelTypeSet::Iterator iter = real_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()));
-  }
+  EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(PASSWORDS)));
 
   {
     WriteTransaction trans(FROM_HERE, user_share());
@@ -264,10 +247,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingImplicit) {
 
   EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled());
   encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe();
-  for (ModelTypeSet::Iterator iter = real_types.First();
-       iter.Good(); iter.Inc()) {
-    EXPECT_TRUE(encrypted_types.Has(iter.Get()));
-  }
+  EXPECT_TRUE(encrypted_types.HasAll(UserTypes()));
 
   // Receiving a nigori node with encrypt everything explicitly set shouldn't
   // trigger another notification.
@@ -285,7 +265,6 @@ TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingImplicit) {
 // as Sensitive, and that it does not consider this an implicit encrypt
 // everything case.
 TEST_F(SyncEncryptionHandlerImplTest, UnknownSensitiveTypes) {
-  ModelTypeSet real_types = ModelTypeSet::All();
   sync_pb::NigoriSpecifics nigori;
   nigori.set_encrypt_everything(false);
   nigori.set_encrypt_bookmarks(true);
@@ -301,13 +280,7 @@ TEST_F(SyncEncryptionHandlerImplTest, UnknownSensitiveTypes) {
   EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());
   ModelTypeSet encrypted_types =
       encryption_handler()->GetEncryptedTypesUnsafe();
-  for (ModelTypeSet::Iterator iter = real_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()));
-  }
+  EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(PASSWORDS)));
 
   {
     WriteTransaction trans(FROM_HERE, user_share());
@@ -318,15 +291,7 @@ TEST_F(SyncEncryptionHandlerImplTest, UnknownSensitiveTypes) {
 
   EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled());
   encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe();
-  for (ModelTypeSet::Iterator iter = real_types.First();
-       iter.Good(); iter.Inc()) {
-    if (iter.Get() == PASSWORDS ||
-        iter.Get() == NIGORI ||
-        iter.Get() == BOOKMARKS)
-      EXPECT_TRUE(encrypted_types.Has(iter.Get()));
-    else
-      EXPECT_FALSE(encrypted_types.Has(iter.Get()));
-  }
+  EXPECT_TRUE(encrypted_types.Equals(ModelTypeSet(BOOKMARKS, PASSWORDS)));
 }
 
 // Receive an old nigori with old encryption keys and encrypted types. We should
@@ -346,7 +311,7 @@ TEST_F(SyncEncryptionHandlerImplTest, ReceiveOldNigori) {
       other_encrypted_specifics.mutable_encrypted());
   sync_pb::EntitySpecifics our_encrypted_specifics;
   our_encrypted_specifics.mutable_bookmark()->set_title("title2");
-  ModelTypeSet encrypted_types = ModelTypeSet::All();
+  ModelTypeSet encrypted_types = UserTypes();
 
   // Set up the current encryption state (containing both keys and encrypt
   // everything).
@@ -362,7 +327,7 @@ TEST_F(SyncEncryptionHandlerImplTest, ReceiveOldNigori) {
 
   EXPECT_CALL(*observer(), OnCryptographerStateChanged(_));
   EXPECT_CALL(*observer(), OnEncryptedTypesChanged(
-      HasModelTypes(ModelTypeSet::All()), true));
+      HasModelTypes(UserTypes()), true));
   {
     // Update the encryption handler.
     WriteTransaction trans(FROM_HERE, user_share());