Remove the FrameMsg_Navigate_Params

content/common/navigation_params.h

 // Copyright 2014 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_COMMON_NAVIGATION_PARAMS_H_
 #define CONTENT_COMMON_NAVIGATION_PARAMS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/common/frame_message_enums.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 namespace base {
 class RefCountedMemory;
 }
 
 namespace content {
 class NavigationEntry;
 
 // The following structures hold parameters used during a navigation. In
 // particular they are used by FrameMsg_Navigate, FrameMsg_CommitNavigation and
 // FrameHostMsg_BeginNavigation.
-// TODO(clamy): Depending on the avancement of the history refactoring move the
-// history parameters from FrameMsg_Navigate into one of the structs.
 
 // Used by all navigation IPCs.
 struct CONTENT_EXPORT CommonNavigationParams {
   CommonNavigationParams();
   CommonNavigationParams(const GURL& url,
                          const Referrer& referrer,
                          ui::PageTransition transition,
                          FrameMsg_Navigate_Type::Value navigation_type,
                          bool allow_download,
                          base::TimeTicks ui_timestamp,
@@ skipping 58 matching lines @@
 
   // True if the request was user initiated.
   bool has_user_gesture;
 };
 
 // Used by FrameMsg_Navigate.
 // PlzNavigate: sent to the renderer when the navigation is ready to commit.
 struct CONTENT_EXPORT CommitNavigationParams {
   CommitNavigationParams();
   CommitNavigationParams(bool is_overriding_user_agent,
-                         base::TimeTicks navigation_start);
+                         base::TimeTicks navigation_start,
+                         const std::vector<GURL>& redirects,
+                         bool can_load_local_resources,
+                         const std::string& frame_to_navigate,
+                         base::Time request_time);
   ~CommitNavigationParams();
 
   // Whether or not the user agent override string should be used.
   bool is_overriding_user_agent;
 
   // The navigationStart time to expose through the Navigation Timing API to JS.
   base::TimeTicks browser_navigation_start;
 
-  // TODO(clamy): Move the redirect chain here.
+  // Any redirect URLs that occurred before |url|. Useful for cross-process
+  // navigations; defaults to empty.
+  std::vector<GURL> redirects;
+
+  // Whether or not this url should be allowed to access local file://
+  // resources.
+  bool can_load_local_resources;
+
+  // If not empty, which frame to navigate.
+  std::string frame_to_navigate;
+
+  // The time the request was created. This is used by the old performance
+  // infrastructure to set up DocumentState associated with the RenderView.
+  // TODO(ppi): make it go away.
+  base::Time request_time;
 };
 
 // Used by FrameMsg_Navigate.
 // PlzNavigate: sent to the renderer when the navigation is ready to commit.
 struct CONTENT_EXPORT HistoryNavigationParams {
   HistoryNavigationParams();
   HistoryNavigationParams(const PageState& page_state,
                           int32 page_id,
                           int pending_history_list_offset,
                           int current_history_list_offset,
@@ skipping 18 matching lines @@
   // size of the session history list.
   int current_history_list_offset;
   int current_history_list_length;
 
   // Whether session history should be cleared. In that case, the RenderView
   // needs to notify the browser that the clearing was succesful when the
   // navigation commits.
   bool should_clear_history_list;
 };
 
+// Parameters needed at the start of a navigation. Used by FrameMsg_navigate.

[nasko, 2015/03/09 23:24:23]

nit: FrameMsg_Navigate

[clamy, 2015/03/10 16:45:44]

Done.

+// PlzNavigate: these parameters are not used in navigation.
+struct CONTENT_EXPORT StartNavigationParams {

[clamy, 2015/03/09 14:34:47]

I was not quite sure what to name those, so I'd be interested in better naming
suggestions :).

+  StartNavigationParams();
+  StartNavigationParams(
+      bool is_post,
+      const std::string& extra_headers,
+      const std::vector<unsigned char>& browser_initiated_post_data,
+      bool should_replace_current_entry,
+      int transferred_request_child_id,
+      int transferred_request_request_id);
+  ~StartNavigationParams();
+  // Whether the navigation is a POST request (as opposed to a GET).

[nasko, 2015/03/09 23:24:23]

nit: Empty line above the comment.

[clamy, 2015/03/10 16:45:44]

Done.

+  bool is_post;
+
+  // Extra headers (separated by \n) to send during the request.
+  std::string extra_headers;
+
+  // If is_post is true, holds the post_data information from browser. Empty
+  // otherwise.
+  std::vector<unsigned char> browser_initiated_post_data;
+
+  // Informs the RenderView the pending navigation should replace the current
+  // history entry when it commits. This is used for cross-process redirects so
+  // the transferred navigation can recover the navigation state.
+  bool should_replace_current_entry;
+
+  // The following two members identify a previous request that has been
+  // created before this navigation is being transferred to a new render view.
+  // This serves the purpose of recycling the old request.
+  // Unless this refers to a transferred navigation, these values are -1 and -1.
+  int transferred_request_child_id;
+  int transferred_request_request_id;
+};
+
 }  // namespace content
 
 #endif  // CONTENT_COMMON_NAVIGATION_PARAMS_H_