From d70d82db35eecb586629a05bffc580282c0c30b4 Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Sat, 25 May 2013 19:04:49 +0000 Subject: Revert 202305 "Destroy all Singletons and LazyInstances between ..." > 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 TBR=rsesek@chromium.org Review URL: https://codereview.chromium.org/16063002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202312 0039d316-1c4b-4281-b951-d872f2087c98 --- crypto/nss_util.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crypto/nss_util.cc') diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index b3fe4a2..9cd0cd1 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -746,8 +746,9 @@ ScopedTestNSSDB::ScopedTestNSSDB() } ScopedTestNSSDB::~ScopedTestNSSDB() { - if (NSS_VersionCheck("3.14")) - g_nss_singleton.Get().CloseTestNSSDB(); + // 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 . } base::Lock* GetNSSWriteLock() { -- cgit v1.1