Remove DirectoryCryptographer usages in USS tests

DirectoryCryptographer is subject to remove and its usages should be
replaced with CryptographerImpl or removed. This CL does it for all
remaining USS tests.

Bug: 1083924
Change-Id: Iedd4f6c039407cce0dfb502a4070ac42f4336c80
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2226753
Commit-Queue: Maksim Moskvitin <mmoskvitin@google.com>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774562}

components/sync/engine_impl/js_sync_encryption_handler_observer_unittest.cc

@@ -17,7 +17,7 @@
 #include "components/sync/engine/sync_string_conversions.h"
 #include "components/sync/js/js_event_details.h"
 #include "components/sync/js/js_test_util.h"
-#include "components/sync/syncable/directory_cryptographer.h"
+#include "components/sync/nigori/cryptographer_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
@@ -134,9 +134,10 @@ TEST_F(JsSyncEncryptionHandlerObserverTest, OnCryptographerStateChanged) {
               HandleJsEvent("onCryptographerStateChanged",
                             HasDetailsAsDictionary(expected_details)));
 
-  DirectoryCryptographer cryptographer;
+  std::unique_ptr<CryptographerImpl> cryptographer =
+      CryptographerImpl::CreateEmpty();
   js_sync_encryption_handler_observer_.OnCryptographerStateChanged(
-      &cryptographer, /*has_pending_keys=*/false);
+      cryptographer.get(), /*has_pending_keys=*/false);
   PumpLoop();
 }
 

components/sync/engine_impl/non_blocking_type_commit_contribution_unittest.cc

@@ -15,7 +15,7 @@
 #include "components/sync/base/client_tag_hash.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/unique_position.h"
-#include "components/sync/syncable/directory_cryptographer.h"
+#include "components/sync/nigori/cryptographer_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
@@ -169,16 +169,17 @@ TEST(NonBlockingTypeCommitContributionTest,
   base::ObserverList<TypeDebugInfoObserver>::Unchecked observers;
   DataTypeDebugInfoEmitter debug_info_emitter(PASSWORDS, &observers);
 
-  DirectoryCryptographer cryptographer;
-  cryptographer.AddKey({KeyDerivationParams::CreateForPbkdf2(), "dummy"});
+  std::unique_ptr<CryptographerImpl> cryptographer =
+      CryptographerImpl::FromSingleKeyForTesting("dummy");
 
   CommitRequestDataList requests_data;
   requests_data.push_back(std::move(request_data));
   NonBlockingTypeCommitContribution contribution(
       PASSWORDS, sync_pb::DataTypeContext(), std::move(requests_data),
       /*on_commit_response_callback=*/base::NullCallback(),
-      /*on_full_commit_failure_callback=*/base::NullCallback(), &cryptographer,
-      PassphraseType::kImplicitPassphrase, &debug_info_emitter,
+      /*on_full_commit_failure_callback=*/base::NullCallback(),
+      cryptographer.get(), PassphraseType::kImplicitPassphrase,
+      &debug_info_emitter,
       /*only_commit_specifics=*/false);
 
   sync_pb::ClientToServerMessage msg;
@@ -235,16 +236,17 @@ TEST(NonBlockingTypeCommitContributionTest,
   base::ObserverList<TypeDebugInfoObserver>::Unchecked observers;
   DataTypeDebugInfoEmitter debug_info_emitter(PASSWORDS, &observers);
 
-  DirectoryCryptographer cryptographer;
-  cryptographer.AddKey({KeyDerivationParams::CreateForPbkdf2(), "dummy"});
+  std::unique_ptr<CryptographerImpl> cryptographer =
+      CryptographerImpl::FromSingleKeyForTesting("dummy");
 
   CommitRequestDataList requests_data;
   requests_data.push_back(std::move(request_data));
   NonBlockingTypeCommitContribution contribution(
       PASSWORDS, sync_pb::DataTypeContext(), std::move(requests_data),
       /*on_commit_response_callback=*/base::NullCallback(),
-      /*on_full_commit_failure_callback=*/base::NullCallback(), &cryptographer,
-      PassphraseType::kCustomPassphrase, &debug_info_emitter,
+      /*on_full_commit_failure_callback=*/base::NullCallback(),
+      cryptographer.get(), PassphraseType::kCustomPassphrase,
+      &debug_info_emitter,
       /*only_commit_specifics=*/false);
 
   sync_pb::ClientToServerMessage msg;
@@ -281,7 +283,8 @@ TEST(NonBlockingTypeCommitContributionTest,
   base::ObserverList<TypeDebugInfoObserver>::Unchecked observers;
   DataTypeDebugInfoEmitter debug_info_emitter(PASSWORDS, &observers);
 
-  DirectoryCryptographer cryptographer;
+  std::unique_ptr<CryptographerImpl> cryptographer =
+      CryptographerImpl::CreateEmpty();
 
   FailedCommitResponseDataList actual_error_response_list;
 
@@ -298,8 +301,9 @@ TEST(NonBlockingTypeCommitContributionTest,
   NonBlockingTypeCommitContribution contribution(
       PASSWORDS, sync_pb::DataTypeContext(), std::move(requests_data),
       std::move(on_commit_response_callback),
-      /*on_full_commit_failure_callback=*/base::NullCallback(), &cryptographer,
-      PassphraseType::kCustomPassphrase, &debug_info_emitter,
+      /*on_full_commit_failure_callback=*/base::NullCallback(),
+      cryptographer.get(), PassphraseType::kCustomPassphrase,
+      &debug_info_emitter,
       /*only_commit_specifics=*/false);
 
   sync_pb::ClientToServerMessage msg;
@@ -333,19 +337,18 @@ TEST(NonBlockingTypeCommitContributionTest,
 }
 
 TEST(NonBlockingTypeCommitContributionTest, ShouldPropagateFullCommitFailure) {
-  DirectoryCryptographer cryptographer;
   base::ObserverList<TypeDebugInfoObserver>::Unchecked observers;
-  DataTypeDebugInfoEmitter debug_info_emitter(PASSWORDS, &observers);
+  DataTypeDebugInfoEmitter debug_info_emitter(BOOKMARKS, &observers);
 
   base::MockOnceCallback<void(SyncCommitError commit_error)>
       on_commit_failure_callback;
   EXPECT_CALL(on_commit_failure_callback, Run(SyncCommitError::kNetworkError));
 
   NonBlockingTypeCommitContribution contribution(
-      PASSWORDS, sync_pb::DataTypeContext(), CommitRequestDataList(),
+      BOOKMARKS, sync_pb::DataTypeContext(), CommitRequestDataList(),
       /*on_commit_response_callback=*/base::NullCallback(),
-      on_commit_failure_callback.Get(), &cryptographer,
-      PassphraseType::kCustomPassphrase, &debug_info_emitter,
+      on_commit_failure_callback.Get(), /*cryptographer=*/nullptr,
+      PassphraseType::kKeystorePassphrase, &debug_info_emitter,
       /*only_commit_specifics=*/false);
 
   contribution.ProcessCommitFailure(SyncCommitError::kNetworkError);

components/sync/syncable/nigori_handler_proxy.cc

@@ -5,7 +5,7 @@
 #include "components/sync/syncable/nigori_handler_proxy.h"
 
 #include "components/sync/base/model_type.h"
-#include "components/sync/syncable/directory_cryptographer.h"
+#include "components/sync/nigori/cryptographer_impl.h"
 #include "components/sync/syncable/syncable_base_transaction.h"
 #include "components/sync/syncable/user_share.h"
 #include "components/sync/syncable/write_transaction.h"
@@ -16,7 +16,7 @@ namespace syncable {
 
 NigoriHandlerProxy::NigoriHandlerProxy(UserShare* user_share)
     : user_share_(user_share),
-      cryptographer_(std::make_unique<DirectoryCryptographer>()),
+      cryptographer_(CryptographerImpl::CreateEmpty()),
       encrypted_types_(AlwaysEncryptedUserTypes()),
       passphrase_type_(SyncEncryptionHandler::kInitialPassphraseType) {
   DCHECK(user_share);