Remove TpmIs(Ready|Owned|Enabled) APIs.

we are migrating tpm status calls to TpmManagerClient.

BUG=b:172748724
TEST=build ok.

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

chromeos/dbus/cryptohome/cryptohome_client.cc

@@ -261,43 +261,6 @@ class CryptohomeClientImpl : public CryptohomeClient {
                        weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
   }
 
-  // CryptohomeClient override.
-  void TpmIsReady(DBusMethodCallback<bool> callback) override {
-    dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
-                                 cryptohome::kCryptohomeTpmIsReady);
-    CallBoolMethod(&method_call, std::move(callback));
-  }
-
-  // CryptohomeClient override.
-  void TpmIsEnabled(DBusMethodCallback<bool> callback) override {
-    dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
-                                 cryptohome::kCryptohomeTpmIsEnabled);
-    CallBoolMethod(&method_call, std::move(callback));
-  }
-
-  // CryptohomeClient override.
-  // TODO(hashimoto): Remove this method. crbug.com/141006
-  bool CallTpmIsEnabledAndBlock(bool* enabled) override {
-    dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
-                                 cryptohome::kCryptohomeTpmIsEnabled);
-    return CallBoolMethodAndBlock(&method_call, enabled);
-  }
-
-  // CryptohomeClient override.
-  void TpmIsOwned(DBusMethodCallback<bool> callback) override {
-    dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
-                                 cryptohome::kCryptohomeTpmIsOwned);
-    CallBoolMethod(&method_call, std::move(callback));
-  }
-
-  // CryptohomeClient override.
-  // TODO(hashimoto): Remove this method. crbug.com/141012
-  bool CallTpmIsOwnedAndBlock(bool* owned) override {
-    dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
-                                 cryptohome::kCryptohomeTpmIsOwned);
-    return CallBoolMethodAndBlock(&method_call, owned);
-  }
-
   // CryptohomeClient override.
   void Pkcs11IsTpmTokenReady(DBusMethodCallback<bool> callback) override {
     dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,

chromeos/dbus/cryptohome/cryptohome_client.h

@@ -213,25 +213,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) CryptohomeClient {
   virtual void GetRsuDeviceId(
       DBusMethodCallback<cryptohome::BaseReply> callback) = 0;
 
-  // Calls TpmIsReady method.
-  virtual void TpmIsReady(DBusMethodCallback<bool> callback) = 0;
-
-  // Calls TpmIsEnabled method.
-  virtual void TpmIsEnabled(DBusMethodCallback<bool> callback) = 0;
-
-  // Calls TpmIsEnabled method and returns true when the call succeeds.
-  // This method blocks until the call returns.
-  // TODO(hashimoto): Remove this method. crbug.com/141006
-  virtual bool CallTpmIsEnabledAndBlock(bool* enabled) = 0;
-
-  // Calls TpmIsOwned method.
-  virtual void TpmIsOwned(DBusMethodCallback<bool> callback) = 0;
-
-  // Calls TpmIsOwned method and returns true when the call succeeds.
-  // This method blocks until the call returns.
-  // TODO(hashimoto): Remove this method. crbug.com/141012
-  virtual bool CallTpmIsOwnedAndBlock(bool* owned) = 0;
-
   // Calls Pkcs11IsTpmTokenReady method.
   virtual void Pkcs11IsTpmTokenReady(DBusMethodCallback<bool> callback) = 0;
 

chromeos/dbus/cryptohome/fake_cryptohome_client.cc

@@ -167,31 +167,6 @@ void FakeCryptohomeClient::GetRsuDeviceId(
   ReturnProtobufMethodCallback(reply, std::move(callback));
 }
 
-void FakeCryptohomeClient::TpmIsReady(DBusMethodCallback<bool> callback) {
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(std::move(callback), tpm_is_ready_));
-}
-
-void FakeCryptohomeClient::TpmIsEnabled(DBusMethodCallback<bool> callback) {
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(std::move(callback), tpm_is_enabled_));
-}
-
-bool FakeCryptohomeClient::CallTpmIsEnabledAndBlock(bool* enabled) {
-  *enabled = tpm_is_enabled_;
-  return true;
-}
-
-void FakeCryptohomeClient::TpmIsOwned(DBusMethodCallback<bool> callback) {
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(std::move(callback), true));
-}
-
-bool FakeCryptohomeClient::CallTpmIsOwnedAndBlock(bool* owned) {
-  *owned = true;
-  return true;
-}
-
 void FakeCryptohomeClient::Pkcs11IsTpmTokenReady(
     DBusMethodCallback<bool> callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(

chromeos/dbus/cryptohome/fake_cryptohome_client.h

@@ -70,11 +70,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
       DBusMethodCallback<cryptohome::BaseReply> callback) override;
   void GetRsuDeviceId(
       DBusMethodCallback<cryptohome::BaseReply> callback) override;
-  void TpmIsReady(DBusMethodCallback<bool> callback) override;
-  void TpmIsEnabled(DBusMethodCallback<bool> callback) override;
-  bool CallTpmIsEnabledAndBlock(bool* enabled) override;
-  void TpmIsOwned(DBusMethodCallback<bool> callback) override;
-  bool CallTpmIsOwnedAndBlock(bool* owned) override;
   void Pkcs11IsTpmTokenReady(DBusMethodCallback<bool> callback) override;
   void Pkcs11GetTpmTokenInfo(
       DBusMethodCallback<TpmTokenInfo> callback) override;
@@ -187,12 +182,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
   // unavailable. Expects service not to be available when called.
   void ReportServiceIsNotAvailable();
 
-  // Changes the behavior of TpmIsReady().
-  void set_tpm_is_ready(bool value) { tpm_is_ready_ = value; }
-
-  // Changes the behavior of TpmIsEnabled().
-  void set_tpm_is_enabled(bool value) { tpm_is_enabled_ = value; }
-
   // Sets whether the MountEx() call should fail when the |create| field is not
   // provided (the error code will be CRYPTOHOME_ERROR_ACCOUNT_NOT_FOUND).
   // This allows to simulate the behavior during the new user profile creation.
@@ -370,8 +359,6 @@ class COMPONENT_EXPORT(CRYPTOHOME_CLIENT) FakeCryptohomeClient
   bool supports_low_entropy_credentials_ = false;
   // Controls if CheckKeyEx actually checks the key.
   bool enable_auth_check_ = false;
-  bool tpm_is_ready_ = true;
-  bool tpm_is_enabled_ = true;
 
   // Reply to GetRsuDeviceId().
   std::string rsu_device_id_;

chromeos/dbus/cryptohome/tpm_util.cc

@@ -14,18 +14,6 @@
 namespace chromeos {
 namespace tpm_util {
 
-bool TpmIsEnabled() {
-  bool result = false;
-  CryptohomeClient::Get()->CallTpmIsEnabledAndBlock(&result);
-  return result;
-}
-
-bool TpmIsOwned() {
-  bool result = false;
-  CryptohomeClient::Get()->CallTpmIsOwnedAndBlock(&result);
-  return result;
-}
-
 bool InstallAttributesGet(const std::string& name, std::string* value) {
   std::vector<uint8_t> buf;
   bool success = false;

chromeos/dbus/cryptohome/tpm_util.h

@@ -18,12 +18,6 @@ namespace chromeos {
 
 namespace tpm_util {
 
-// Blocking call. Returns whether the TPM is presented and enabled.
-COMPONENT_EXPORT(CRYPTOHOME_CLIENT) bool TpmIsEnabled();
-
-// Blocking call. Returns whether the device has already been owned.
-COMPONENT_EXPORT(CRYPTOHOME_CLIENT) bool TpmIsOwned();
-
 // Blocking calls to CryptohomeClient methods.
 COMPONENT_EXPORT(CRYPTOHOME_CLIENT)
 bool InstallAttributesGet(const std::string& name, std::string* value);