Add GetSystemNSSKeySlot, merge GetPrivateNSSKeySlot/GetPublicNSSKeySlot to GetPersistentNSSKeySlot.

net/ssl/client_cert_store_chromeos_unittest.cc

Index: net/ssl/client_cert_store_chromeos_unittest.cc
diff --git a/net/ssl/client_cert_store_chromeos_unittest.cc b/net/ssl/client_cert_store_chromeos_unittest.cc
index de0358df15bfe8bd06f8e068093e9409f1eebeae..65b668dbb25d21696337db71aeef49b0d5c58ded 100644
--- a/net/ssl/client_cert_store_chromeos_unittest.cc
+++ b/net/ssl/client_cert_store_chromeos_unittest.cc
@@ -16,27 +16,6 @@
 
 namespace net {
 
-class ClientCertStoreChromeOSTestDelegate {
- public:
-  ClientCertStoreChromeOSTestDelegate()
-      : store_("usernamehash",
-               ClientCertStoreChromeOS::PasswordDelegateFactory()) {
-    store_.InitForTesting(
-        crypto::ScopedPK11Slot(crypto::GetPublicNSSKeySlot()),
-        crypto::ScopedPK11Slot(crypto::GetPrivateNSSKeySlot()));
-  }
-
-  bool SelectClientCerts(const CertificateList& input_certs,
-                         const SSLCertRequestInfo& cert_request_info,
-                         CertificateList* selected_certs) {
-    return store_.SelectClientCertsForTesting(
-        input_certs, cert_request_info, selected_certs);
-  }
-
- private:
-  ClientCertStoreChromeOS store_;
-};
-
 class ClientCertStoreChromeOSTest : public ::testing::Test {
  public:
   scoped_refptr<X509Certificate> ImportCertForUser(