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

Unified Diff: content/child/web_url_loader_impl.cc

Issue 2900563002: Network service: Safe browsing check for sub-resources from renderer. (Closed)
Patch Set: . Created 3 years, 7 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/child/url_response_body_consumer_unittest.cc ('k') | content/child/web_url_loader_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/web_url_loader_impl.cc
diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index 0bf318d3cacc71ce9ba818d92404f22560203b21..047f6994027d02f640e47fdf08a227ea44a96480 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -627,8 +627,8 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
base::debug::DumpWithoutCrashing();
}
- const RequestExtraData empty_extra_data;
- const RequestExtraData* extra_data;
+ RequestExtraData empty_extra_data;
+ RequestExtraData* extra_data;
if (request.GetExtraData())
extra_data = static_cast<RequestExtraData*>(request.GetExtraData());
else
@@ -641,7 +641,8 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
DCHECK(defers_loading_ == NOT_DEFERRING);
resource_dispatcher_->StartSync(
std::move(resource_request), request.RequestorID(), sync_load_response,
- request.GetLoadingIPCType(), url_loader_factory_);
+ request.GetLoadingIPCType(), url_loader_factory_,
+ extra_data->TakeURLLoaderThrottles());
return;
}
@@ -652,7 +653,7 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
extra_data->frame_origin(),
base::MakeUnique<WebURLLoaderImpl::RequestPeerImpl>(this),
request.GetLoadingIPCType(), url_loader_factory_,
- std::move(consumer_handle));
+ extra_data->TakeURLLoaderThrottles(), std::move(consumer_handle));
if (defers_loading_ != NOT_DEFERRING)
resource_dispatcher_->SetDefersLoading(request_id_, true);
« no previous file with comments | « content/child/url_response_body_consumer_unittest.cc ('k') | content/child/web_url_loader_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698