Move redirect_chain from NavigationEntry to FrameNavigationEntry.

content/browser/frame_host/navigation_entry_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigation_entry_impl.h"
 
 #include <stddef.h>
 
 #include <queue>
 #include <utility>
@@ skipping 533 matching lines @@
 void NavigationEntryImpl::SetHttpStatusCode(int http_status_code) {
   http_status_code_ = http_status_code;
 }
 
 int NavigationEntryImpl::GetHttpStatusCode() const {
   return http_status_code_;
 }
 
 void NavigationEntryImpl::SetRedirectChain(
     const std::vector<GURL>& redirect_chain) {
-  redirect_chain_ = redirect_chain;
+  root_node()->frame_entry->set_redirect_chain(redirect_chain);
 }
 
 const std::vector<GURL>& NavigationEntryImpl::GetRedirectChain() const {
-  return redirect_chain_;
+  return root_node()->frame_entry->redirect_chain();
 }
 
 bool NavigationEntryImpl::IsRestored() const {
   return restore_type_ != RestoreType::NONE;
 }
 
 void NavigationEntryImpl::SetCanLoadLocalResources(bool allow) {
   can_load_local_resources_ = allow;
 }
 
@@ skipping 59 matching lines @@
   copy->screenshot_ = screenshot_;
   copy->extra_headers_ = extra_headers_;
   copy->base_url_for_data_url_ = base_url_for_data_url_;
 #if defined(OS_ANDROID)
   copy->data_url_as_string_ = data_url_as_string_;
 #endif
   // ResetForCommit: is_renderer_initiated_
   copy->cached_display_title_ = cached_display_title_;
   // ResetForCommit: transferred_global_request_id_
   // ResetForCommit: should_replace_entry_
-  copy->redirect_chain_ = redirect_chain_;
   // ResetForCommit: should_clear_history_list_
   // ResetForCommit: frame_tree_node_id_
   // ResetForCommit: intent_received_timestamp_
 #if defined(OS_ANDROID)
   copy->has_user_gesture_ = has_user_gesture_;
 #endif
   // ResetForCommit: reload_type_
   copy->extra_data_ = extra_data_;
 
   return copy;
@@ skipping 46 matching lines @@
     const std::set<std::string>& subframe_unique_names,
     bool has_committed_real_load,
     bool intended_as_new_entry,
     int pending_history_list_offset,
     int current_history_list_offset,
     int current_history_list_length) const {
   // Set the redirect chain to the navigation's redirects, unless returning to a
   // completed navigation (whose previous redirects don't apply).
   std::vector<GURL> redirects;
   if (ui::PageTransitionIsNewNavigation(GetTransitionType())) {
-    redirects = GetRedirectChain();
+    redirects = frame_entry.redirect_chain();
   }
 
   int pending_offset_to_send = pending_history_list_offset;
   int current_offset_to_send = current_history_list_offset;
   int current_length_to_send = current_history_list_length;
   if (should_clear_history_list()) {
     // Set the history list related parameters to the same values a
     // NavigationController would return before its first navigation. This will
     // fully clear the RenderView's view of the session history.
     pending_offset_to_send = -1;
@@ skipping 55 matching lines @@
 }
 
 void NavigationEntryImpl::AddOrUpdateFrameEntry(
     FrameTreeNode* frame_tree_node,
     int64_t item_sequence_number,
     int64_t document_sequence_number,
     SiteInstanceImpl* site_instance,
     scoped_refptr<SiteInstanceImpl> source_site_instance,
     const GURL& url,
     const Referrer& referrer,
+    const std::vector<GURL>& redirect_chain,
     const PageState& page_state,
     const std::string& method,
     int64_t post_id) {
   // We should only have an empty PageState if the navigation is new, and thus
   // page ID is -1.
   if (!page_state.IsValid() && GetPageID() != -1) {
     // Temporarily generate a minidump to diagnose https://crbug.com/568703.
     base::debug::DumpWithoutCrashing();
     NOTREACHED() << "Shouldn't set an empty PageState.";
   }
 
   // If this is called for the main frame, the FrameNavigationEntry is
   // guaranteed to exist, so just update it directly and return.
   if (frame_tree_node->IsMainFrame()) {
     // If the document of the FrameNavigationEntry is changing, we must clear
     // any child FrameNavigationEntries.
     if (root_node()->frame_entry->document_sequence_number() !=
         document_sequence_number)
       root_node()->children.clear();
 
     root_node()->frame_entry->UpdateEntry(
         frame_tree_node->unique_name(), item_sequence_number,
         document_sequence_number, site_instance,
-        std::move(source_site_instance), url, referrer, page_state, method,
-        post_id);
+        std::move(source_site_instance), url, referrer, redirect_chain,
+        page_state, method, post_id);
     return;
   }
 
   // We should already have a TreeNode for the parent node by the time this node
   // commits.  Find it first.
   NavigationEntryImpl::TreeNode* parent_node =
       FindFrameEntry(frame_tree_node->parent());
   if (!parent_node) {
     // The renderer should not send a commit for a subframe before its parent.
     // TODO(creis): Kill the renderer if we get here.
     return;
   }
 
   // Now check whether we have a TreeNode for the node itself.
   const std::string& unique_name = frame_tree_node->unique_name();
   for (TreeNode* child : parent_node->children) {
     if (child->frame_entry->frame_unique_name() == unique_name) {
       // If the document of the FrameNavigationEntry is changing, we must clear
       // any child FrameNavigationEntries.
       if (child->frame_entry->document_sequence_number() !=
           document_sequence_number)
         child->children.clear();
 
       // Update the existing FrameNavigationEntry (e.g., for replaceState).
-      child->frame_entry->UpdateEntry(unique_name, item_sequence_number,
-                                      document_sequence_number, site_instance,
-                                      std::move(source_site_instance), url,
-                                      referrer, page_state, method, post_id);
+      child->frame_entry->UpdateEntry(
+          unique_name, item_sequence_number, document_sequence_number,
+          site_instance, std::move(source_site_instance), url, referrer,
+          redirect_chain, page_state, method, post_id);
       return;
     }
   }
 
   // No entry exists yet, so create a new one.
   // Unordered list, since we expect to look up entries by frame sequence number
   // or unique name.
   FrameNavigationEntry* frame_entry = new FrameNavigationEntry(
       unique_name, item_sequence_number, document_sequence_number,
       site_instance, std::move(source_site_instance), url, referrer, method,
       post_id);
   frame_entry->SetPageState(page_state);
+  frame_entry->set_redirect_chain(redirect_chain);
   parent_node->children.push_back(
       new NavigationEntryImpl::TreeNode(parent_node, frame_entry));
 }
 
 FrameNavigationEntry* NavigationEntryImpl::GetFrameEntry(
     FrameTreeNode* frame_tree_node) const {
   NavigationEntryImpl::TreeNode* tree_node = FindFrameEntry(frame_tree_node);
   return tree_node ? tree_node->frame_entry.get() : nullptr;
 }
 
@@ skipping 69 matching lines @@
       return node;
 
     // Enqueue any children and keep looking.
     for (auto* child : node->children)
       work_queue.push(child);
   }
   return nullptr;
 }
 
 }  // namespace content