| 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 ead62611e39829cde6c54ff43a7f63d6736599bb..84b636465d708ef3d8f1cb9f817ee5bc353b7674 100644
|
| --- a/content/browser/frame_host/navigation_request.cc
|
| +++ b/content/browser/frame_host/navigation_request.cc
|
| @@ -210,7 +210,7 @@ std::unique_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated(
|
| entry.ConstructRequestNavigationParams(
|
| frame_entry, is_same_document_history_load,
|
| is_history_navigation_in_new_child,
|
| - entry.GetSubframeUniqueNames(frame_tree_node),
|
| + entry.GetSubtreePageStates(frame_tree_node),
|
| frame_tree_node->has_committed_real_load(),
|
| controller->GetPendingEntryIndex() == -1,
|
| controller->GetIndexOfEntry(&entry),
|
| @@ -234,14 +234,14 @@ std::unique_ptr<NavigationRequest> NavigationRequest::CreateRendererInitiated(
|
| // renderer and sent to the browser instead of being measured here.
|
| // TODO(clamy): The pending history list offset should be properly set.
|
| RequestNavigationParams request_params(
|
| - false, // is_overriding_user_agent
|
| - std::vector<GURL>(), // redirects
|
| - false, // can_load_local_resources
|
| - PageState(), // page_state
|
| - 0, // nav_entry_id
|
| - false, // is_same_document_history_load
|
| - false, // is_history_navigation_in_new_child
|
| - std::map<std::string, bool>(), // subframe_unique_names
|
| + false, // is_overriding_user_agent
|
| + std::vector<GURL>(), // redirects
|
| + false, // can_load_local_resources
|
| + PageState(), // page_state
|
| + 0, // nav_entry_id
|
| + false, // is_same_document_history_load
|
| + false, // is_history_navigation_in_new_child
|
| + std::map<std::string, PageState>(), // subtree_page_states
|
| frame_tree_node->has_committed_real_load(),
|
| false, // intended_as_new_entry
|
| -1, // pending_history_list_offset
|
|
|