| Index: content/browser/frame_host/navigation_request.cc
|
| diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
|
| index 1139604533b8c68a1d9239703294f9edc0664e5f..3ed4510f56f7d6f6c77d83fa6cda73449e46727f 100644
|
| --- a/content/browser/frame_host/navigation_request.cc
|
| +++ b/content/browser/frame_host/navigation_request.cc
|
| @@ -166,9 +166,10 @@ NavigationRequest::NavigationRequest(
|
| associated_site_instance_type_(AssociatedSiteInstanceType::NONE) {
|
| DCHECK(!browser_initiated || (entry != nullptr && frame_entry != nullptr));
|
| if (browser_initiated) {
|
| - // TODO(clamy): use the FrameNavigationEntry for the source SiteInstance
|
| - // once it has been moved from the NavigationEntry.
|
| - source_site_instance_ = entry->source_site_instance();
|
| + FrameNavigationEntry* frame_entry = entry->GetFrameEntry(frame_tree_node);
|
| + if (frame_entry)
|
| + source_site_instance_ = frame_entry->source_site_instance();
|
| +
|
| dest_site_instance_ = frame_entry->site_instance();
|
| restore_type_ = entry->restore_type();
|
| is_view_source_ = entry->IsViewSourceMode();
|
|
|