Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4385)

Unified Diff: chrome/browser/chromeos/cros/cryptohome_library.cc

Issue 10703162: chromeos: Remove CryptohomeLibrary::TpmGetPassword and TpmIsReady (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More localized variables Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 {}
« no previous file with comments | « chrome/browser/chromeos/cros/cryptohome_library.h ('k') | chrome/browser/chromeos/login/tpm_password_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698