diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 05:35:58 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 05:35:58 +0000 |
| commit | af7191861fd94c08c4c436f4f33a3e9adfefc706 (patch) | |
| tree | 47bb646a0bf938fea07b0db644ed44d456231713 /crypto/nss_util.cc | |
| parent | 6da953cdfeab61dfb0085b54cc09c3621ca28bc9 (diff) | |
| download | chromium_src-af7191861fd94c08c4c436f4f33a3e9adfefc706.zip chromium_src-af7191861fd94c08c4c436f4f33a3e9adfefc706.tar.gz chromium_src-af7191861fd94c08c4c436f4f33a3e9adfefc706.tar.bz2 | |
This reinstates a change of gauravsh's that I reverted
because we thought it might be the cause of crashes
when getting SPDY certs. http://crosbug.com/21693
We've tested that, and it doesn't appear to be the cause.
So, I'm resubmitting the code from review 8212003
TBR=gauravsh@chromium.org
BUG=chromium-os:21693, chromium-os:20933
TEST=Built with and without change, and tested SPDY proxy setup on an alex.
Review URL: http://codereview.chromium.org/8349020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.cc')
| -rw-r--r-- | crypto/nss_util.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 4998125..7a0d086 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -235,9 +235,6 @@ 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 |