Implement ScopedTestNSSDB instead of OpenTestNSSDB()

chrome/browser/chromeos/cros/network_library_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 <pk11pub.h>
 
 #include <vector>
 #include <string>
 
@@ skipping 120 matching lines @@
 // NetworkLibraryStubImpl.
 // NOTE: It would be of little value to test stub functions that simply return
 // predefined values, e.g. ethernet_available(). However, many other functions
 // such as connected_network() return values which are set indirectly and thus
 // we can test the logic of those setters.
 
 class NetworkLibraryStubTest : public testing::Test {
  public:
   NetworkLibraryStubTest() : cros_(NULL) {}
 
-  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
-  }
-
  protected:
   virtual void SetUp() {
+    test_nssdb_.reset(new crypto::ScopedTestNSSDB());
+    ASSERT_TRUE(test_nssdb_->is_open());
+
     slot_ = net::NSSCertDatabase::GetInstance()->GetPublicModule();
     cros_ = CrosLibrary::Get()->GetNetworkLibrary();
     ASSERT_TRUE(cros_) << "GetNetworkLibrary() Failed!";
 
     // Test db should be empty at start of test.
     EXPECT_EQ(0U, ListCertsInSlot(slot_->os_module_handle()).size());
   }
   virtual void TearDown() {
     cros_ = NULL;
     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 24 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;
   }
 
   scoped_refptr<net::CryptoModule> slot_;
+  scoped_ptr<crypto::ScopedTestNSSDB> test_nssdb_;

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

I think I should not use scoped_ptr here too.

 };
 
 // Default stub state:
 // vpn1: disconnected, L2TP/IPsec + PSK
 // vpn2: disconnected, L2TP/IPsec + user cert
 // vpn3: disconnected, OpenVpn
 // eth1: connected (active network)
 // wifi1: connected
 // wifi2: disconnected
 // wifi3: disconnected, WEP
@@ skipping 150 matching lines @@
 
 // TODO(stevenjb): Test network profiles.
 
 // TODO(stevenjb): Test network devices.
 
 // TODO(stevenjb): Test data plans.
 
 // TODO(stevenjb): Test monitor network / device.
 
 }  // namespace chromeos