Implement ScopedTestNSSDB instead of OpenTestNSSDB()

chrome/browser/chromeos/cros/onc_network_parser_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 "chrome/browser/chromeos/cros/onc_network_parser.h"
 
 #include <cert.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 
@@ skipping 36 matching lines @@
 
 net::CertType GetCertType(const net::X509Certificate* cert) {
   DCHECK(cert);
   return x509_certificate_model::GetType(cert->os_cert_handle());
 }
 
 }  // namespace
 
 class OncNetworkParserTest : public testing::Test {
  public:
-  static void SetUpTestCase() {
-    // Ideally, we'd open a test DB for each test case, and close it
-    // again, removing the temp dir, but unfortunately, there's a
-    // bug in NSS that prevents this from working, so we just open
-    // it once, and empty it for each test case.  Here's the bug:
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=588269
-    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());
 
-  virtual void SetUp() {
     slot_ = net::NSSCertDatabase::GetInstance()->GetPublicModule();
 
     // Don't run the test if the setup failed.
     ASSERT_TRUE(slot_->os_module_handle());
 
     // Test db should be empty at start of test.
     EXPECT_EQ(0U, ListCertsInSlot(slot_->os_module_handle()).size());
   }
 
   virtual void TearDown() {
     EXPECT_TRUE(CleanupSlotContents(slot_->os_module_handle()));
     EXPECT_EQ(0U, ListCertsInSlot(slot_->os_module_handle()).size());
+    test_nssdb_.reset();
   }
 
   virtual void GetTestData(const std::string& filename, std::string* contents) {
       FilePath path;
       std::string error;
       PathService::Get(chrome::DIR_TEST_DATA, &path);
       path = path.AppendASCII("chromeos").AppendASCII("cros").Append(filename);
       ASSERT_TRUE(contents != NULL);
       ASSERT_TRUE(file_util::PathExists(path))
         << "Couldn't find test data file " << path.value();
@@ skipping 38 matching lines @@
     bool ok = true;
     net::CertificateList certs = ListCertsInSlot(slot);
     for (size_t i = 0; i < certs.size(); ++i) {
       if (!net::NSSCertDatabase::GetInstance()->DeleteCertAndKey(certs[i]))
         ok = false;
     }
     return ok;
   }
 
   ScopedStubCrosEnabler stub_cros_enabler_;
+  scoped_ptr<crypto::ScopedTestNSSDB> test_nssdb_;

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

Doesn't need to be a scoped_ptr here - GTest creates a new test fixture object
for each and every test (derived from OncNetworkParserTest)

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

Done.

 };
 
 const base::Value* OncNetworkParserTest::GetExpectedProperty(
     const Network* network,
     PropertyIndex index,
     base::Value::Type expected_type) {
   const base::Value* value;
   if (!network->GetProperty(index, &value)) {
     ADD_FAILURE() << "Property " << index << " does not exist";
     return NULL;
@@ skipping 823 matching lines @@
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   EXPECT_EQ(0, parser.GetCertificatesSize());
   bool marked_for_removal = false;
   scoped_ptr<Network> network(parser.ParseNetwork(0, &marked_for_removal));
 
   EXPECT_TRUE(marked_for_removal);
   EXPECT_EQ("{485d6076-dd44-6b6d-69787465725f5045}", network->unique_id());
 }
 
 }  // namespace chromeos