Plumbing SSLPrivateKey

content/browser/loader/resource_loader_unittest.cc

Index: content/browser/loader/resource_loader_unittest.cc
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index 90418f3f11444a38a1140a3973e67d9e51ef5a4c..9fea2cd8b89de733e24302794a3e9c40e9f84bb7 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -38,6 +38,8 @@
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/client_cert_store.h"
 #include "net/ssl/ssl_cert_request_info.h"
+#include "net/ssl/ssl_platform_key.h"

[davidben, 2015/09/25 20:10:11]

No longer necessary?

[svaldez, 2015/09/28 16:54:52]

Done.

+#include "net/ssl/ssl_private_key.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/url_request/url_request.h"
@@ -163,7 +165,8 @@ class MockClientCertURLRequestJob : public net::URLRequestTestJob {
                    this, cert_request_info));
   }
 
-  void ContinueWithCertificate(net::X509Certificate* cert) override {
+  void ContinueWithCertificate(net::X509Certificate* cert,
+                               net::SSLPrivateKey* pkey) override {
     net::URLRequestTestJob::Start();
   }
 
@@ -448,8 +451,9 @@ class SelectCertificateBrowserClient : public TestContentBrowserClient {
   int call_count() { return call_count_; }
   net::CertificateList passed_certs() { return passed_certs_; }
 
-  void ContinueWithCertificate(net::X509Certificate* cert) {
-    delegate_->ContinueWithCertificate(cert);
+  void ContinueWithCertificate(net::X509Certificate* cert,
+                               net::SSLPrivateKey* pkey) {
+    delegate_->ContinueWithCertificate(cert, pkey);
     delegate_.reset();
   }
 
@@ -707,7 +711,7 @@ TEST_F(ClientCertResourceLoaderTest, WithStoreLookup) {
   EXPECT_EQ(dummy_certs, test_client.passed_certs());
 
   // Continue the request.
-  test_client.ContinueWithCertificate(dummy_certs[0].get());
+  test_client.ContinueWithCertificate(dummy_certs[0].get(), nullptr);
   raw_ptr_resource_handler_->WaitForResponseComplete();
   EXPECT_EQ(net::OK, raw_ptr_resource_handler_->status().error());
 
@@ -734,7 +738,8 @@ TEST_F(ClientCertResourceLoaderTest, WithNullStore) {
   // Continue the request.
   scoped_refptr<net::X509Certificate> cert(
       new net::X509Certificate("test", "test", base::Time(), base::Time()));
-  test_client.ContinueWithCertificate(cert.get());
+
+  test_client.ContinueWithCertificate(cert.get(), nullptr);
   raw_ptr_resource_handler_->WaitForResponseComplete();
   EXPECT_EQ(net::OK, raw_ptr_resource_handler_->status().error());