diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 20:32:38 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 20:32:38 +0000 |
| commit | c6474b523c69db39103e8b20d8b26486f33078ed (patch) | |
| tree | 7542bcc596af5715f2027fcfa1866610c42d2474 /crypto/nss_util.cc | |
| parent | c02c059cb0e72fb303bf19fb18380ae704a26854 (diff) | |
| download | chromium_src-c6474b523c69db39103e8b20d8b26486f33078ed.zip chromium_src-c6474b523c69db39103e8b20d8b26486f33078ed.tar.gz chromium_src-c6474b523c69db39103e8b20d8b26486f33078ed.tar.bz2 | |
Revert 162327 - Implement ScopedTestNSSDB instead of OpenTestNSSDB()
BUG=136950
Review URL: https://chromiumcodereview.appspot.com/11174006
TBR=toyoshim@chromium.org
BUG=156433
Review URL: https://codereview.chromium.org/11196028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.cc')
| -rw-r--r-- | crypto/nss_util.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 6d86743..db89a70 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -702,13 +702,8 @@ bool CheckNSSVersion(const char* version) { } #if defined(USE_NSS) -ScopedTestNSSDB::ScopedTestNSSDB() - : is_open_(g_nss_singleton.Get().OpenTestNSSDB()) { -} - -ScopedTestNSSDB::~ScopedTestNSSDB() { - // TODO(mattm): Close the dababase once NSS 3.14 is required, - // which fixes https://bugzilla.mozilla.org/show_bug.cgi?id=588269 +bool OpenTestNSSDB() { + return g_nss_singleton.Get().OpenTestNSSDB(); } base::Lock* GetNSSWriteLock() { |