Add GetSystemNSSKeySlot, merge GetPrivateNSSKeySlot/GetPublicNSSKeySlot to GetPersistentNSSKeySlot.

net/ssl/client_cert_store_chromeos_unittest.cc

 // Copyright 2013 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 "net/ssl/client_cert_store_chromeos.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "crypto/nss_util.h"
 #include "crypto/nss_util_internal.h"
 #include "net/cert/nss_cert_database.h"
 #include "net/ssl/client_cert_store_unittest-inl.h"
 
 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(
       const std::string& username_hash,
       const std::string& filename,
       const std::string& password) {
     crypto::ScopedPK11Slot slot(
         crypto::GetPublicSlotForChromeOSUser(username_hash));
     EXPECT_TRUE(slot.get());
     if (!slot.get())
@@ skipping 130 matching lines @@
   run_loop_1.Run();
   run_loop_2.Run();
 
   ASSERT_EQ(1u, request_1->client_certs.size());
   EXPECT_TRUE(cert_1->Equals(request_1->client_certs[0]));
   // TODO(mattm): Request for second user will have zero results due to
   // crbug.com/315285.  Update the test once that is fixed.
 }
 
 }  // namespace net