diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 22:46:21 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 22:46:21 +0000 |
| commit | 7838bd03769bc0fe5ae3e73448b660e5de7672de (patch) | |
| tree | d5d7bce197c6baf30bfdb49bad5d44445806482b /crypto/nss_util.cc | |
| parent | 1778819850cb130bfe314ea3521e3451496f97bd (diff) | |
| download | chromium_src-7838bd03769bc0fe5ae3e73448b660e5de7672de.zip chromium_src-7838bd03769bc0fe5ae3e73448b660e5de7672de.tar.gz chromium_src-7838bd03769bc0fe5ae3e73448b660e5de7672de.tar.bz2 | |
Revert 105136 - [chromiumos] Start TPM token initialization re-tries on login
** Because of crash bug http://crosbug.com/21693, I'm going to revert
this until gaurav or I can take a look **
Original Review URL: http://codereview.chromium.org/8212003
BUG=chromium-os:20933,chromium-os:21693
TBR=gauravsh@chromium.org
Review URL: http://codereview.chromium.org/8289019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.cc')
| -rw-r--r-- | crypto/nss_util.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 7a0d086..4998125 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -235,6 +235,9 @@ class NSSInitSingleton { void EnableTPMTokenForNSS(TPMTokenInfoDelegate* info_delegate) { CHECK(info_delegate); tpm_token_info_delegate_.reset(info_delegate); + // Try to load once to avoid jank later. Ignore the return value, + // because if it fails we will try again later. + EnsureTPMTokenReady(); } // This is called whenever we want to make sure opencryptoki is |