diff options
author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-25 17:42:23 +0000 |
---|---|---|
committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-25 17:42:23 +0000 |
commit | c05960ea782363a8d9c68967309839cfcb51d424 (patch) | |
tree | 60abdf12770a554f9c0e152904f2ce52c48eba71 /crypto/nss_util.cc | |
parent | 32a93e0c1ac080239558a2ff6a499857d144571f (diff) | |
download | chromium_src-c05960ea782363a8d9c68967309839cfcb51d424.zip chromium_src-c05960ea782363a8d9c68967309839cfcb51d424.tar.gz chromium_src-c05960ea782363a8d9c68967309839cfcb51d424.tar.bz2 |
Destroy all Singletons and LazyInstances between each test.
This modifies base::TestSuite to add a test listener that runs the AtExitManager
between each test.
BUG=110594, 156433, 238654
TEST=*unit*tests
R=apatrick@chromium.org, gspencer@chromium.org, phajdan.jr@chromium.org, pneubeck@chromium.org, rsleevi@chromium.org
Review URL: https://codereview.chromium.org/8947021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.cc')
-rw-r--r-- | crypto/nss_util.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 9cd0cd1..b3fe4a2 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -746,9 +746,8 @@ ScopedTestNSSDB::ScopedTestNSSDB() } ScopedTestNSSDB::~ScopedTestNSSDB() { - // TODO(mattm): Close the dababase once NSS 3.14 is required, - // which fixes https://bugzilla.mozilla.org/show_bug.cgi?id=588269 - // Resource leaks are suppressed. http://crbug.com/156433 . + if (NSS_VersionCheck("3.14")) + g_nss_singleton.Get().CloseTestNSSDB(); } base::Lock* GetNSSWriteLock() { |