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

chromeos/cert_loader.h

Index: chromeos/cert_loader.h
diff --git a/chromeos/cert_loader.h b/chromeos/cert_loader.h
index f9c2de07a5c3d5858a55e550b8af6e3d1e03985f..8e2975e2acdb8561c2c649e4155afae16401f3e8 100644
--- a/chromeos/cert_loader.h
+++ b/chromeos/cert_loader.h
@@ -100,7 +100,7 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer,
   // TPM info is only valid once the TPM is available (IsHardwareBacked is
   // true). Otherwise empty strings will be returned.
   const std::string& tpm_token_name() const { return tpm_token_name_; }
-  const std::string& tpm_token_slot() const { return tpm_token_slot_; }
+  int tpm_token_slot() const { return tpm_token_slot_; }

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

Can we use unsigned long?

I suggest renaming the member and its getter "tpm_token_slot_id*" to make it
clear it is an integer ID now.

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

I just asked Darren about this.  I'll file a bug for it unless he has some
reason not to.
Done.

   const std::string& tpm_user_pin() const { return tpm_user_pin_; }
 
   // This will be empty until certificates_loaded() is true.
@@ -178,7 +178,7 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer,
 
   // Cached TPM token info.
   std::string tpm_token_name_;
-  std::string tpm_token_slot_;
+  int tpm_token_slot_;
   std::string tpm_user_pin_;
 
   // Cached Certificates.