| 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..117d8ca65406ec91d532d73022656222dd18c0dd 100644
|
| --- a/chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc
|
| +++ b/chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc
|
| @@ -12,6 +12,7 @@
|
| #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"
|
| @@ -95,7 +96,7 @@ TEST_F(ClientCertStoreChromeOSTest, RequestWaitsForNSSInitAndSucceeds) {
|
| 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(
|
| @@ -131,6 +132,7 @@ TEST_F(ClientCertStoreChromeOSTest, RequestsAfterNSSInitSucceed) {
|
| ASSERT_TRUE(test_db.is_open());
|
|
|
| ClientCertStoreChromeOS store(
|
| + nullptr, // no additional certs
|
| make_scoped_ptr(new TestCertFilter(true /* init synchronously */)),
|
| ClientCertStoreChromeOS::PasswordDelegateFactory());
|
|
|
| @@ -156,7 +158,7 @@ TEST_F(ClientCertStoreChromeOSTest, Filter) {
|
| 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(
|
| @@ -201,6 +203,7 @@ TEST_F(ClientCertStoreChromeOSTest, CertRequestMatching) {
|
| TestCertFilter* cert_filter =
|
| new TestCertFilter(true /* init synchronously */);
|
| ClientCertStoreChromeOS store(
|
| + nullptr, // no additional certs
|
| make_scoped_ptr(cert_filter),
|
| ClientCertStoreChromeOS::PasswordDelegateFactory());
|
|
|
|
|