PlzNavigate: send history params at commit time to the renderer

content/common/frame_messages.h

Index: content/common/frame_messages.h
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index c3b5b622c61690e928e2b4409eff783030615660..5552a3aa22ae20ca3a2dbb604e03046b168afe76 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -224,11 +224,19 @@ IPC_STRUCT_TRAITS_BEGIN(content::BeginNavigationParams)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::CommitNavigationParams)
-  IPC_STRUCT_TRAITS_MEMBER(page_state)
   IPC_STRUCT_TRAITS_MEMBER(is_overriding_user_agent)
   IPC_STRUCT_TRAITS_MEMBER(browser_navigation_start)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(content::HistoryNavigationParams)
+  IPC_STRUCT_TRAITS_MEMBER(page_state)
+  IPC_STRUCT_TRAITS_MEMBER(page_id)
+  IPC_STRUCT_TRAITS_MEMBER(pending_history_list_offset)
+  IPC_STRUCT_TRAITS_MEMBER(current_history_list_offset)
+  IPC_STRUCT_TRAITS_MEMBER(current_history_list_length)
+  IPC_STRUCT_TRAITS_MEMBER(should_clear_history_list)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(content::FrameReplicationState)
   IPC_STRUCT_TRAITS_MEMBER(origin)
   IPC_STRUCT_TRAITS_MEMBER(sandbox_flags)
@@ -255,6 +263,7 @@ IPC_STRUCT_BEGIN(FrameMsg_Navigate_Params)
   // These structs contain parameters shared by other navigation IPCs.
   IPC_STRUCT_MEMBER(content::CommonNavigationParams, common_params)
   IPC_STRUCT_MEMBER(content::CommitNavigationParams, commit_params)
+  IPC_STRUCT_MEMBER(content::HistoryNavigationParams, history_params)
 
   // Whether the navigation is a POST request (as opposed to a GET).
   IPC_STRUCT_MEMBER(bool, is_post)
@@ -266,26 +275,6 @@ IPC_STRUCT_BEGIN(FrameMsg_Navigate_Params)
   // otherwise.
   IPC_STRUCT_MEMBER(std::vector<unsigned char>, browser_initiated_post_data)
 
-  // The page_id for this navigation, or -1 if it is a new navigation.  Back,
-  // Forward, and Reload navigations should have a valid page_id.  If the load
-  // succeeds, then this page_id will be reflected in the resultant
-  // FrameHostMsg_DidCommitProvisionalLoad message.
-  IPC_STRUCT_MEMBER(int32, page_id)
-
-  // For history navigations, this is the offset in the history list of the
-  // pending load. For non-history navigations, this will be ignored.
-  IPC_STRUCT_MEMBER(int, pending_history_list_offset)
-
-  // Informs the RenderView of where its current page contents reside in
-  // session history and the total size of the session history list.
-  IPC_STRUCT_MEMBER(int, current_history_list_offset)
-  IPC_STRUCT_MEMBER(int, current_history_list_length)
-
-  // Informs the RenderView the session history should be cleared. In that
-  // case, the RenderView needs to notify the browser that the clearing was
-  // succesful when the navigation commits.
-  IPC_STRUCT_MEMBER(bool, should_clear_history_list)
-
   // Any redirect URLs that occurred before |url|. Useful for cross-process
   // navigations; defaults to empty.
   IPC_STRUCT_MEMBER(std::vector<GURL>, redirects)
@@ -537,11 +526,12 @@ IPC_MESSAGE_ROUTED1(FrameMsg_SelectPopupMenuItem,
 // Tells the renderer that a navigation is ready to commit.  The renderer should
 // request |stream_url| to get access to the stream containing the body of the
 // response.
-IPC_MESSAGE_ROUTED4(FrameMsg_CommitNavigation,
-                    content::ResourceResponseHead, /* response */
-                    GURL, /* stream_url */
+IPC_MESSAGE_ROUTED5(FrameMsg_CommitNavigation,
+                    content::ResourceResponseHead,   /* response */
+                    GURL,                            /* stream_url */
                     content::CommonNavigationParams, /* common_params */
-                    content::CommitNavigationParams /* commit_params */)
+                    content::CommitNavigationParams, /* commit_params */
+                    content::HistoryNavigationParams /* history_params */)
 
 #if defined(ENABLE_PLUGINS)
 // Notifies the renderer of updates to the Plugin Power Saver origin whitelist.