summaryrefslogtreecommitdiffstats
path: root/crypto/nss_util.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/nss_util.cc')
-rw-r--r--crypto/nss_util.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 4a48db1..e981cb2 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()) {
return PK11_ReferenceSlot(tpm_slot_);
} else {
// If we were supposed to get the hardware token, but were