diff options
| author | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-12 12:46:17 +0000 |
|---|---|---|
| committer | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-12 12:46:17 +0000 |
| commit | 4071e6ac6d212ca5cc90cef59ed9f4852cfed50c (patch) | |
| tree | 405b9842525c655d478f55c689fd6c7a36aeceee /crypto/rsa_private_key_nss_unittest.cc | |
| parent | 1f48bda5498e693e5de11b9c9bb5899f83fa1882 (diff) | |
| download | chromium_src-4071e6ac6d212ca5cc90cef59ed9f4852cfed50c.zip chromium_src-4071e6ac6d212ca5cc90cef59ed9f4852cfed50c.tar.gz chromium_src-4071e6ac6d212ca5cc90cef59ed9f4852cfed50c.tar.bz2 | |
Remove usage of singleton software_slot_ in nss on ChromeOS
Instead of opening primary user's public slot separately, do it like it's done
for other users: when InitializeNSSForChromeOSUser is called.
This makes primary user's public slot state not dependent on chromeos::TPMTokenLoader.
Also, with this, opening primary users public slot is not bound with enabling
TPM anymore, so the slot may get open for guest user and on Linux ChromeOS.
BUG=383663, 302062
Review URL: https://codereview.chromium.org/317613004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/rsa_private_key_nss_unittest.cc')
| -rw-r--r-- | crypto/rsa_private_key_nss_unittest.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/rsa_private_key_nss_unittest.cc b/crypto/rsa_private_key_nss_unittest.cc index 66d352a..f376f15 100644 --- a/crypto/rsa_private_key_nss_unittest.cc +++ b/crypto/rsa_private_key_nss_unittest.cc @@ -18,12 +18,6 @@ class RSAPrivateKeyNSSTest : public testing::Test { RSAPrivateKeyNSSTest() {} virtual ~RSAPrivateKeyNSSTest() {} - virtual void SetUp() { -#if defined(OS_CHROMEOS) - OpenPersistentNSSDB(); -#endif - } - private: ScopedTestNSSDB test_nssdb_; |