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

Unified Diff: content/network/url_loader_impl.cc

Issue 2817033002: Plumb the net::SSLInfo to the browser process when it's using the network service. (Closed)
Patch Set: review comments Created 3 years, 8 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: content/network/url_loader_impl.cc
diff --git a/content/network/url_loader_impl.cc b/content/network/url_loader_impl.cc
index a29cec47f2a9c3f33fd4303681cc64929e3b8f5b..1793023a7d2994ddde72317a2cfcd8b9f4f01a21 100644
--- a/content/network/url_loader_impl.cc
+++ b/content/network/url_loader_impl.cc
@@ -6,6 +6,7 @@
#include "base/task_scheduler/post_task.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "content/common/url_loader_factory.mojom.h"
#include "content/network/net_adapters.h"
#include "content/network/network_context.h"
#include "content/public/common/referrer.h"
@@ -149,9 +150,11 @@ std::unique_ptr<net::UploadDataStream> CreateUploadDataStream(
URLLoaderImpl::URLLoaderImpl(
NetworkContext* context,
mojom::URLLoaderAssociatedRequest url_loader_request,
+ int32_t options,
const ResourceRequest& request,
mojom::URLLoaderClientPtr url_loader_client)
: context_(context),
+ options_(options),
connected_(true),
binding_(this, std::move(url_loader_request)),
url_loader_client_(std::move(url_loader_client)),
@@ -238,8 +241,11 @@ void URLLoaderImpl::OnResponseStarted(net::URLRequest* url_request) {
scoped_refptr<ResourceResponse> response = new ResourceResponse();
PopulateResourceResponse(url_request_.get(), response.get());
+ base::Optional<net::SSLInfo> ssl_info;
+ if (options_ & mojom::kURLLoadOptionSendSSLInfo)
+ ssl_info = url_request_->ssl_info();
mojom::DownloadedTempFilePtr downloaded_file_ptr;
- url_loader_client_->OnReceiveResponse(response->head,
+ url_loader_client_->OnReceiveResponse(response->head, ssl_info,
std::move(downloaded_file_ptr));
net::IOBufferWithSize* metadata = url_request->response_info().metadata.get();

Powered by Google App Engine
This is Rietveld 408576698