Commit 6541a65a authored by Leo Lai's avatar Leo Lai Committed by Chromium LUCI CQ

Remove TpmIsBeingOwned APIs.

we are obsoleting the unnecessary `TpmIsBeingOwned()`.

BUG=b:172775884
BUG=b:172748724
TEST=build ok.

Change-Id: Ie1dc4044060caadb24a9470dbb98d51bcfc383e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532157
Commit-Queue: Leo Lai <cylai@google.com>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836064}
parent cabd94bf
...@@ -298,21 +298,6 @@ class CryptohomeClientImpl : public CryptohomeClient { ...@@ -298,21 +298,6 @@ class CryptohomeClientImpl : public CryptohomeClient {
return CallBoolMethodAndBlock(&method_call, owned); return CallBoolMethodAndBlock(&method_call, owned);
} }
// CryptohomeClient override.
void TpmIsBeingOwned(DBusMethodCallback<bool> callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsBeingOwned);
CallBoolMethod(&method_call, std::move(callback));
}
// CryptohomeClient override.
// TODO(hashimoto): Remove this method. crbug.com/141011
bool CallTpmIsBeingOwnedAndBlock(bool* owning) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
cryptohome::kCryptohomeTpmIsBeingOwned);
return CallBoolMethodAndBlock(&method_call, owning);
}
// CryptohomeClient override. // CryptohomeClient override.
void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) override { void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) override {
dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
......
...@@ -231,14 +231,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) CryptohomeClient { ...@@ -231,14 +231,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) CryptohomeClient {
// TODO(hashimoto): Remove this method. crbug.com/141012 // TODO(hashimoto): Remove this method. crbug.com/141012
virtual bool CallTpmIsOwnedAndBlock(bool* owned) = 0; virtual bool CallTpmIsOwnedAndBlock(bool* owned) = 0;
// Calls TpmIsBeingOwned method.
virtual void TpmIsBeingOwned(DBusMethodCallback<bool> callback) = 0;
// Calls TpmIsBeingOwned method and returns true when the call succeeds.
// This method blocks until the call returns.
// TODO(hashimoto): Remove this method. crbug.com/141011
virtual bool CallTpmIsBeingOwnedAndBlock(bool* owning) = 0;
// Calls TpmCanAttemptOwnership method. // Calls TpmCanAttemptOwnership method.
// This method tells the service that it is OK to attempt ownership. // This method tells the service that it is OK to attempt ownership.
virtual void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) = 0; virtual void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) = 0;
......
...@@ -192,16 +192,6 @@ bool FakeCryptohomeClient::CallTpmIsOwnedAndBlock(bool* owned) { ...@@ -192,16 +192,6 @@ bool FakeCryptohomeClient::CallTpmIsOwnedAndBlock(bool* owned) {
return true; return true;
} }
void FakeCryptohomeClient::TpmIsBeingOwned(DBusMethodCallback<bool> callback) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(std::move(callback), true));
}
bool FakeCryptohomeClient::CallTpmIsBeingOwnedAndBlock(bool* owning) {
*owning = true;
return true;
}
void FakeCryptohomeClient::TpmCanAttemptOwnership( void FakeCryptohomeClient::TpmCanAttemptOwnership(
VoidDBusMethodCallback callback) { VoidDBusMethodCallback callback) {
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
......
...@@ -75,8 +75,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient ...@@ -75,8 +75,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
bool CallTpmIsEnabledAndBlock(bool* enabled) override; bool CallTpmIsEnabledAndBlock(bool* enabled) override;
void TpmIsOwned(DBusMethodCallback<bool> callback) override; void TpmIsOwned(DBusMethodCallback<bool> callback) override;
bool CallTpmIsOwnedAndBlock(bool* owned) override; bool CallTpmIsOwnedAndBlock(bool* owned) override;
void TpmIsBeingOwned(DBusMethodCallback<bool> callback) override;
bool CallTpmIsBeingOwnedAndBlock(bool* owning) override;
void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) override; void TpmCanAttemptOwnership(VoidDBusMethodCallback callback) override;
void Pkcs11IsTpmTokenReady(DBusMethodCallback<bool> callback) override; void Pkcs11IsTpmTokenReady(DBusMethodCallback<bool> callback) override;
void Pkcs11GetTpmTokenInfo( void Pkcs11GetTpmTokenInfo(
......
...@@ -26,12 +26,6 @@ bool TpmIsOwned() { ...@@ -26,12 +26,6 @@ bool TpmIsOwned() {
return result; return result;
} }
bool TpmIsBeingOwned() {
bool result = false;
CryptohomeClient::Get()->CallTpmIsBeingOwnedAndBlock(&result);
return result;
}
bool InstallAttributesGet(const std::string& name, std::string* value) { bool InstallAttributesGet(const std::string& name, std::string* value) {
std::vector<uint8_t> buf; std::vector<uint8_t> buf;
bool success = false; bool success = false;
......
...@@ -24,10 +24,6 @@ COMPONENT_EXPORT(CRYPTOHOME_CLIENT) bool TpmIsEnabled(); ...@@ -24,10 +24,6 @@ COMPONENT_EXPORT(CRYPTOHOME_CLIENT) bool TpmIsEnabled();
// Blocking call. Returns whether the device has already been owned. // Blocking call. Returns whether the device has already been owned.
COMPONENT_EXPORT(CRYPTOHOME_CLIENT) bool TpmIsOwned(); COMPONENT_EXPORT(CRYPTOHOME_CLIENT) bool TpmIsOwned();
// Blocking call. Returns whether the device is being owned (Tpm password is
// generating).
COMPONENT_EXPORT(CRYPTOHOME_CLIENT) bool TpmIsBeingOwned();
// Blocking calls to CryptohomeClient methods. // Blocking calls to CryptohomeClient methods.
COMPONENT_EXPORT(CRYPTOHOME_CLIENT) COMPONENT_EXPORT(CRYPTOHOME_CLIENT)
bool InstallAttributesGet(const std::string& name, std::string* value); bool InstallAttributesGet(const std::string& name, std::string* value);
......
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