ClientCertStoreChromeOS: support additional non-platform certs.

chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc

Index: chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc b/chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc
index bf465b8efe516ed0525f7fe00f33809b124b5963..6dd8b7948c78f9d82ed900349cfda6f5f887fc17 100644
--- a/chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc
@@ -12,9 +12,11 @@
 #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/ssl/ssl_cert_request_info.h"
 #include "net/test/cert_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -95,8 +97,8 @@ TEST_F(ClientCertStoreChromeOSTest, RequestWaitsForNSSInitAndSucceeds) {
   TestCertFilter* cert_filter =
       new TestCertFilter(false /* init asynchronously */);
   ClientCertStoreChromeOS store(
-      make_scoped_ptr(cert_filter),
-      ClientCertStoreChromeOS::PasswordDelegateFactory());
+      nullptr /* no additional provider */, make_scoped_ptr(cert_filter),
+      net::ClientCertStoreNSS::PasswordDelegateFactory());
 
   scoped_refptr<net::X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
@@ -131,8 +133,9 @@ TEST_F(ClientCertStoreChromeOSTest, RequestsAfterNSSInitSucceed) {
   ASSERT_TRUE(test_db.is_open());
 
   ClientCertStoreChromeOS store(
+      nullptr,  // no additional provider
       make_scoped_ptr(new TestCertFilter(true /* init synchronously */)),
-      ClientCertStoreChromeOS::PasswordDelegateFactory());
+      net::ClientCertStoreNSS::PasswordDelegateFactory());
 
   scoped_refptr<net::X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
@@ -156,8 +159,8 @@ TEST_F(ClientCertStoreChromeOSTest, Filter) {
   TestCertFilter* cert_filter =
       new TestCertFilter(true /* init synchronously */);
   ClientCertStoreChromeOS store(
-      make_scoped_ptr(cert_filter),
-      ClientCertStoreChromeOS::PasswordDelegateFactory());
+      nullptr /* no additional provider */, make_scoped_ptr(cert_filter),
+      net::ClientCertStoreNSS::PasswordDelegateFactory());
 
   scoped_refptr<net::X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));
@@ -201,8 +204,9 @@ TEST_F(ClientCertStoreChromeOSTest, CertRequestMatching) {
   TestCertFilter* cert_filter =
       new TestCertFilter(true /* init synchronously */);
   ClientCertStoreChromeOS store(
+      nullptr,  // no additional provider
       make_scoped_ptr(cert_filter),
-      ClientCertStoreChromeOS::PasswordDelegateFactory());
+      net::ClientCertStoreNSS::PasswordDelegateFactory());
 
   scoped_refptr<net::X509Certificate> cert_1(
       ImportCertToSlot("client_1.pem", "client_1.pk8", test_db.slot()));