1 files changed, 17 insertions, 4 deletions
diff --git a/chromeos/dbus/cryptohome_client.h b/chromeos/dbus/cryptohome_client.h
index 9d94d46..998461a 100644
--- a/chromeos/dbus/cryptohome_client.h
+++ b/chromeos/dbus/cryptohome_client.h
@@ -117,28 +117,41 @@ class CHROMEOS_EXPORT CryptohomeClient {
 
   // Calls TpmIsEnabled method and returns true when the call succeeds.
   // This method blocks until the call returns.
-  // TODO(hashimoto): Remove this method. crosbug.com/28500
+  // TODO(hashimoto): Remove this method. crbug.com/141006
   virtual bool CallTpmIsEnabledAndBlock(bool* enabled) = 0;
 
   // Calls TpmGetPassword method.
   virtual void TpmGetPassword(const StringDBusMethodCallback& callback) = 0;
 
+  // Calls TpmIsOwned method.
+  virtual void TpmIsOwned(const BoolDBusMethodCallback& callback) = 0;
+
   // Calls TpmIsOwned method and returns true when the call succeeds.
   // This method blocks until the call returns.
-  virtual bool TpmIsOwned(bool* owned) = 0;
+  // TODO(hashimoto): Remove this method. crbug.com/141012
+  virtual bool CallTpmIsOwnedAndBlock(bool* owned) = 0;
+
+  // Calls TpmIsBeingOwned method.
+  virtual void TpmIsBeingOwned(const BoolDBusMethodCallback& callback) = 0;
 
   // Calls TpmIsBeingOwned method and returns true when the call succeeds.
   // This method blocks until the call returns.
-  virtual bool TpmIsBeingOwned(bool* owning) = 0;
+  // TODO(hashimoto): Remove this method. crbug.com/141011
+  virtual bool CallTpmIsBeingOwnedAndBlock(bool* owning) = 0;
 
   // Calls TpmCanAttemptOwnership method.
   // This method tells the service that it is OK to attempt ownership.
   virtual void TpmCanAttemptOwnership(
       const VoidDBusMethodCallback& callback) = 0;
 
+  // Calls TpmClearStoredPasswordMethod.
+  virtual void TpmClearStoredPassword(
+      const VoidDBusMethodCallback& callback) = 0;
+
   // Calls TpmClearStoredPassword method and returns true when the call
   // succeeds.  This method blocks until the call returns.
-  virtual bool TpmClearStoredPassword() = 0;
+  // TODO(hashimoto): Remove this method. crbug.com/141010
+  virtual bool CallTpmClearStoredPasswordAndBlock() = 0;
 
   // Calls Pkcs11IsTpmTokenReady method.
   virtual void Pkcs11IsTpmTokenReady(