[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..1578badbc7fb56bffb7671475a8bbd2b5685e557 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);

[tim (not reviewing), 2013/01/18 20:56:33]

Where did this come from?

[Nicolas Zea, 2013/01/19 00:03:13]

Oh, this is just a cleanup that I noticed while making sure things were working.
History delete directives are already not a part of EncryptableUserTypes.

 
   EXPECT_CALL(*observer(),
               OnEncryptedTypesChanged(