| Index: chrome/browser/chromeos/cros/cryptohome_library.cc
|
| diff --git a/chrome/browser/chromeos/cros/cryptohome_library.cc b/chrome/browser/chromeos/cros/cryptohome_library.cc
|
| index 19b799a5737330ee7a220f16786844432f7002e7..176eaef26f0c5d97f4d95d646358947746f87dba 100644
|
| --- a/chrome/browser/chromeos/cros/cryptohome_library.cc
|
| +++ b/chrome/browser/chromeos/cros/cryptohome_library.cc
|
| @@ -35,12 +35,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary {
|
| return result;
|
| }
|
|
|
| - virtual bool TpmIsReady() OVERRIDE {
|
| - bool result = false;
|
| - DBusThreadManager::Get()->GetCryptohomeClient()->TpmIsReady(&result);
|
| - return result;
|
| - }
|
| -
|
| virtual bool TpmIsEnabled() OVERRIDE {
|
| bool result = false;
|
| DBusThreadManager::Get()->GetCryptohomeClient()->CallTpmIsEnabledAndBlock(
|
| @@ -60,11 +54,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary {
|
| return result;
|
| }
|
|
|
| - virtual bool TpmGetPassword(std::string* password) OVERRIDE {
|
| - return DBusThreadManager::Get()->GetCryptohomeClient()->
|
| - TpmGetPassword(password);
|
| - }
|
| -
|
| virtual void TpmCanAttemptOwnership() OVERRIDE {
|
| DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership();
|
| }
|
| @@ -158,12 +147,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary {
|
| return true;
|
| }
|
|
|
| - // Tpm begin ready after 20-th call.
|
| - virtual bool TpmIsReady() OVERRIDE {
|
| - static int counter = 0;
|
| - return ++counter > 20;
|
| - }
|
| -
|
| virtual bool TpmIsEnabled() OVERRIDE {
|
| return true;
|
| }
|
| @@ -176,11 +159,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary {
|
| return true;
|
| }
|
|
|
| - virtual bool TpmGetPassword(std::string* password) OVERRIDE {
|
| - *password = "Stub-TPM-password";
|
| - return true;
|
| - }
|
| -
|
| virtual void TpmCanAttemptOwnership() OVERRIDE {}
|
|
|
| virtual void TpmClearStoredPassword() OVERRIDE {}
|
|
|