[Sync] Add support for proxy 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 a650c1420c0c0f203f7a99bfbf92835fd25645dc..a08de635e280edfe07d983ccbb2d37e9a19d0cd2 100644
--- a/sync/internal_api/sync_encryption_handler_impl_unittest.cc
+++ b/sync/internal_api/sync_encryption_handler_impl_unittest.cc
@@ -371,8 +371,6 @@ TEST_F(SyncEncryptionHandlerImplTest, NigoriEncryptionTypes) {
   Mock::VerifyAndClearExpectations(&observer2);
 
   ModelTypeSet encrypted_user_types = EncryptableUserTypes();
-  // We never encrypt history delete directives.
-  encrypted_user_types.Remove(HISTORY_DELETE_DIRECTIVES);
 
   EXPECT_CALL(*observer(),
               OnEncryptedTypesChanged(
@@ -395,7 +393,7 @@ TEST_F(SyncEncryptionHandlerImplTest, NigoriEncryptionTypes) {
   }
   EXPECT_TRUE(encrypted_types.Equals(
       encryption_handler()->GetEncryptedTypesUnsafe()));
-  //EXPECT_TRUE(encrypted_types.Equals(handler2.GetEncryptedTypesUnsafe()));
+  EXPECT_TRUE(encrypted_types.Equals(handler2.GetEncryptedTypesUnsafe()));
 
   // Receiving an empty nigori should not reset any encrypted types or trigger
   // an observer notification.