Chromium Code Reviews| Index: content/child/resource_dispatcher.cc |
| diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc |
| index 4484df9e30a3236d7084774c30afbec7d6cbf2cb..c6b112b903ab53bfb10076314d57752d10cff551 100644 |
| --- a/content/child/resource_dispatcher.cc |
| +++ b/content/child/resource_dispatcher.cc |
| @@ -659,8 +659,8 @@ int ResourceDispatcher::StartAsync( |
| mojom::URLLoaderClientPtr client_ptr; |
| client->Bind(&client_ptr); |
| url_loader_factory->CreateLoaderAndStart(MakeRequest(&url_loader), |
| - routing_id, request_id, *request, |
| - std::move(client_ptr)); |
| + routing_id, request_id, 0, |
| + *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 { |
| @@ -765,6 +765,7 @@ void ResourceDispatcher::ContinueForNavigation( |
| // pull the StreamOverride's one in |
| // WebURLLoaderImpl::Context::OnReceivedResponse. |
| client_ptr->OnReceiveResponse(ResourceResponseHead(), |
| + base::Optional<net::SSLInfo>(), |
|
dcheng
2017/04/13 21:12:15
Ditto with base::nullopt, here and elsewhere
jam
2017/04/13 23:04:22
Done.
|
| mojom::DownloadedTempFilePtr()); |
| // Start streaming now. |
| client_ptr->OnStartLoadingResponseBody(std::move(consumer_handle)); |