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

Unified Diff: content/browser/service_worker/service_worker_fetch_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
« no previous file with comments | « content/browser/loader/url_loader_factory_impl_unittest.cc ('k') | content/child/resource_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_worker/service_worker_fetch_dispatcher.cc
diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.cc b/content/browser/service_worker/service_worker_fetch_dispatcher.cc
index 806edde1039516868599cc23c24391f468a9bb01..9a4e31e1de11a2ce6f7db3ba8688e43698f55d2f 100644
--- a/content/browser/service_worker/service_worker_fetch_dispatcher.cc
+++ b/content/browser/service_worker/service_worker_fetch_dispatcher.cc
@@ -161,8 +161,9 @@ class DelegatingURLLoaderClient final : public mojom::URLLoaderClient {
}
void OnReceiveResponse(
const ResourceResponseHead& head,
+ const base::Optional<net::SSLInfo>& ssl_info,
mojom::DownloadedTempFilePtr downloaded_file) override {
- client_->OnReceiveResponse(head, std::move(downloaded_file));
+ client_->OnReceiveResponse(head, ssl_info, std::move(downloaded_file));
DCHECK(on_response_);
std::move(on_response_).Run();
AddDevToolsCallback(
@@ -597,8 +598,8 @@ bool ServiceWorkerFetchDispatcher::MaybeStartNavigationPreload(
url_loader_factory->CreateLoaderAndStart(
mojo::MakeRequest(&url_loader_associated_ptr),
- original_info->GetRouteID(), request_id, request,
- std::move(url_loader_client_ptr_to_pass));
+ original_info->GetRouteID(), request_id, mojom::kURLLoadOptionNone,
+ request, std::move(url_loader_client_ptr_to_pass));
std::unique_ptr<DelegatingURLLoader> url_loader(
base::MakeUnique<DelegatingURLLoader>(
« no previous file with comments | « content/browser/loader/url_loader_factory_impl_unittest.cc ('k') | content/child/resource_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698