Remove crypto::GetTPMTokenInfo which is no longer necessary.

crypto/nss_util.cc

Index: crypto/nss_util.cc
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 87551a8073c9c87726b99bfcf5923f11e44411c9..58d4d95c3b3f1bf2a01e42afefef089c4c7eebe1 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -233,9 +233,7 @@ class NSSInitSingleton {
     tpm_token_enabled_for_nss_ = true;
   }
 
-  bool InitializeTPMToken(const std::string& token_name,
-                          int token_slot_id,
-                          const std::string& user_pin) {
+  bool InitializeTPMToken(int token_slot_id) {
     DCHECK(thread_checker_.CalledOnValidThread());
 
     // If EnableTPMTokenForNSS hasn't been called, return false.
@@ -246,9 +244,6 @@ class NSSInitSingleton {
     if (chaps_module_ && tpm_slot_)
       return true;
 
-    tpm_token_name_ = token_name;
-    tpm_user_pin_ = user_pin;
-
     // This tries to load the Chaps module so NSS can talk to the hardware
     // TPM.
     if (!chaps_module_) {
@@ -276,18 +271,6 @@ class NSSInitSingleton {
     return false;
   }
 
-  void GetTPMTokenInfo(std::string* token_name, std::string* user_pin) {
-    DCHECK(thread_checker_.CalledOnValidThread());
-    if (!tpm_token_enabled_for_nss_) {
-      LOG(ERROR) << "GetTPMTokenInfo called before TPM Token is ready.";
-      return;
-    }
-    if (token_name)
-      *token_name = tpm_token_name_;
-    if (user_pin)
-      *user_pin = tpm_user_pin_;
-  }
-
   bool IsTPMTokenReady() {
     // TODO(mattm): Change to DCHECK when callers have been fixed.
     if (!thread_checker_.CalledOnValidThread()) {
@@ -612,7 +595,6 @@ class NSSInitSingleton {
 
   bool tpm_token_enabled_for_nss_;
   std::string tpm_token_name_;

[wtc, 2013/11/23 00:42:29]

Delete the tpm_token_name_ member.

[mattm, 2013/11/23 01:30:50]

oops, done.

-  std::string tpm_user_pin_;
   SECMODModule* chaps_module_;
   PK11SlotInfo* software_slot_;
   PK11SlotInfo* test_slot_;
@@ -782,19 +764,12 @@ void EnableTPMTokenForNSS() {
   g_nss_singleton.Get().EnableTPMTokenForNSS();
 }
 
-void GetTPMTokenInfo(std::string* token_name, std::string* user_pin) {
-  g_nss_singleton.Get().GetTPMTokenInfo(token_name, user_pin);
-}
-
 bool IsTPMTokenReady() {
   return g_nss_singleton.Get().IsTPMTokenReady();
 }
 
-bool InitializeTPMToken(const std::string& token_name,
-                        int token_slot_id,
-                        const std::string& user_pin) {
-  return g_nss_singleton.Get().InitializeTPMToken(
-      token_name, token_slot_id, user_pin);
+bool InitializeTPMToken(int token_slot_id) {
+  return g_nss_singleton.Get().InitializeTPMToken(token_slot_id);
 }
 #endif  // defined(OS_CHROMEOS)