| Index: crypto/nss_util.cc
|
| ===================================================================
|
| --- crypto/nss_util.cc (revision 162509)
|
| +++ crypto/nss_util.cc (working copy)
|
| @@ -702,15 +702,10 @@
|
| }
|
|
|
| #if defined(USE_NSS)
|
| -ScopedTestNSSDB::ScopedTestNSSDB()
|
| - : is_open_(g_nss_singleton.Get().OpenTestNSSDB()) {
|
| +bool OpenTestNSSDB() {
|
| + return 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
|
| -}
|
| -
|
| base::Lock* GetNSSWriteLock() {
|
| return g_nss_singleton.Get().write_lock();
|
| }
|
|
|