Commit 87e56f54 authored by Leo Lai's avatar Leo Lai Committed by Chromium LUCI CQ

Remove CanAttemptOwnership APIs.

we are migrating tpm status calls to TpmManagerClient.

BUG=b:172748724
TEST=build ok.

Change-Id: I8837750441a5c451c9107137d78fd0e04b8ad8f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2581169
Commit-Queue: Leo Lai <cylai@google.com>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836076}
parent c0bfdaf6
......@@ -298,13 +298,6 @@ class CryptohomeClientImpl : public CryptohomeClient {
return CallBoolMethodAndBlock(&method_call, owned);
}
// CryptohomeClient override.
void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmCanAttemptOwnership);
CallVoidMethod(&method_call, std::move(callback));
}
// CryptohomeClient override.
void Pkcs11IsTpmTokenReady(DBusMethodCallback<bool> callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
......
......@@ -231,10 +231,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) CryptohomeClient {
// TODO(hashimoto): Remove this method. crbug.com/141012
virtual bool CallTpmIsOwnedAndBlock(bool* owned) = 0;
// Calls TpmCanAttemptOwnership method.
// This method tells the service that it is OK to attempt ownership.
virtual void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) = 0;
// Calls Pkcs11IsTpmTokenReady method.
virtual void Pkcs11IsTpmTokenReady(DBusMethodCallback<bool> callback) = 0;
......
......@@ -192,12 +192,6 @@ bool FakeCryptohomeClient::CallTpmIsOwnedAndBlock(bool* owned) {
return true;
}
void FakeCryptohomeClient::TpmCanAttemptOwnership(
VoidDBusMethodCallback callback) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(std::move(callback), true));
}
void FakeCryptohomeClient::Pkcs11IsTpmTokenReady(
DBusMethodCallback<bool> callback) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
......
......@@ -75,7 +75,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
bool CallTpmIsEnabledAndBlock(bool* enabled) override;
void TpmIsOwned(DBusMethodCallback<bool> callback) override;
bool CallTpmIsOwnedAndBlock(bool* owned) override;
void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) 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