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

Unified Diff: content/child/resource_dispatcher.cc

Issue 2817033002: Plumb the net::SSLInfo to the browser process when it's using the network service. (Closed)
Patch Set: add net::SSLInfo test 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/child/resource_dispatcher.cc
diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc
index 4484df9e30a3236d7084774c30afbec7d6cbf2cb..bf11b8bc33ff715117a08e8ab39ec9d080357fde 100644
--- a/content/child/resource_dispatcher.cc
+++ b/content/child/resource_dispatcher.cc
@@ -658,9 +658,9 @@ int ResourceDispatcher::StartAsync(
mojom::URLLoaderAssociatedPtr url_loader;
mojom::URLLoaderClientPtr client_ptr;
client->Bind(&client_ptr);
- url_loader_factory->CreateLoaderAndStart(MakeRequest(&url_loader),
- routing_id, request_id, *request,
- std::move(client_ptr));
+ url_loader_factory->CreateLoaderAndStart(
+ MakeRequest(&url_loader), routing_id, request_id,
+ mojom::kURLLoadOptionNone, *request, std::move(client_ptr));
pending_requests_[request_id]->url_loader = std::move(url_loader);
pending_requests_[request_id]->url_loader_client = std::move(client);
} else {
@@ -764,7 +764,7 @@ void ResourceDispatcher::ContinueForNavigation(
// the request. ResourceResponseHead can be empty here because we
// pull the StreamOverride's one in
// WebURLLoaderImpl::Context::OnReceivedResponse.
- client_ptr->OnReceiveResponse(ResourceResponseHead(),
+ client_ptr->OnReceiveResponse(ResourceResponseHead(), base::nullopt,
mojom::DownloadedTempFilePtr());
// Start streaming now.
client_ptr->OnStartLoadingResponseBody(std::move(consumer_handle));
« no previous file with comments | « content/browser/service_worker/service_worker_fetch_dispatcher.cc ('k') | content/child/url_loader_client_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698