Commit e9aa52ab authored by Leo Lai's avatar Leo Lai Committed by Commit Bot

remove stale MockAsyncMethodCaller.

It is just a stale object after migrating to AttestationClient.

BUG=b:158955123
TEST=unit_tests.

Change-Id: Icc572c5594562e45e5adc428309b7363500104f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517234
Commit-Queue: Leo Lai <cylai@google.com>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824290}
parent 1416119e
...@@ -24,8 +24,7 @@ ...@@ -24,8 +24,7 @@
#include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h" #include "chrome/test/base/testing_profile_manager.h"
#include "chromeos/attestation/mock_attestation_flow.h" #include "chromeos/attestation/mock_attestation_flow.h"
#include "chromeos/cryptohome/async_method_caller.h" #include "chromeos/cryptohome/cryptohome_parameters.h"
#include "chromeos/cryptohome/mock_async_method_caller.h"
#include "chromeos/dbus/attestation/fake_attestation_client.h" #include "chromeos/dbus/attestation/fake_attestation_client.h"
#include "chromeos/dbus/attestation/interface.pb.h" #include "chromeos/dbus/attestation/interface.pb.h"
#include "chromeos/dbus/constants/attestation_constants.h" #include "chromeos/dbus/constants/attestation_constants.h"
...@@ -193,7 +192,6 @@ class TpmChallengeKeySubtleTest : public ::testing::Test { ...@@ -193,7 +192,6 @@ class TpmChallengeKeySubtleTest : public ::testing::Test {
base::test::TaskEnvironment::TimeSource::MOCK_TIME}; base::test::TaskEnvironment::TimeSource::MOCK_TIME};
StrictMock<MockableFakeAttestationFlow> mock_attestation_flow_; StrictMock<MockableFakeAttestationFlow> mock_attestation_flow_;
cryptohome::MockAsyncMethodCaller* mock_async_method_caller_ = nullptr;
chromeos::FakeCryptohomeClient cryptohome_client_; chromeos::FakeCryptohomeClient cryptohome_client_;
std::unique_ptr<platform_keys::MockKeyPermissionsManager> std::unique_ptr<platform_keys::MockKeyPermissionsManager>
system_token_key_permissions_manager_; system_token_key_permissions_manager_;
...@@ -213,13 +211,6 @@ TpmChallengeKeySubtleTest::TpmChallengeKeySubtleTest() ...@@ -213,13 +211,6 @@ TpmChallengeKeySubtleTest::TpmChallengeKeySubtleTest()
::chromeos::AttestationClient::InitializeFake(); ::chromeos::AttestationClient::InitializeFake();
CHECK(testing_profile_manager_.SetUp()); CHECK(testing_profile_manager_.SetUp());
mock_async_method_caller_ =
new StrictMock<cryptohome::MockAsyncMethodCaller>();
// Ownership of mock_async_method_caller_ is transferred to
// AsyncMethodCaller::InitializeForTesting.
cryptohome::AsyncMethodCaller::InitializeForTesting(
mock_async_method_caller_);
challenge_key_subtle_ = std::make_unique<TpmChallengeKeySubtleImpl>( challenge_key_subtle_ = std::make_unique<TpmChallengeKeySubtleImpl>(
&mock_attestation_flow_, &mock_cert_uploader_); &mock_attestation_flow_, &mock_cert_uploader_);
...@@ -229,7 +220,6 @@ TpmChallengeKeySubtleTest::TpmChallengeKeySubtleTest() ...@@ -229,7 +220,6 @@ TpmChallengeKeySubtleTest::TpmChallengeKeySubtleTest()
} }
TpmChallengeKeySubtleTest::~TpmChallengeKeySubtleTest() { TpmChallengeKeySubtleTest::~TpmChallengeKeySubtleTest() {
cryptohome::AsyncMethodCaller::Shutdown();
::chromeos::AttestationClient::Shutdown(); ::chromeos::AttestationClient::Shutdown();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment