crypto/nss_util: Get TPM slot id, do lookup by id instead of by name.

crypto/nss_util.h

Index: crypto/nss_util.h
diff --git a/crypto/nss_util.h b/crypto/nss_util.h
index 1d7503d81315649039de8f3a2eabac3a2b7e5c0c..53fe69c6e49cf4c218b7d171ac2a8e513def3f0a 100644
--- a/crypto/nss_util.h
+++ b/crypto/nss_util.h
@@ -116,7 +116,8 @@ CRYPTO_EXPORT bool IsTPMTokenReady();
 
 // Initialize the TPM token.  Does nothing if it is already initialized.
 CRYPTO_EXPORT bool InitializeTPMToken(const std::string& token_name,
-                                      const std::string& user_pin);
+                                      const std::string& user_pin,
+                                      int token_slot_id);

[wtc, 2013/10/25 18:06:27]

Nit: I suggest listing token_slot_id immediately after token_name because they
are strongly related.

[mattm, 2013/10/25 18:41:37]

Done.

 #endif
 
 // Convert a NSS PRTime value into a base::Time object.