cryptohome: Remove TpmClearStoredPassword() and TpmCanAttemptOwnership() from CryptohomeLibrary

Clients should use CryptohomeClient directly.
There is no benefit of going through CryptohomeLibrary.

BUG=298592
TEST=none

Review URL: https://codereview.chromium.org/24673005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225560 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 24 deletions

diff --git a/chromeos/cryptohome/cryptohome_library.cc b/chromeos/cryptohome/cryptohome_library.cc
index cd07a0e..27afb23 100644
--- a/chromeos/cryptohome/cryptohome_library.cc
+++ b/chromeos/cryptohome/cryptohome_library.cc
@@ -58,16 +58,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary {
     return result;
   }
 
-  virtual void TpmCanAttemptOwnership() OVERRIDE {
-    DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership(
-        EmptyVoidDBusMethodCallback());
-  }
-
-  virtual void TpmClearStoredPassword() OVERRIDE {
-    DBusThreadManager::Get()->GetCryptohomeClient()->
-        CallTpmClearStoredPasswordAndBlock();
-  }
-
   virtual bool InstallAttributesGet(
       const std::string& name, std::string* value) OVERRIDE {
     std::vector<uint8> buf;
@@ -255,10 +245,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary {
     return true;
   }
 
-  virtual void TpmCanAttemptOwnership() OVERRIDE {}
-
-  virtual void TpmClearStoredPassword() OVERRIDE {}
-
   virtual bool InstallAttributesGet(
       const std::string& name, std::string* value) OVERRIDE {
     if (install_attrs_.find(name) != install_attrs_.end()) {
diff --git a/chromeos/cryptohome/cryptohome_library.h b/chromeos/cryptohome/cryptohome_library.h
index 589addb..6d187ed 100644
--- a/chromeos/cryptohome/cryptohome_library.h
+++ b/chromeos/cryptohome/cryptohome_library.h
@@ -44,13 +44,6 @@ class CHROMEOS_EXPORT CryptohomeLibrary {
   // Returns whether device is being owned (Tpm password is generating).
   virtual bool TpmIsBeingOwned() = 0;
 
-  // Attempts to start owning (if device isn't owned and isn't being owned).
-  virtual void TpmCanAttemptOwnership() = 0;
-
-  // Clears Tpm password. Password should be cleared after it was generated and
-  // shown to user.
-  virtual void TpmClearStoredPassword() = 0;
-
   virtual bool InstallAttributesGet(const std::string& name,
                                     std::string* value) = 0;
   virtual bool InstallAttributesSet(const std::string& name,
diff --git a/chromeos/cryptohome/mock_cryptohome_library.h b/chromeos/cryptohome/mock_cryptohome_library.h
index a8c6ef9..69c177e 100644
--- a/chromeos/cryptohome/mock_cryptohome_library.h
+++ b/chromeos/cryptohome/mock_cryptohome_library.h
@@ -27,9 +27,6 @@ class MockCryptohomeLibrary : public CryptohomeLibrary {
   MOCK_METHOD0(TpmIsEnabled, bool(void));
   MOCK_METHOD0(TpmIsOwned, bool(void));
   MOCK_METHOD0(TpmIsBeingOwned, bool(void));
-  MOCK_METHOD1(TpmGetPassword, bool(std::string* password));
-  MOCK_METHOD0(TpmCanAttemptOwnership, void(void));
-  MOCK_METHOD0(TpmClearStoredPassword, void(void));
 
   MOCK_METHOD2(InstallAttributesGet, bool(const std::string&, std::string*));
   MOCK_METHOD2(InstallAttributesSet, bool(const std::string&,