Implement ScopedTestNSSDB instead of OpenTestNSSDB()

net/base/nss_cert_database_unittest.cc

Index: net/base/nss_cert_database_unittest.cc
diff --git a/net/base/nss_cert_database_unittest.cc b/net/base/nss_cert_database_unittest.cc
index 2a99196cc31f24f0b07b246b5058fefd78fa5ff4..9cdbb9585ca64f94d4bcb246327326e33c082ec5 100644
--- a/net/base/nss_cert_database_unittest.cc
+++ b/net/base/nss_cert_database_unittest.cc
@@ -38,20 +38,10 @@
 
 namespace net {
 
-// TODO(mattm): when https://bugzilla.mozilla.org/show_bug.cgi?id=588269 is
-// fixed, switch back to using a separate userdb for each test.
-// (When doing so, remember to add some standalone tests of DeleteCert since it
-// won't be tested by TearDown anymore.)
 class CertDatabaseNSSTest : public testing::Test {
  public:
-  static void SetUpTestCase() {
-    ASSERT_TRUE(crypto::OpenTestNSSDB());
-    // There is no matching TearDownTestCase call to close the test NSS DB
-    // because that would leave NSS in a potentially broken state for further
-    // tests, due to https://bugzilla.mozilla.org/show_bug.cgi?id=588269
-  }
-
   virtual void SetUp() {
+    ASSERT_TRUE(test_nssdb_.is_open());
     cert_db_ = NSSCertDatabase::GetInstance();
     slot_ = cert_db_->GetPublicModule();
 
@@ -129,6 +119,8 @@ class CertDatabaseNSSTest : public testing::Test {
     }
     return ok;
   }
+
+  crypto::ScopedTestNSSDB test_nssdb_;
 };
 
 TEST_F(CertDatabaseNSSTest, ListCerts) {