[Sync] Add history delete directive type

sync/syncable/nigori_util.cc

Index: sync/syncable/nigori_util.cc
diff --git a/sync/syncable/nigori_util.cc b/sync/syncable/nigori_util.cc
index 70cf41bfc5628a0c0934681fc6565a7e13cc9291..658f35c543d36d92614ff134be45c8fdcfa789ed 100644
--- a/sync/syncable/nigori_util.cc
+++ b/sync/syncable/nigori_util.cc
@@ -275,6 +275,8 @@ void UpdateNigoriFromEncryptedTypes(ModelTypeSet encrypted_types,
   nigori->set_encrypt_apps(encrypted_types.Has(APPS));
   nigori->set_encrypt_app_notifications(
       encrypted_types.Has(APP_NOTIFICATIONS));
+  nigori->set_encrypt_history_delete_directives(

[Nicolas Zea, 2012/10/15 19:03:57]

Does it make sense to have these changes? Perhaps just a comment that delete
directives are incompatible with encryption?

+      encrypted_types.Has(HISTORY_DELETE_DIRECTIVES));
 }
 
 ModelTypeSet GetEncryptedTypesFromNigori(
@@ -310,6 +312,8 @@ ModelTypeSet GetEncryptedTypesFromNigori(
     encrypted_types.Put(APPS);
   if (nigori.encrypt_app_notifications())
     encrypted_types.Put(APP_NOTIFICATIONS);
+  if (nigori.encrypt_history_delete_directives())
+    encrypted_types.Put(HISTORY_DELETE_DIRECTIVES);
   return encrypted_types;
 }