crypto/nss_util.cc - Issue 8212003: [chromiumos] Start TPM token initialization re-tries on login

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: crypto/nss_util.cc

Issue 8212003: [chromiumos] Start TPM token initialization re-tries on login (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Remove RequestCertificates() call from wifi|vpn views. Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: crypto/nss_util.cc

diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc

index 9020e7eb0a46c3dec04bf4f34c111e3fc1e68b1a..e5dea56486f7464e051766a7bfcd905200c13768 100644

--- a/crypto/nss_util.cc

+++ b/crypto/nss_util.cc

@@ -234,9 +234,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