Convert blocking chromeos::CryptohomeClient::Pkcs11* methods to async

CryptohomeLibrary::Pkcs11* methods are removed.
crypto::EnsureTPMTokenReady (renamed to InitializeTPMToken) and TPMTokenInfoDelegate::IsTokenReady are also converted to async.

BUG=chromium-os:16552
TEST=Login as a user, open chrome://cryptohome and see "token_name" is displayed correctly, open chrome://settings/certificates and see "Import and Bind to Device…" button is enabled (can be pushed).

Review URL: http://codereview.chromium.org/9421045

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

1 files changed, 0 insertions, 21 deletions

diff --git a/chrome/browser/chromeos/cros/cryptohome_library.cc b/chrome/browser/chromeos/cros/cryptohome_library.cc
index 9991055..d8d16d3 100644
--- a/chrome/browser/chromeos/cros/cryptohome_library.cc
+++ b/chrome/browser/chromeos/cros/cryptohome_library.cc
@@ -130,19 +130,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary {
     return result;
   }
 
-  virtual void Pkcs11GetTpmTokenInfo(
-      std::string* label, std::string* user_pin) OVERRIDE {
-    DBusThreadManager::Get()->GetCryptohomeClient()->Pkcs11GetTpmTokenInfo(
-        label, user_pin);
-  }
-
-  virtual bool Pkcs11IsTpmTokenReady() OVERRIDE {
-    bool result = false;
-    DBusThreadManager::Get()->GetCryptohomeClient()->
-        Pkcs11IsTpmTokenReady(&result);
-    return result;
-  }
-
   virtual std::string HashPassword(const std::string& password) OVERRIDE {
     // Get salt, ascii encode, update sha with that, then update with ascii
     // of password, then end.
@@ -250,14 +237,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary {
     return !locked_;
   }
 
-  virtual void Pkcs11GetTpmTokenInfo(std::string* label,
-                                     std::string* user_pin) OVERRIDE {
-    *label = "Stub TPM Token";
-    *user_pin = "012345";
-  }
-
-  virtual bool Pkcs11IsTpmTokenReady() OVERRIDE { return true; }
-
   virtual std::string HashPassword(const std::string& password) OVERRIDE {
     return StringToLowerASCII(base::HexEncode(
             reinterpret_cast<const void*>(password.data()),