[Sync] Add history delete directive type

sync/syncable/nigori_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/syncable/nigori_util.h"
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 257 matching lines @@
   nigori->set_encrypt_extensions(
       encrypted_types.Has(EXTENSIONS));
   nigori->set_encrypt_search_engines(
       encrypted_types.Has(SEARCH_ENGINES));
   nigori->set_encrypt_sessions(encrypted_types.Has(SESSIONS));
   nigori->set_encrypt_app_settings(
       encrypted_types.Has(APP_SETTINGS));
   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(
     const sync_pb::NigoriSpecifics& nigori) {
   if (nigori.encrypt_everything())
     return ModelTypeSet::All();
 
   ModelTypeSet encrypted_types;
   COMPILE_ASSERT(17, MODEL_TYPE_COUNT);
   if (nigori.encrypt_bookmarks())
@@ skipping 15 matching lines @@
   if (nigori.encrypt_search_engines())
     encrypted_types.Put(SEARCH_ENGINES);
   if (nigori.encrypt_sessions())
     encrypted_types.Put(SESSIONS);
   if (nigori.encrypt_app_settings())
     encrypted_types.Put(APP_SETTINGS);
   if (nigori.encrypt_apps())
     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;
 }
 
 }  // namespace syncable
 }  // namespace syncer