Make nss/TPM integration in ChromeOS more robust.

crypto/nss_util.cc

Index: crypto/nss_util.cc
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 4a48db1b66410f6fe1dd523a1cc81062be5f07b3..e981cb2fcf9ef476e7b48e06ef492ffae781f98d 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -382,10 +382,8 @@ class NSSInitSingleton {
       return PK11_ReferenceSlot(test_slot_);
 
 #if defined(OS_CHROMEOS)
-    // Make sure that if EnableTPMTokenForNSS has been called that we
-    // have successfully loaded Chaps.
     if (tpm_token_info_delegate_.get() != NULL) {
-      if (EnsureTPMTokenReady()) {
+      if (IsTPMTokenReady()) {

[Greg Spencer (Chromium), 2012/02/14 01:44:04]

So what if nobody ever calls EnsureTPMTokenReady before this?  Then the
tpm_slot_ won't ever get initialized and IsTPMTokenReady won't return true.  I
know we call EnsureTPMTokenReady right now in the browser startup code, so
that's probably sufficient to ensure that doesn't happen, but I guess I don't
see why this is better.  Is it because this might get called earlier than it
should be?

         return PK11_ReferenceSlot(tpm_slot_);
       } else {
         // If we were supposed to get the hardware token, but were