Remove crypto::IsTPMTokenAvailble

BUG=126674
TEST=build success

Review URL: https://chromiumcodereview.appspot.com/10381151

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

2 files changed, 0 insertions, 16 deletions

diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 5b9a387..927f2b8 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -270,12 +270,6 @@ class NSSInitSingleton {
                    callback));
   }
 
-  bool IsTPMTokenAvailable() {
-    if (tpm_token_info_delegate_.get() == NULL)
-      return false;
-    return tpm_token_info_delegate_->IsTokenAvailable();
-  }
-
   void GetTPMTokenInfo(std::string* token_name, std::string* user_pin) {
     if (tpm_token_info_delegate_.get() == NULL) {
       LOG(ERROR) << "GetTPMTokenInfo called before TPM Token is ready.";
@@ -770,10 +764,6 @@ void GetTPMTokenInfo(std::string* token_name, std::string* user_pin) {
   g_nss_singleton.Get().GetTPMTokenInfo(token_name, user_pin);
 }
 
-bool IsTPMTokenAvailable() {
-  return g_nss_singleton.Get().IsTPMTokenAvailable();
-}
-
 bool IsTPMTokenReady() {
   return g_nss_singleton.Get().IsTPMTokenReady();
 }
diff --git a/crypto/nss_util.h b/crypto/nss_util.h
index fb5049b..0413333 100644
--- a/crypto/nss_util.h
+++ b/crypto/nss_util.h
@@ -103,9 +103,6 @@ class CRYPTO_EXPORT TPMTokenInfoDelegate {
   TPMTokenInfoDelegate();
   virtual ~TPMTokenInfoDelegate();
 
-  // Returns true if the hardware supports a TPM Token and the TPM is enabled.
-  virtual bool IsTokenAvailable() const = 0;
-
   // Runs |callback| with true if the TPM and PKCS#11 token slot is ready to be
   // used.
   // If IsTokenAvailable() is false this should run |callback| with false.
@@ -133,9 +130,6 @@ CRYPTO_EXPORT void EnableTPMTokenForNSS(TPMTokenInfoDelegate* delegate);
 CRYPTO_EXPORT void GetTPMTokenInfo(std::string* token_name,
                                    std::string* user_pin);
 
-// Returns true if the machine has a TPM and it can be used to store tokens.
-CRYPTO_EXPORT bool IsTPMTokenAvailable();
-
 // Returns true if the TPM is owned and PKCS#11 initialized with the
 // user and security officer PINs, and has been enabled in NSS by
 // calling EnableTPMForNSS, and Chaps has been successfully