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..558810537b35c8049a7cc71feb679701b0604e4c 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -38,6 +38,7 @@
 #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_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 +164,8 @@ class MockClientCertURLRequestJob : public net::URLRequestTestJob {
                    this, cert_request_info));
   }
 
-  void ContinueWithCertificate(net::X509Certificate* cert) override {
+  void ContinueWithCertificate(net::X509Certificate* cert,
+                               net::SSLPrivateKey* private_key) override {
     net::URLRequestTestJob::Start();
   }
 
@@ -448,8 +450,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* private_key) {
+    delegate_->ContinueWithCertificate(cert, private_key);
     delegate_.reset();
   }
 
@@ -707,7 +710,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);

[davidben, 2015/10/13 20:32:15]

Given that this call does absolutely nothing with the certificate, I would
actually drop cert too and pass in nullptr. Maybe explicitly say "Continue the
request with no certificate."

Also helps in trying to get rid of that very confusing X509Certificate
constructor that creates a broken X509Certificate. I'm guessing this is why you
wanted to add an os_cert_handle check.

[svaldez, 2015/10/14 15:06:18]

Done.

   raw_ptr_resource_handler_->WaitForResponseComplete();
   EXPECT_EQ(net::OK, raw_ptr_resource_handler_->status().error());
 
@@ -734,7 +737,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);

[davidben, 2015/10/13 20:32:15]

Ditto

[svaldez, 2015/10/14 15:06:18]

Done.

   raw_ptr_resource_handler_->WaitForResponseComplete();
   EXPECT_EQ(net::OK, raw_ptr_resource_handler_->status().error());