ClientCertStoreChromeOS: support additional non-platform certs.

chrome/browser/chromeos/net/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 "chrome/browser/chromeos/net/client_cert_store_chromeos.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "chrome/browser/chromeos/certificate_provider/certificate_provider.h"
 #include "crypto/scoped_test_nss_db.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/x509_certificate.h"
 #include "net/test/cert_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 63 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),
+      nullptr /* no additional certs */, make_scoped_ptr(cert_filter),
       ClientCertStoreChromeOS::PasswordDelegateFactory());
 
   scoped_refptr<net::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<net::SSLCertRequestInfo> request_all(
       new net::SSLCertRequestInfo());
 
@@ skipping 15 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(
+      nullptr,  // no additional certs
       make_scoped_ptr(new TestCertFilter(true /* init synchronously */)),
       ClientCertStoreChromeOS::PasswordDelegateFactory());
 
   scoped_refptr<net::X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
   ASSERT_TRUE(cert_1.get());
 
   scoped_refptr<net::SSLCertRequestInfo> request_all(
       new net::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),
+      nullptr /* no additional certs */, make_scoped_ptr(cert_filter),
       ClientCertStoreChromeOS::PasswordDelegateFactory());
 
   scoped_refptr<net::X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
   ASSERT_TRUE(cert_1.get());
   scoped_refptr<net::X509Certificate> cert_2(
       ImportCertToSlot("client_2.pem", "client_2.pk8", test_db.slot()));
   ASSERT_TRUE(cert_2.get());
 
   scoped_refptr<net::SSLCertRequestInfo> request_all(
@@ skipping 24 matching lines @@
 
 // Ensure that the delegation of the request matching to the base class is
 // functional.
 TEST_F(ClientCertStoreChromeOSTest, CertRequestMatching) {
   crypto::ScopedTestNSSDB test_db;
   ASSERT_TRUE(test_db.is_open());
 
   TestCertFilter* cert_filter =
       new TestCertFilter(true /* init synchronously */);
   ClientCertStoreChromeOS store(
+      nullptr,  // no additional certs
       make_scoped_ptr(cert_filter),
       ClientCertStoreChromeOS::PasswordDelegateFactory());
 
   scoped_refptr<net::X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
   ASSERT_TRUE(cert_1.get());
   scoped_refptr<net::X509Certificate> cert_2(
       ImportCertToSlot("client_2.pem", "client_2.pk8", test_db.slot()));
   ASSERT_TRUE(cert_2.get());
 
   std::vector<std::string> authority_1(
       1, std::string(reinterpret_cast<const char*>(kAuthority1DN),
                      sizeof(kAuthority1DN)));
   scoped_refptr<net::SSLCertRequestInfo> request(new net::SSLCertRequestInfo());
   request->cert_authorities = authority_1;
 
   base::RunLoop run_loop;
   net::CertificateList selected_certs;
   store.GetClientCerts(*request, &selected_certs, run_loop.QuitClosure());
   run_loop.Run();
 
   ASSERT_EQ(1u, selected_certs.size());
   EXPECT_TRUE(cert_1->Equals(selected_certs[0].get()));
 }
 
 }  // namespace chromeos