| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index ec495b9e0488e054be820d3e978b260280385dea..fc8a7952ff308041ecfcecb8ac207abe851fff4b 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -5238,7 +5238,7 @@ void RenderFrameImpl::FocusedNodeChangedForAccessibility(const WebNode& node) {
|
| void RenderFrameImpl::OnCommitNavigation(
|
| const ResourceResponseHead& response,
|
| const GURL& stream_url,
|
| - mojo::DataPipeConsumerHandle handle,
|
| + const FrameMsg_CommitDataNetworkService_Params& commit_data,
|
| const CommonNavigationParams& common_params,
|
| const RequestNavigationParams& request_params) {
|
| CHECK(IsBrowserSideNavigationEnabled());
|
| @@ -5247,12 +5247,19 @@ void RenderFrameImpl::OnCommitNavigation(
|
| std::unique_ptr<StreamOverrideParameters> stream_override(
|
| new StreamOverrideParameters());
|
| stream_override->stream_url = stream_url;
|
| - stream_override->consumer_handle = mojo::ScopedDataPipeConsumerHandle(handle);
|
| + stream_override->consumer_handle =
|
| + mojo::ScopedDataPipeConsumerHandle(commit_data.handle);
|
| stream_override->response = response;
|
| stream_override->redirects = request_params.redirects;
|
| stream_override->redirect_responses = request_params.redirect_response;
|
| stream_override->redirect_infos = request_params.redirect_infos;
|
|
|
| + if (commit_data.url_loader_factory.is_valid()) {
|
| + // Chrome doesn't use interface versioning.
|
| + url_loader_factory_.Bind(mojom::URLLoaderFactoryPtrInfo(
|
| + mojo::ScopedMessagePipeHandle(commit_data.url_loader_factory), 0u));
|
| + }
|
| +
|
| // If the request was initiated in the context of a user gesture then make
|
| // sure that the navigation also executes in the context of a user gesture.
|
| std::unique_ptr<blink::WebScopedUserGesture> gesture(
|
|
|