commit 1cbefaa36bb6030e223039c81838bc317c1d7995
author Yi Chou <yich@google.com> Sun Dec 27 05:00:20 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Fri Jan 01 03:57:24 2021 +0000
tree 5aade3319594d2ebb18ca8ec9b4255c879621b8a
parent 370572e7e2c4645dda957a3c041f575cdb4dce20

cryptohome: cleanup tpm_ownership_proxy_ in UDA

We should cleanup tpm_ownership_proxy_ after http://crrev/c/2345874
landed.

BUG=b:146525460
TEST=CQ

Change-Id: I0c6308031ebfc796b85ad0428516343ac4c598ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2603665
Tested-by: Yi Chou <yich@google.com>
Commit-Queue: Yi Chou <yich@google.com>
Reviewed-by: Leo Lai <cylai@google.com>

cryptohome/userdataauth.cc

diff --git a/cryptohome/userdataauth.cc b/cryptohome/userdataauth.cc
index 45c8e19..02940e4 100644
--- a/cryptohome/userdataauth.cc
+++ b/cryptohome/userdataauth.cc
@@ -171,8 +171,6 @@
       firmware_management_parameters_(nullptr),
       default_fingerprint_manager_(),
       fingerprint_manager_(nullptr),
-      default_tpm_ownership_proxy_(),
-      tpm_ownership_proxy_(nullptr),
       default_boot_lockbox_(),
       boot_lockbox_(nullptr),
       upload_alerts_period_ms_(kUploadAlertsPeriodMS),
@@ -451,15 +449,6 @@
   AssertOnOriginThread();
   CHECK(bus_);
 
-  // Initialize the tpm_ownership_proxy_ and register the signals.
-  if (!default_tpm_ownership_proxy_) {
-    default_tpm_ownership_proxy_.reset(
-        new org::chromium::TpmManagerProxy(bus_));
-  }
-
-  if (!tpm_ownership_proxy_) {
-    tpm_ownership_proxy_ = default_tpm_ownership_proxy_.get();
-  }
   tpm_manager::TpmManagerUtility* tpm_manager_util =
       tpm_manager::TpmManagerUtility::GetSingleton();
   if (tpm_manager_util) {

cryptohome/userdataauth.h

diff --git a/cryptohome/userdataauth.h b/cryptohome/userdataauth.h
index b7ebaa5..39a5a54 100644
--- a/cryptohome/userdataauth.h
+++ b/cryptohome/userdataauth.h
@@ -540,11 +540,6 @@
     fingerprint_manager_ = fingerprint_manager;
   }
 
-  void set_tpm_ownership_proxy(
-      org::chromium::TpmManagerProxyInterface* tpm_ownership_proxy) {
-    tpm_ownership_proxy_ = tpm_ownership_proxy;
-  }
-
   // Override |mount_factory_| for testing purpose
   void set_mount_factory(MountFactory* mount_factory) {
     mount_factory_ = mount_factory;
@@ -988,15 +983,6 @@
   // can be overridden for testing.
   FingerprintManager* fingerprint_manager_;
 
-  // The default D-Bus proxy for invoking any ownership related methods in
-  // tpm_manager.
-  std::unique_ptr<org::chromium::TpmManagerProxyInterface>
-      default_tpm_ownership_proxy_;
-
-  // The actual D-Bus proxy for invoking any ownership related methods in
-  // tpm_manager, but can be overridden for testing.
-  org::chromium::TpmManagerProxyInterface* tpm_ownership_proxy_;
-
   // The default BootLockbox object for finalizing it.
   std::unique_ptr<BootLockbox> default_boot_lockbox_;
 

cryptohome/userdataauth_unittest.cc

diff --git a/cryptohome/userdataauth_unittest.cc b/cryptohome/userdataauth_unittest.cc
index 539c7b4..79219ff 100644
--- a/cryptohome/userdataauth_unittest.cc
+++ b/cryptohome/userdataauth_unittest.cc
@@ -128,7 +128,6 @@
     userdataauth_->set_disk_cleanup(&cleanup_);
     userdataauth_->set_pkcs11_init(&pkcs11_init_);
     userdataauth_->set_mount_factory(&mount_factory_);
-    userdataauth_->set_tpm_ownership_proxy(&tpm_ownership_proxy_);
     userdataauth_->set_challenge_credentials_helper(
         &challenge_credentials_helper_);
     userdataauth_->set_key_challenge_service_factory(
@@ -232,10 +231,6 @@
   // internal use.
   NiceMock<MockFingerprintManager> fingerprint_manager_;
 
-  // Mock tpm ownership proxy object, will be passed to UserDataAuth for its
-  // internal use.
-  NiceMock<org::chromium::TpmManagerProxyMock> tpm_ownership_proxy_;
-
   // Mock challenge credential helper utility object, will be passed to
   // UserDataAuth for its internal use.
   NiceMock<MockChallengeCredentialsHelper> challenge_credentials_helper_;