| Index: content/browser/frame_host/navigator_impl.cc
|
| diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
|
| index a25c56910565a66d44516a2022fb1c61b469ef7d..7c061bfee2e67a3124a0ca3096ea71d3fe098eaf 100644
|
| --- a/content/browser/frame_host/navigator_impl.cc
|
| +++ b/content/browser/frame_host/navigator_impl.cc
|
| @@ -820,8 +820,9 @@ void NavigatorImpl::RequestTransferURL(
|
| }
|
| entry->AddOrUpdateFrameEntry(
|
| node, -1, -1, nullptr,
|
| - static_cast<SiteInstanceImpl*>(source_site_instance), dest_url,
|
| - referrer_to_use, PageState(), method, -1);
|
| + static_cast<SiteInstanceImpl*>(source_site_instance),
|
| + redirect_chain, dest_url, referrer_to_use, PageState(), method,
|
| + -1);
|
| } else {
|
| // Main frame case.
|
| entry = NavigationEntryImpl::FromNavigationEntry(
|
| @@ -830,9 +831,9 @@ void NavigatorImpl::RequestTransferURL(
|
| std::string(), controller_->GetBrowserContext()));
|
| entry->root_node()->frame_entry->set_source_site_instance(
|
| static_cast<SiteInstanceImpl*>(source_site_instance));
|
| + entry->SetMainFrameRedirectChain(redirect_chain);
|
| }
|
|
|
| - entry->SetRedirectChain(redirect_chain);
|
| // Don't allow an entry replacement if there is no entry to replace.
|
| // http://crbug.com/457149
|
| if (should_replace_current_entry && controller_->GetEntryCount() > 0)
|
| @@ -1149,7 +1150,8 @@ void NavigatorImpl::DidStartMainFrameNavigation(
|
| entry->set_transferred_global_request_id(
|
| pending_entry->transferred_global_request_id());
|
| entry->set_should_replace_entry(pending_entry->should_replace_entry());
|
| - entry->SetRedirectChain(pending_entry->GetRedirectChain());
|
| + entry->SetMainFrameRedirectChain(
|
| + pending_entry->GetMainFrameRedirectChain());
|
| }
|
|
|
| // If there's a current NavigationHandle, update its pending NavEntry ID.
|
|
|