ClientCertStoreChromeOS: support additional non-platform certs.

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 <string>
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 51 matching lines @@
 };
 
 }  // namespace
 
 // Define a delegate to be used for instantiating the parameterized test set
 // ClientCertStoreTest.
 class ClientCertStoreChromeOSTestDelegate {
  public:
   ClientCertStoreChromeOSTestDelegate()
       : store_(
+            CertificateList(),
             make_scoped_ptr(new TestCertFilter(true /* init synchronously */)),
             ClientCertStoreChromeOS::PasswordDelegateFactory()) {
     // Defer futher initialization and checks to SelectClientCerts, because the
     // constructor doesn't allow us to return an initialization result. Could be
     // cleaned up by adding an Init() function.
   }
 
   // Called by the ClientCertStoreTest tests.
   // |inpurt_certs| contains certificates to select from. Because
   // ClientCertStoreChromeOS filters also for the right slot, we have to import
@@ skipping 58 matching lines @@
 
 // Ensure that cert requests, that are started before the filter is initialized,
 // will wait for the initialization and succeed afterwards.
 TEST_F(ClientCertStoreChromeOSTest, RequestWaitsForNSSInitAndSucceeds) {
   crypto::ScopedTestNSSDB test_db;
   ASSERT_TRUE(test_db.is_open());
 
   TestCertFilter* cert_filter =
       new TestCertFilter(false /* init asynchronously */);
   ClientCertStoreChromeOS store(
-      make_scoped_ptr(cert_filter),
+      CertificateList(), make_scoped_ptr(cert_filter),
       ClientCertStoreChromeOS::PasswordDelegateFactory());
 
   scoped_refptr<X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
   ASSERT_TRUE(cert_1.get());
 
   // Request any client certificate, which is expected to match client_1.
   scoped_refptr<SSLCertRequestInfo> request_all(new SSLCertRequestInfo());
 
   base::RunLoop run_loop;
@@ skipping 14 matching lines @@
   ASSERT_EQ(1u, request_all->client_certs.size());
 }
 
 // Ensure that cert requests, that are started after the filter was initialized,
 // will succeed.
 TEST_F(ClientCertStoreChromeOSTest, RequestsAfterNSSInitSucceed) {
   crypto::ScopedTestNSSDB test_db;
   ASSERT_TRUE(test_db.is_open());
 
   ClientCertStoreChromeOS store(
+      CertificateList(),
       make_scoped_ptr(new TestCertFilter(true /* init synchronously */)),
       ClientCertStoreChromeOS::PasswordDelegateFactory());
 
   scoped_refptr<X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
   ASSERT_TRUE(cert_1.get());
 
   scoped_refptr<SSLCertRequestInfo> request_all(new SSLCertRequestInfo());
 
   base::RunLoop run_loop;
   store.GetClientCerts(
       *request_all, &request_all->client_certs, run_loop.QuitClosure());
   run_loop.Run();
 
   ASSERT_EQ(1u, request_all->client_certs.size());
 }
 
 TEST_F(ClientCertStoreChromeOSTest, Filter) {
   crypto::ScopedTestNSSDB test_db;
   ASSERT_TRUE(test_db.is_open());
 
   TestCertFilter* cert_filter =
       new TestCertFilter(true /* init synchronously */);
   ClientCertStoreChromeOS store(
-      make_scoped_ptr(cert_filter),
+      CertificateList(), make_scoped_ptr(cert_filter),
       ClientCertStoreChromeOS::PasswordDelegateFactory());
 
   scoped_refptr<X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
   ASSERT_TRUE(cert_1.get());
   scoped_refptr<X509Certificate> cert_2(
       ImportCertToSlot("client_2.pem", "client_2.pk8", test_db.slot()));
   ASSERT_TRUE(cert_2.get());
 
   scoped_refptr<SSLCertRequestInfo> request_all(new SSLCertRequestInfo());
@@ skipping 15 matching lines @@
     CertificateList selected_certs;
     store.GetClientCerts(*request_all, &selected_certs, run_loop.QuitClosure());
     run_loop.Run();
 
     ASSERT_EQ(1u, selected_certs.size());
     EXPECT_TRUE(cert_2->Equals(selected_certs[0].get()));
   }
 }
 
 }  // namespace net