Implement ScopedTestNSSDB instead of OpenTestNSSDB()

net/base/nss_cert_database_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cert.h>
 #include <certdb.h>
 #include <pk11pub.h>
 
 #include <algorithm>
 
@@ skipping 20 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 // In NSS 3.13, CERTDB_VALID_PEER was renamed CERTDB_TERMINAL_RECORD. So we use
 // the new name of the macro.
 #if !defined(CERTDB_TERMINAL_RECORD)
 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER
 #endif
 
 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() {
+    test_nssdb_.reset(new crypto::ScopedTestNSSDB());
+    ASSERT_TRUE(test_nssdb_->is_open());
     cert_db_ = NSSCertDatabase::GetInstance();
     slot_ = cert_db_->GetPublicModule();
 
     // Test db should be empty at start of test.
     EXPECT_EQ(0U, ListCertsInSlot(slot_->os_module_handle()).size());
   }
 
   virtual void TearDown() {
     // Don't try to cleanup if the setup failed.
     ASSERT_TRUE(slot_->os_module_handle());
 
     EXPECT_TRUE(CleanupSlotContents());
 
     // Run the message loop to process any observer callbacks (e.g. for the
     // ClientSocketFactory singleton) so that the scoped ref ptrs created in
     // NSSCertDatabase::NotifyObservers* get released.
     MessageLoop::current()->RunAllPending();
 
     EXPECT_EQ(0U, ListCertsInSlot(slot_->os_module_handle()).size());
+
+    test_nssdb_.reset();
   }
 
  protected:
   static std::string ReadTestFile(const std::string& name) {
     std::string result;
     FilePath cert_path = GetTestCertsDirectory().AppendASCII(name);
     EXPECT_TRUE(file_util::ReadFileToString(cert_path, &result));
     return result;
   }
 
@@ skipping 38 matching lines @@
       SECStatus srv = CERT_ChangeCertTrust(
           CERT_GetDefaultCertDB(), certs[i]->os_cert_handle(), &default_trust);
       if (srv != SECSuccess)
         ok = false;
 
       if (!cert_db_->DeleteCertAndKey(certs[i]))
         ok = false;
     }
     return ok;
   }
+
+  scoped_ptr<crypto::ScopedTestNSSDB> test_nssdb_;

[Ryan Sleevi, 2012/10/16 18:19:02]

No need to use scoped_ptr here

[Takashi Toyoshima, 2012/10/17 04:58:53]

Done.

 };
 
 TEST_F(CertDatabaseNSSTest, ListCerts) {
   // This test isn't terribly useful, though it will at least let valgrind test
   // for leaks.
   CertificateList certs;
   cert_db_->ListCerts(&certs);
   // The test DB is empty, but let's assume there will always be something in
   // the other slots.
   EXPECT_LT(0U, certs.size());
@@ skipping 784 matching lines @@
 
   // Server cert should verify.
   CertVerifyResult verify_result2;
   error = verify_proc->Verify(certs[0], "127.0.0.1", flags,
                               NULL, &verify_result2);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result2.cert_status);
 }
 
 }  // namespace net