Move redirect_chain from NavigationEntry to FrameNavigationEntry.

content/browser/frame_host/navigation_entry_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 125 matching lines @@
   base::Time GetTimestamp() const override;
   void SetCanLoadLocalResources(bool allow) override;
   bool GetCanLoadLocalResources() const override;
   void SetExtraData(const std::string& key,
                     const base::string16& data) override;
   bool GetExtraData(const std::string& key,
                     base::string16* data) const override;
   void ClearExtraData(const std::string& key) override;
   void SetHttpStatusCode(int http_status_code) override;
   int GetHttpStatusCode() const override;
-  void SetRedirectChain(const std::vector<GURL>& redirects) override;
-  const std::vector<GURL>& GetRedirectChain() const override;
+  void SetMainFrameRedirectChain(const std::vector<GURL>& redirects) override;
+  const std::vector<GURL>& GetMainFrameRedirectChain() const override;
   bool IsRestored() const override;
 
   // Creates a copy of this NavigationEntryImpl that can be modified
   // independently from the original.  Does not copy any value that would be
   // cleared in ResetForCommit.  Unlike |CloneAndReplace|, this does not check
   // whether the subframe history items are for frames that are still in the
   // current page.
   std::unique_ptr<NavigationEntryImpl> Clone() const;
 
   // Like |Clone|, but replaces the FrameNavigationEntry corresponding to
@@ skipping 54 matching lines @@
   // exists, or else the existing one (which might be shared with other
   // NavigationEntries) is updated with the given parameters.
   // Does nothing if there is no entry already and |url| is about:blank, since
   // that does not count as a real commit.
   void 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 std::vector<GURL>& redirect_chain,
       const GURL& url,
       const Referrer& referrer,
       const PageState& page_state,
       const std::string& method,
       int64_t post_id);
 
   // Returns the FrameNavigationEntry corresponding to |frame_tree_node|, if
   // there is one in this NavigationEntry.
   FrameNavigationEntry* GetFrameEntry(FrameTreeNode* frame_tree_node) const;
 
@@ skipping 244 matching lines @@
   // the state of the URL, it has to be reloaded in a different site instance.
   // In such case, we must treat it as an existing navigation in the new site
   // instance, instead of a new navigation. This value should not be persisted
   // and is cleared in |ResetForCommit|.
   //
   // We also use this flag for cross-process redirect navigations, so that the
   // browser will replace the current navigation entry (which is the page
   // doing the redirect).
   bool should_replace_entry_;
 
-  // This is used when transferring a pending entry from one process to another.
-  // We also send this data through session sync for offline analysis.
-  // It is preserved after commit but should not be persisted.
-  std::vector<GURL> redirect_chain_;
-
   // This is set to true when this entry's navigation should clear the session
   // history both on the renderer and browser side. The browser side history
   // won't be cleared until the renderer has committed this navigation. This
   // entry is not persisted by the session restore system, as it is always
   // cleared in |ResetForCommit|.
   bool should_clear_history_list_;
 
   // Set when this entry should be able to access local file:// resources. This
   // value is not needed after the entry commits and is not persisted.
   bool can_load_local_resources_;
@@ skipping 18 matching lines @@
   // persisted, unless specific data is taken out/put back in at save/restore
   // time (see TabNavigation for an example of this).
   std::map<std::string, base::string16> extra_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_