Move redirect_chain from NavigationEntry to FrameNavigationEntry.

content/browser/frame_host/frame_navigation_entry.h

 // Copyright 2015 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_FRAME_NAVIGATION_ENTRY_H_
 #define CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 13 matching lines @@
 // frame.
 //
 // If SiteIsolationPolicy::UseSubframeNavigationEntries is true, there will be a
 // tree of FrameNavigationEntries in each NavigationEntry, one per frame.
 // TODO(creis): Share these FrameNavigationEntries across NavigationEntries if
 // the frame hasn't changed.
 class CONTENT_EXPORT FrameNavigationEntry
     : public base::RefCounted<FrameNavigationEntry> {
  public:
   FrameNavigationEntry();
   FrameNavigationEntry(const std::string& frame_unique_name,

[Charlie Reis, 2016/09/28 04:13:17]

I'm debating whether we should include it as a parameter here as well.  This is
mostly the same as UpdateEntry, apart from PageState.  I suppose it's ok to omit
it unless we find a need for it, though.

[arthursonzogni, 2016/09/28 16:36:14]

I don't know. I think I didn't include it here because it wasn't previously
included in NavigationEntry neither. Let's say it will be added once it become
useful.

                        int64_t item_sequence_number,
                        int64_t document_sequence_number,
                        scoped_refptr<SiteInstanceImpl> site_instance,
                        scoped_refptr<SiteInstanceImpl> source_site_instance,
                        const GURL& url,
                        const Referrer& referrer,
                        const std::string& method,
                        int64_t post_id);
 
   // Creates a copy of this FrameNavigationEntry that can be modified
   // independently from the original.
   FrameNavigationEntry* Clone() const;
 
   // Updates all the members of this entry.
   void UpdateEntry(const std::string& frame_unique_name,
                    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,

[Charlie Reis, 2016/09/28 04:13:17]

Throughout this file, we should list redirect_chain lower among the other
parameters/members, perhaps between referrer and page_state.

[arthursonzogni, 2016/09/28 16:36:14]

Done.

                    const GURL& url,
                    const Referrer& referrer,
                    const PageState& page_state,
                    const std::string& method,
                    int64_t post_id);
 
   // The unique name of the frame this entry is for.  This is a stable name for
   // the frame based on its position in the tree and relation to other named
   // frames, which does not change after cross-process navigations or restores.
   // Only the main frame can have an empty name.
@@ skipping 30 matching lines @@
   // renderer-initiated navigations and is cleared once the navigation has
   // committed.
   void set_source_site_instance(
       scoped_refptr<SiteInstanceImpl> source_site_instance) {
     source_site_instance_ = std::move(source_site_instance);
   }
   SiteInstanceImpl* source_site_instance() const {
     return source_site_instance_.get();
   }
 
+  // The redirect chain traversed during this frame navigation, from the initial
+  // redirecting URL to the final non-redirecting current URL.
+  void set_redirect_chain(const std::vector<GURL>& redirect_chain) {
+    redirect_chain_ = redirect_chain;
+  }
+  const std::vector<GURL>& redirect_chain() const { return redirect_chain_; }
+
   // The actual URL loaded in the frame.  This is in contrast to the virtual
   // URL, which is shown to the user.
   void set_url(const GURL& url) { url_ = url; }
   const GURL& url() const { return url_; }
 
   // The referring URL.  Can be empty.
   void set_referrer(const Referrer& referrer) { referrer_ = referrer; }
   const Referrer& referrer() const { return referrer_; }
 
   void SetPageState(const PageState& page_state);
@@ skipping 22 matching lines @@
   // currently managed by NavigationEntry, but the logic will move here.
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   // See the accessors above for descriptions.
   std::string frame_unique_name_;
   int64_t item_sequence_number_;
   int64_t document_sequence_number_;
   scoped_refptr<SiteInstanceImpl> site_instance_;
   // This member is cleared at commit time and is not persisted.
   scoped_refptr<SiteInstanceImpl> source_site_instance_;
+
+  // 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_;

[arthursonzogni, 2016/09/27 12:56:20]

I am not sure of the comment message. Which sentences are still necessary and
correct?

[Charlie Reis, 2016/09/28 04:13:17]

The first sentence is still true (see NavigatorImpl::RequestTransferURL for
transfers, and NavigationControllerImpl::LoadURLWithParams for OpenURL).

The second sentence is only true for main frames, so let's clarify that.  (See
ContentSerializedNavigationBuilder::FromNavigationEntry.)

The third sentence is still true.

nit: As above, let's move this down between referrer_ and page_state_.

[arthursonzogni, 2016/09/28 16:36:14]

Thanks!

+
   GURL url_;
   Referrer referrer_;
   // TODO(creis): Change this to FrameState.
   PageState page_state_;
   std::string method_;
   int64_t post_id_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameNavigationEntry);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_