[Sync] Add history delete directive type

sync/util/cryptographer_unittest.cc

Index: sync/util/cryptographer_unittest.cc
diff --git a/sync/util/cryptographer_unittest.cc b/sync/util/cryptographer_unittest.cc
index 01190e9865fa1c200a83ac1016be32f670551e66..bab412e7a5c13158e8286924d60bcc4ec12d92c7 100644
--- a/sync/util/cryptographer_unittest.cc
+++ b/sync/util/cryptographer_unittest.cc
@@ -30,15 +30,15 @@ class MockObserver : public Cryptographer::Observer {
 
 }  // namespace
 
-class SyncCryptographerTest : public ::testing::Test {
+class CryptographerTest : public ::testing::Test {
  protected:
-  SyncCryptographerTest() : cryptographer_(&encryptor_) {}
+  CryptographerTest() : cryptographer_(&encryptor_) {}
 
   FakeEncryptor encryptor_;
   Cryptographer cryptographer_;
 };
 
-TEST_F(SyncCryptographerTest, EmptyCantDecrypt) {
+TEST_F(CryptographerTest, EmptyCantDecrypt) {
   EXPECT_FALSE(cryptographer_.is_ready());
 
   sync_pb::EncryptedData encrypted;
@@ -48,7 +48,7 @@ TEST_F(SyncCryptographerTest, EmptyCantDecrypt) {
   EXPECT_FALSE(cryptographer_.CanDecrypt(encrypted));
 }
 
-TEST_F(SyncCryptographerTest, EmptyCantEncrypt) {
+TEST_F(CryptographerTest, EmptyCantEncrypt) {
   EXPECT_FALSE(cryptographer_.is_ready());
 
   sync_pb::EncryptedData encrypted;
@@ -56,7 +56,7 @@ TEST_F(SyncCryptographerTest, EmptyCantEncrypt) {
   EXPECT_FALSE(cryptographer_.Encrypt(original, &encrypted));
 }
 
-TEST_F(SyncCryptographerTest, MissingCantDecrypt) {
+TEST_F(CryptographerTest, MissingCantDecrypt) {
   KeyParams params = {"localhost", "dummy", "dummy"};
   cryptographer_.AddKey(params);
   EXPECT_TRUE(cryptographer_.is_ready());
@@ -68,7 +68,7 @@ TEST_F(SyncCryptographerTest, MissingCantDecrypt) {
   EXPECT_FALSE(cryptographer_.CanDecrypt(encrypted));
 }
 
-TEST_F(SyncCryptographerTest, CanEncryptAndDecrypt) {
+TEST_F(CryptographerTest, CanEncryptAndDecrypt) {
   KeyParams params = {"localhost", "dummy", "dummy"};
   EXPECT_TRUE(cryptographer_.AddKey(params));
   EXPECT_TRUE(cryptographer_.is_ready());
@@ -87,7 +87,7 @@ TEST_F(SyncCryptographerTest, CanEncryptAndDecrypt) {
   EXPECT_EQ(original.SerializeAsString(), decrypted.SerializeAsString());
 }
 
-TEST_F(SyncCryptographerTest, EncryptOnlyIfDifferent) {
+TEST_F(CryptographerTest, EncryptOnlyIfDifferent) {
   KeyParams params = {"localhost", "dummy", "dummy"};
   EXPECT_TRUE(cryptographer_.AddKey(params));
   EXPECT_TRUE(cryptographer_.is_ready());
@@ -118,7 +118,7 @@ TEST_F(SyncCryptographerTest, EncryptOnlyIfDifferent) {
   EXPECT_EQ(original.SerializeAsString(), decrypted.SerializeAsString());
 }
 
-TEST_F(SyncCryptographerTest, AddKeySetsDefault) {
+TEST_F(CryptographerTest, AddKeySetsDefault) {
   KeyParams params1 = {"localhost", "dummy", "dummy1"};
   EXPECT_TRUE(cryptographer_.AddKey(params1));
   EXPECT_TRUE(cryptographer_.is_ready());
@@ -148,7 +148,7 @@ TEST_F(SyncCryptographerTest, AddKeySetsDefault) {
 }
 
 // Ensure setting the keystore key works and doesn't modify the default nigori.
-TEST_F(SyncCryptographerTest, SetKeystore) {
+TEST_F(CryptographerTest, SetKeystore) {
   EXPECT_FALSE(cryptographer_.is_initialized());
   EXPECT_FALSE(cryptographer_.HasKeystoreKey());
 
@@ -166,7 +166,7 @@ TEST_F(SyncCryptographerTest, SetKeystore) {
 #else
 #define MAYBE_EncryptExportDecrypt EncryptExportDecrypt
 #endif
-TEST_F(SyncCryptographerTest, MAYBE_EncryptExportDecrypt) {
+TEST_F(CryptographerTest, MAYBE_EncryptExportDecrypt) {
   sync_pb::EncryptedData nigori;
   sync_pb::EncryptedData encrypted;
 
@@ -211,7 +211,7 @@ TEST_F(SyncCryptographerTest, MAYBE_EncryptExportDecrypt) {
 #else
 #define MAYBE_PackUnpack PackUnpack
 #endif
-TEST_F(SyncCryptographerTest, MAYBE_PackUnpack) {
+TEST_F(CryptographerTest, MAYBE_PackUnpack) {
   Nigori nigori;
   ASSERT_TRUE(nigori.InitByDerivation("example.com", "username", "password"));
   std::string expected_user, expected_encryption, expected_mac;
@@ -235,7 +235,7 @@ TEST_F(SyncCryptographerTest, MAYBE_PackUnpack) {
 
 // Test that bootstrapping the keystore key works and doesn't affect the default
 // nigori.
-TEST_F(SyncCryptographerTest, BootstrapKeystore) {
+TEST_F(CryptographerTest, BootstrapKeystore) {
   std::string token;
   cryptographer_.GetKeystoreKeyBootstrapToken(&token);
   EXPECT_TRUE(token.empty());
@@ -251,7 +251,7 @@ TEST_F(SyncCryptographerTest, BootstrapKeystore) {
   EXPECT_FALSE(cryptographer2.is_initialized());
 }
 
-TEST_F(SyncCryptographerTest, NigoriEncryptionTypes) {
+TEST_F(CryptographerTest, NigoriEncryptionTypes) {
   Cryptographer cryptographer2(&encryptor_);
   sync_pb::NigoriSpecifics nigori;
 
@@ -295,7 +295,7 @@ TEST_F(SyncCryptographerTest, NigoriEncryptionTypes) {
    EXPECT_TRUE(encrypted_types.Equals(cryptographer_.GetEncryptedTypes()));
 }
 
-TEST_F(SyncCryptographerTest, EncryptEverythingExplicit) {
+TEST_F(CryptographerTest, EncryptEverythingExplicit) {
   ModelTypeSet real_types = ModelTypeSet::All();
   sync_pb::NigoriSpecifics specifics;
   specifics.set_encrypt_everything(true);
@@ -332,7 +332,7 @@ TEST_F(SyncCryptographerTest, EncryptEverythingExplicit) {
   cryptographer_.RemoveObserver(&observer);
 }
 
-TEST_F(SyncCryptographerTest, EncryptEverythingImplicit) {
+TEST_F(CryptographerTest, EncryptEverythingImplicit) {
   ModelTypeSet real_types = ModelTypeSet::All();
   sync_pb::NigoriSpecifics specifics;
   specifics.set_encrypt_bookmarks(true);  // Non-passwords = encrypt everything
@@ -369,7 +369,7 @@ TEST_F(SyncCryptographerTest, EncryptEverythingImplicit) {
   cryptographer_.RemoveObserver(&observer);
 }
 
-TEST_F(SyncCryptographerTest, UnknownSensitiveTypes) {
+TEST_F(CryptographerTest, UnknownSensitiveTypes) {
   ModelTypeSet real_types = ModelTypeSet::All();
   sync_pb::NigoriSpecifics specifics;
   // Explicitly setting encrypt everything should override logic for implicit