Commit 710485a3 authored by Leo Lai's avatar Leo Lai Committed by Chromium LUCI CQ

Remove TpmClearStoredPassword APIs.

we are migrating tpm status calls to TpmManagerClient.

BUG=b:172748724
TEST=build ok.

Change-Id: I3cee2889e8bb17ac1b39f9dc973d1bf94cbf1558
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2580974
Commit-Queue: Leo Lai <cylai@google.com>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836054}
parent d5d8003f
......@@ -320,31 +320,6 @@ class CryptohomeClientImpl : public CryptohomeClient {
CallVoidMethod(&method_call, std::move(callback));
}
// CryptohomeClient overrides.
void TpmClearStoredPassword(VoidDBusMethodCallback callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmClearStoredPassword);
CallVoidMethod(&method_call, std::move(callback));
}
// CryptohomeClient override.
// TODO(hashimoto): Remove this method. crbug.com/141010
bool CallTpmClearStoredPasswordAndBlock() override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmClearStoredPassword);
base::Time start_time = base::Time::Now();
std::unique_ptr<dbus::Response> response(
blocking_method_caller_->CallMethodAndBlock(&method_call));
UmaHistogramMediumTimes(
kCryptohomeClientUmaPrefix + method_call.GetMember(),
base::Time::Now() - start_time);
return response.get() != NULL;
}
// CryptohomeClient override.
void Pkcs11IsTpmTokenReady(DBusMethodCallback<bool> callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
......
......@@ -243,14 +243,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) CryptohomeClient {
// This method tells the service that it is OK to attempt ownership.
virtual void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) = 0;
// Calls TpmClearStoredPasswordMethod.
virtual void TpmClearStoredPassword(VoidDBusMethodCallback callback) = 0;
// Calls TpmClearStoredPassword method and returns true when the call
// succeeds. This method blocks until the call returns.
// TODO(hashimoto): Remove this method. crbug.com/141010
virtual bool CallTpmClearStoredPasswordAndBlock() = 0;
// Calls Pkcs11IsTpmTokenReady method.
virtual void Pkcs11IsTpmTokenReady(DBusMethodCallback<bool> callback) = 0;
......
......@@ -208,16 +208,6 @@ void FakeCryptohomeClient::TpmCanAttemptOwnership(
FROM_HERE, base::BindOnce(std::move(callback), true));
}
void FakeCryptohomeClient::TpmClearStoredPassword(
VoidDBusMethodCallback callback) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(std::move(callback), true));
}
bool FakeCryptohomeClient::CallTpmClearStoredPasswordAndBlock() {
return true;
}
void FakeCryptohomeClient::Pkcs11IsTpmTokenReady(
DBusMethodCallback<bool> callback) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
......
......@@ -78,8 +78,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
void TpmIsBeingOwned(DBusMethodCallback<bool> callback) override;
bool CallTpmIsBeingOwnedAndBlock(bool* owning) override;
void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) override;
void TpmClearStoredPassword(VoidDBusMethodCallback callback) override;
bool CallTpmClearStoredPasswordAndBlock() override;
void Pkcs11IsTpmTokenReady(DBusMethodCallback<bool> callback) override;
void Pkcs11GetTpmTokenInfo(
DBusMethodCallback<TpmTokenInfo> callback) override;
......
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