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

Unified Diff: net/http/failing_http_transaction_factory.cc

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 3 months 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
Index: net/http/failing_http_transaction_factory.cc
diff --git a/net/http/failing_http_transaction_factory.cc b/net/http/failing_http_transaction_factory.cc
index f63cd4d26248a5336813fe35f30d49a47800a5c1..348a8f3929821908c611191fba7eda99d6b458f8 100644
--- a/net/http/failing_http_transaction_factory.cc
+++ b/net/http/failing_http_transaction_factory.cc
@@ -16,6 +16,7 @@
#include "net/base/upload_progress.h"
#include "net/http/http_response_info.h"
#include "net/socket/connection_attempts.h"
+#include "net/ssl/ssl_private_key.h"
davidben 2015/09/25 20:10:11 Forward decl
svaldez 2015/09/28 16:54:52 Done.
namespace net {
@@ -41,6 +42,7 @@ class FailingHttpTransaction : public HttpTransaction {
const BoundNetLog& net_log) override;
int RestartIgnoringLastError(const CompletionCallback& callback) override;
int RestartWithCertificate(X509Certificate* client_cert,
+ SSLPrivateKey* client_pkey,
const CompletionCallback& callback) override;
int RestartWithAuth(const AuthCredentials& credentials,
const CompletionCallback& callback) override;
@@ -94,7 +96,8 @@ int FailingHttpTransaction::RestartIgnoringLastError(
int FailingHttpTransaction::RestartWithCertificate(
X509Certificate* client_cert,
- const CompletionCallback& callback) {
+ SSLPrivateKey* client_pkey,
+ const CompletionCallback& callback) {
return ERR_FAILED;
}
@@ -206,4 +209,3 @@ HttpNetworkSession* FailingHttpTransactionFactory::GetSession() {
}
} // namespace net
-

Powered by Google App Engine
This is Rietveld 408576698