remove TpmAttestationRegisterKey APIs

Now we are using AttestationClient directly instead of passing through
CryptohomeClient.

BUG=b:158955123
TEST=build ok.

Change-Id: I02646e7e9b7428a5f9ad41a07e80ef00ca5ef2e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505394
Commit-Queue: Leo Lai <cylai@google.com>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823187}

chromeos/cryptohome/async_method_caller.cc

@@ -82,19 +82,6 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller,
             "Couldn't initiate async attestation finish cert request."));
   }
 
-  void TpmAttestationRegisterKey(
-      chromeos::attestation::AttestationKeyType key_type,
-      const Identification& cryptohome_id,
-      const std::string& key_name,
-      Callback callback) override {
-    CryptohomeClient::Get()->TpmAttestationRegisterKey(
-        key_type, CreateAccountIdentifierFromIdentification(cryptohome_id),
-        key_name,
-        base::BindOnce(&AsyncMethodCallerImpl::RegisterAsyncCallback,
-                       weak_ptr_factory_.GetWeakPtr(), std::move(callback),
-                       "Couldn't initiate async attestation register key."));
-  }
-
   void TpmAttestationSignEnterpriseChallenge(
       chromeos::attestation::AttestationKeyType key_type,
       const Identification& cryptohome_id,

chromeos/cryptohome/async_method_caller.h

@@ -78,16 +78,6 @@ class COMPONENT_EXPORT(CHROMEOS_CRYPTOHOME) AsyncMethodCaller {
       const std::string& key_name,
       DataCallback callback) = 0;
 
-  // Asks cryptohomed to asynchronously register the attestation key specified
-  // by |key_type| and |key_name|.  If |key_type| is KEY_USER, a |user_id| must
-  // be provided.  Otherwise |user_id| is ignored.  For normal GAIA users the
-  // |user_id| is an AccountId-derived string (see AccountId::GetAccountIdKey).
-  virtual void TpmAttestationRegisterKey(
-      chromeos::attestation::AttestationKeyType key_type,
-      const Identification& user_id,
-      const std::string& key_name,
-      Callback callback) = 0;
-
   // Asks cryptohomed to asynchronously sign an enterprise challenge with the
   // key specified by |key_type| and |key_name|.  The |domain| and |device_id|
   // parameters will be included in the challenge response.  |challenge| must be

chromeos/cryptohome/mock_async_method_caller.cc

@@ -45,9 +45,6 @@ void MockAsyncMethodCaller::SetUp(bool success, MountError return_code) {
           TpmAttestationSignEnterpriseChallenge(_, _, _, _, _, _, _, _, _))
       .WillByDefault(WithArgs<8>(
           Invoke(this, &MockAsyncMethodCaller::FakeEnterpriseChallenge)));
-  ON_CALL(*this, TpmAttestationRegisterKey(_, _, _, _))
-      .WillByDefault(
-          WithArgs<3>(Invoke(this, &MockAsyncMethodCaller::DoCallback)));
 }
 
 void MockAsyncMethodCaller::DoCallback(Callback callback) {

chromeos/cryptohome/mock_async_method_caller.h

@@ -48,11 +48,6 @@ class MockAsyncMethodCaller : public AsyncMethodCaller {
                     const Identification& user_id,
                     const std::string& key_name,
                     DataCallback callback));
-  MOCK_METHOD4(TpmAttestationRegisterKey,
-               void(chromeos::attestation::AttestationKeyType key_type,
-                    const Identification& user_id,
-                    const std::string& key_name,
-                    Callback callback));
   MOCK_METHOD9(TpmAttestationSignEnterpriseChallenge,
                void(chromeos::attestation::AttestationKeyType key_type,
                     const Identification& user_id,

chromeos/dbus/cryptohome/cryptohome_client.cc

@@ -615,25 +615,6 @@ class CryptohomeClientImpl : public CryptohomeClient {
                        weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
   }
 
-  // CryptohomeClient override.
-  void TpmAttestationRegisterKey(attestation::AttestationKeyType key_type,
-                                 const cryptohome::AccountIdentifier& id,
-                                 const std::string& key_name,
-                                 AsyncMethodCallback callback) override {
-    dbus::MethodCall method_call(
-        cryptohome::kCryptohomeInterface,
-        cryptohome::kCryptohomeTpmAttestationRegisterKey);
-    dbus::MessageWriter writer(&method_call);
-    bool is_user_specific = (key_type == attestation::KEY_USER);
-    writer.AppendBool(is_user_specific);
-    writer.AppendString(id.account_id());
-    writer.AppendString(key_name);
-    proxy_->CallMethod(
-        &method_call, kTpmDBusTimeoutMs,
-        base::BindOnce(&CryptohomeClientImpl::OnAsyncMethodCall,
-                       weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
-  }
-
   // CryptohomeClient override.
   void TpmAttestationSignEnterpriseChallenge(
       attestation::AttestationKeyType key_type,

chromeos/dbus/cryptohome/cryptohome_client.h

@@ -398,18 +398,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) CryptohomeClient {
       const std::string& key_name,
       DBusMethodCallback<TpmAttestationDataResult> callback) = 0;
 
-  // Asynchronously registers an attestation key with the current user's
-  // PKCS #11 token.  The |callback| will be called when the dbus call
-  // completes.  When the operation completes, the AsyncCallStatusHandler signal
-  // handler is called.  |key_type| and |key_name| specify the key to register.
-  // If |key_type| is KEY_USER, a |id| must be provided.  Otherwise |id| is
-  // ignored.
-  virtual void TpmAttestationRegisterKey(
-      attestation::AttestationKeyType key_type,
-      const cryptohome::AccountIdentifier& id,
-      const std::string& key_name,
-      AsyncMethodCallback callback) = 0;
-
   // Asynchronously signs an enterprise challenge with the key specified by
   // |key_type| and |key_name|.  |domain| and |device_id| will be included in
   // the challenge response.  |options| control how the challenge response is

chromeos/dbus/cryptohome/fake_cryptohome_client.cc

@@ -425,14 +425,6 @@ void FakeCryptohomeClient::TpmAttestationGetPublicKey(
       base::BindOnce(std::move(callback), tpm_attestation_public_key_));
 }
 
-void FakeCryptohomeClient::TpmAttestationRegisterKey(
-    attestation::AttestationKeyType key_type,
-    const cryptohome::AccountIdentifier& cryptohome_id,
-    const std::string& key_name,
-    AsyncMethodCallback callback) {
-  ReturnAsyncMethodResult(std::move(callback));
-}
-
 void FakeCryptohomeClient::TpmAttestationSignEnterpriseChallenge(
     attestation::AttestationKeyType key_type,
     const cryptohome::AccountIdentifier& cryptohome_id,

chromeos/dbus/cryptohome/fake_cryptohome_client.h

@@ -132,11 +132,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
       const cryptohome::AccountIdentifier& cryptohome_id,
       const std::string& key_name,
       DBusMethodCallback<TpmAttestationDataResult> callback) override;
-  void TpmAttestationRegisterKey(
-      attestation::AttestationKeyType key_type,
-      const cryptohome::AccountIdentifier& cryptohome_id,
-      const std::string& key_name,
-      AsyncMethodCallback callback) override;
   void TpmAttestationSignEnterpriseChallenge(
       attestation::AttestationKeyType key_type,
       const cryptohome::AccountIdentifier& cryptohome_id,