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

Unified Diff: net/url_request/url_fetcher_core.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/url_request/url_fetcher_core.cc
diff --git a/net/url_request/url_fetcher_core.cc b/net/url_request/url_fetcher_core.cc
index e07dcdfc7931b7a332d3d7a35eae08abf60f5169..a18c4b8b1ea1a2c77cb6df5b397b570ea5ec446b 100644
--- a/net/url_request/url_fetcher_core.cc
+++ b/net/url_request/url_fetcher_core.cc
@@ -24,6 +24,7 @@
#include "net/base/upload_data_stream.h"
#include "net/base/upload_file_element_reader.h"
#include "net/http/http_response_headers.h"
+#include "net/ssl/ssl_private_key.h"
davidben 2015/09/25 20:10:12 I don't think this include is actually needed, is
svaldez 2015/09/28 16:54:53 Done.
#include "net/url_request/redirect_info.h"
#include "net/url_request/url_fetcher_delegate.h"
#include "net/url_request/url_fetcher_response_writer.h"
@@ -437,7 +438,7 @@ void URLFetcherCore::OnCertificateRequested(
DCHECK(network_task_runner_->BelongsToCurrentThread());
if (g_ignore_certificate_requests) {
- request->ContinueWithCertificate(NULL);
+ request->ContinueWithCertificate(NULL, NULL);
davidben 2015/09/25 20:10:12 Nit: While you're here, want to switch these both
svaldez 2015/09/28 16:54:53 Done.
} else {
request->Cancel();
}

Powered by Google App Engine
This is Rietveld 408576698