[DeviceSync v2] Move trivial Fake.*Factory to fake-class file

Bug: 951969
Change-Id: Ia186a0c0f7a0785220ecc7641cfcbfafd455ee19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1671050
Auto-Submit: Josh Nohle <nohle@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Josh Nohle <nohle@chromium.org>
Cr-Commit-Position: refs/heads/master@{#671389}

chromeos/services/device_sync/cryptauth_v2_enroller_impl_unittest.cc

@@ -114,28 +114,6 @@ const CryptAuthKey kClientEphemeralDh(kClientDhPublicKey,
                                       CryptAuthKey::Status::kActive,
                                       KeyType::P256);
 
-class FakeCryptAuthKeyCreatorFactory : public CryptAuthKeyCreatorImpl::Factory {
- public:
-  FakeCryptAuthKeyCreatorFactory() = default;
-
-  ~FakeCryptAuthKeyCreatorFactory() override = default;
-
-  FakeCryptAuthKeyCreator* instance() { return instance_; }
-
- private:
-  // CryptAuthKeyCreatorImpl::Factory:
-  std::unique_ptr<CryptAuthKeyCreator> BuildInstance() override {
-    auto instance = std::make_unique<FakeCryptAuthKeyCreator>();
-    instance_ = instance.get();
-
-    return instance;
-  }
-
-  FakeCryptAuthKeyCreator* instance_ = nullptr;
-
-  DISALLOW_COPY_AND_ASSIGN(FakeCryptAuthKeyCreatorFactory);
-};
-
 class FakeCryptAuthKeyProofComputerFactory
     : public CryptAuthKeyProofComputerImpl::Factory {
  public:

chromeos/services/device_sync/fake_cryptauth_ecies_encryptor.cc

@@ -4,8 +4,6 @@
 
 #include "chromeos/services/device_sync/fake_cryptauth_ecies_encryptor.h"
 
-#include <utility>
-
 namespace chromeos {
 
 namespace device_sync {
@@ -30,6 +28,20 @@ void FakeCryptAuthEciesEncryptor::FinishAttempt(
   OnAttemptFinished(id_to_output_map);
 }
 
+FakeCryptAuthEciesEncryptorFactory::FakeCryptAuthEciesEncryptorFactory() =
+    default;
+
+FakeCryptAuthEciesEncryptorFactory::~FakeCryptAuthEciesEncryptorFactory() =
+    default;
+
+std::unique_ptr<CryptAuthEciesEncryptor>
+FakeCryptAuthEciesEncryptorFactory::BuildInstance() {
+  auto instance = std::make_unique<FakeCryptAuthEciesEncryptor>();
+  instance_ = instance.get();
+
+  return instance;
+}
+
 }  // namespace device_sync
 
 }  // namespace chromeos

chromeos/services/device_sync/fake_cryptauth_ecies_encryptor.h

@@ -5,17 +5,18 @@
 #ifndef CHROMEOS_SERVICES_DEVICE_SYNC_FAKE_CRYPTAUTH_ECIES_ENCRYPTOR_H_
 #define CHROMEOS_SERVICES_DEVICE_SYNC_FAKE_CRYPTAUTH_ECIES_ENCRYPTOR_H_
 
-#include <string>
+#include <memory>
 
 #include "base/macros.h"
 #include "base/optional.h"
 #include "chromeos/services/device_sync/cryptauth_ecies_encryptor.h"
+#include "chromeos/services/device_sync/cryptauth_ecies_encryptor_impl.h"
 
 namespace chromeos {
 
 namespace device_sync {
 
-class FakeCryptAuthEciesEncryptor : CryptAuthEciesEncryptor {
+class FakeCryptAuthEciesEncryptor : public CryptAuthEciesEncryptor {
  public:
   enum class Action { kUndefined, kEncryption, kDecryption };
 
@@ -37,6 +38,23 @@ class FakeCryptAuthEciesEncryptor : CryptAuthEciesEncryptor {
   DISALLOW_COPY_AND_ASSIGN(FakeCryptAuthEciesEncryptor);
 };
 
+class FakeCryptAuthEciesEncryptorFactory
+    : public CryptAuthEciesEncryptorImpl::Factory {
+ public:
+  FakeCryptAuthEciesEncryptorFactory();
+  ~FakeCryptAuthEciesEncryptorFactory() override;
+
+  FakeCryptAuthEciesEncryptor* instance() { return instance_; }
+
+ private:
+  // CryptAuthEciesEncryptorImpl::Factory:
+  std::unique_ptr<CryptAuthEciesEncryptor> BuildInstance() override;
+
+  FakeCryptAuthEciesEncryptor* instance_ = nullptr;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeCryptAuthEciesEncryptorFactory);
+};
+
 }  // namespace device_sync
 
 }  // namespace chromeos

chromeos/services/device_sync/fake_cryptauth_key_creator.cc

@@ -26,6 +26,18 @@ void FakeCryptAuthKeyCreator::CreateKeys(
   create_keys_callback_ = std::move(create_keys_callback);
 }
 
+FakeCryptAuthKeyCreatorFactory::FakeCryptAuthKeyCreatorFactory() = default;
+
+FakeCryptAuthKeyCreatorFactory::~FakeCryptAuthKeyCreatorFactory() = default;
+
+std::unique_ptr<CryptAuthKeyCreator>
+FakeCryptAuthKeyCreatorFactory::BuildInstance() {
+  auto instance = std::make_unique<FakeCryptAuthKeyCreator>();
+  instance_ = instance.get();
+
+  return instance;
+}
+
 }  // namespace device_sync
 
 }  // namespace chromeos

chromeos/services/device_sync/fake_cryptauth_key_creator.h

@@ -11,6 +11,7 @@
 #include "chromeos/services/device_sync/cryptauth_key.h"
 #include "chromeos/services/device_sync/cryptauth_key_bundle.h"
 #include "chromeos/services/device_sync/cryptauth_key_creator.h"
+#include "chromeos/services/device_sync/cryptauth_key_creator_impl.h"
 
 namespace chromeos {
 
@@ -46,6 +47,22 @@ class FakeCryptAuthKeyCreator : public CryptAuthKeyCreator {
   DISALLOW_COPY_AND_ASSIGN(FakeCryptAuthKeyCreator);
 };
 
+class FakeCryptAuthKeyCreatorFactory : public CryptAuthKeyCreatorImpl::Factory {
+ public:
+  FakeCryptAuthKeyCreatorFactory();
+  ~FakeCryptAuthKeyCreatorFactory() override;
+
+  FakeCryptAuthKeyCreator* instance() { return instance_; }
+
+ private:
+  // CryptAuthKeyCreatorImpl::Factory:
+  std::unique_ptr<CryptAuthKeyCreator> BuildInstance() override;
+
+  FakeCryptAuthKeyCreator* instance_ = nullptr;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeCryptAuthKeyCreatorFactory);
+};
+
 }  // namespace device_sync
 
 }  // namespace chromeos