summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-25 19:04:49 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-25 19:04:49 +0000
commitd70d82db35eecb586629a05bffc580282c0c30b4 (patch)
tree05a9b5c78c89d4c32e67c9d873dbdb12369545b1 /crypto
parent88bfc75e6658b3820babff8b4983a93e5f67d5e1 (diff)
downloadchromium_src-d70d82db35eecb586629a05bffc580282c0c30b4.zip
chromium_src-d70d82db35eecb586629a05bffc580282c0c30b4.tar.gz
chromium_src-d70d82db35eecb586629a05bffc580282c0c30b4.tar.bz2
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
Diffstat (limited to 'crypto')
-rw-r--r--crypto/nss_util.cc5
1 files changed, 3 insertions, 2 deletions
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() {