Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Unified Diff: content/browser/loader/resource_loader_unittest.cc

Issue 1422573008: Plumbing SSLPrivateKey (//net) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing un-needed forward decl. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/loader/resource_loader.cc ('k') | net/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6d0a999014d8b5010ddf87fec2c19ef24548b262..9f669e4441dddefd60c83ce6a2737f28dadcbbaf 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();
}
@@ -707,7 +709,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(nullptr);
raw_ptr_resource_handler_->WaitForResponseComplete();
EXPECT_EQ(net::OK, raw_ptr_resource_handler_->status().error());
@@ -732,9 +734,7 @@ TEST_F(ClientCertResourceLoaderTest, WithNullStore) {
EXPECT_EQ(net::CertificateList(), test_client.passed_certs());
// 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(nullptr);
raw_ptr_resource_handler_->WaitForResponseComplete();
EXPECT_EQ(net::OK, raw_ptr_resource_handler_->status().error());
« no previous file with comments | « content/browser/loader/resource_loader.cc ('k') | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698