summaryrefslogtreecommitdiff
path: root/chromium/content/browser/loader/cross_site_resource_handler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/loader/cross_site_resource_handler.cc')
-rw-r--r--chromium/content/browser/loader/cross_site_resource_handler.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/content/browser/loader/cross_site_resource_handler.cc b/chromium/content/browser/loader/cross_site_resource_handler.cc
index fad4024ee28..c645670d25c 100644
--- a/chromium/content/browser/loader/cross_site_resource_handler.cc
+++ b/chromium/content/browser/loader/cross_site_resource_handler.cc
@@ -63,7 +63,7 @@ struct CrossSiteResponseParams {
};
void OnCrossSiteResponseHelper(const CrossSiteResponseParams& params) {
- scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request(
+ std::unique_ptr<CrossSiteTransferringRequest> cross_site_transferring_request(
new CrossSiteTransferringRequest(params.global_request_id));
RenderFrameHostImpl* rfh =
@@ -110,7 +110,7 @@ CheckNavigationPolicyOnUI(GURL real_url, int process_id, int render_frame_id) {
} // namespace
CrossSiteResourceHandler::CrossSiteResourceHandler(
- scoped_ptr<ResourceHandler> next_handler,
+ std::unique_ptr<ResourceHandler> next_handler,
net::URLRequest* request)
: LayeredResourceHandler(request, std::move(next_handler)),
has_started_response_(false),
@@ -327,7 +327,8 @@ void CrossSiteResourceHandler::StartCrossSiteTransition(
int render_frame_id = info->GetRenderFrameID();
transfer_url_chain = request()->url_chain();
referrer = Referrer(GURL(request()->referrer()), info->GetReferrerPolicy());
- ResourceDispatcherHostImpl::Get()->MarkAsTransferredNavigation(global_id);
+ ResourceDispatcherHostImpl::Get()->MarkAsTransferredNavigation(global_id,
+ response_);
BrowserThread::PostTask(
BrowserThread::UI,