[Sync] Add history delete directive type

Add new HISTORY_DELETE_DIRECTIVE model type.  Update everything that
depends on model type.

Rename SyncCryptographer test to Cryptographer (since it's already in sync_unit_tests).

Add EncryptableUserTypes() function and use that instead of UserTypes() for
encryption-related stuff.

BUG=141245
TBR=jam@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10855037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162323 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc
index c33951e..22f5028 100644
--- a/sync/internal_api/sync_encryption_handler_impl.cc
+++ b/sync/internal_api/sync_encryption_handler_impl.cc
@@ -97,7 +97,7 @@ EnumPassphraseTypeToProto(PassphraseType type) {
       return sync_pb::NigoriSpecifics::FROZEN_IMPLICIT_PASSPHRASE;
     default:
       NOTREACHED();
-      return sync_pb::NigoriSpecifics::IMPLICIT_PASSPHRASE;;
+      return sync_pb::NigoriSpecifics::IMPLICIT_PASSPHRASE;
   };
 }
 
@@ -894,10 +894,10 @@ bool SyncEncryptionHandlerImpl::UpdateEncryptedTypesFromNigori(
   ModelTypeSet* encrypted_types = &UnlockVaultMutable(trans)->encrypted_types;
   if (nigori.encrypt_everything()) {
     EnableEncryptEverythingImpl(trans);
-    DCHECK(encrypted_types->Equals(UserTypes()));
+    DCHECK(encrypted_types->Equals(EncryptableUserTypes()));
     return true;
   } else if (encrypt_everything_) {
-    DCHECK(encrypted_types->Equals(UserTypes()));
+    DCHECK(encrypted_types->Equals(EncryptableUserTypes()));
     return false;
   }
 
@@ -912,12 +912,12 @@ bool SyncEncryptionHandlerImpl::UpdateEncryptedTypesFromNigori(
       !Difference(nigori_encrypted_types, SensitiveTypes()).Empty()) {
     if (!encrypt_everything_) {
       encrypt_everything_ = true;
-      *encrypted_types = UserTypes();
+      *encrypted_types = EncryptableUserTypes();
       FOR_EACH_OBSERVER(
           Observer, observers_,
           OnEncryptedTypesChanged(*encrypted_types, encrypt_everything_));
     }
-    DCHECK(encrypted_types->Equals(UserTypes()));
+    DCHECK(encrypted_types->Equals(EncryptableUserTypes()));
     return false;
   }
 
@@ -1094,7 +1094,7 @@ void SyncEncryptionHandlerImpl::MergeEncryptedTypes(
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Only UserTypes may be encrypted.
-  DCHECK(UserTypes().HasAll(new_encrypted_types));
+  DCHECK(EncryptableUserTypes().HasAll(new_encrypted_types));
 
   ModelTypeSet* encrypted_types = &UnlockVaultMutable(trans)->encrypted_types;
   if (!encrypted_types->HasAll(new_encrypted_types)) {
@@ -1289,11 +1289,11 @@ void SyncEncryptionHandlerImpl::EnableEncryptEverythingImpl(
     syncable::BaseTransaction* const trans) {
   ModelTypeSet* encrypted_types = &UnlockVaultMutable(trans)->encrypted_types;
   if (encrypt_everything_) {
-    DCHECK(encrypted_types->Equals(UserTypes()));
+    DCHECK(encrypted_types->Equals(EncryptableUserTypes()));
     return;
   }
   encrypt_everything_ = true;
-  *encrypted_types = UserTypes();
+  *encrypted_types = EncryptableUserTypes();
   FOR_EACH_OBSERVER(
       Observer, observers_,
       OnEncryptedTypesChanged(*encrypted_types, encrypt_everything_));