Move provisional navigation parameters to RenderFrame, and use the HistoryController to distribute …

content/renderer/history_controller.h

Index: content/renderer/history_controller.h
diff --git a/content/renderer/history_controller.h b/content/renderer/history_controller.h
index 97969318aff16af20915eaa03c3f760d006bb9ef..0a46eefa0d86fb96d5dbb7429cffdfccace67d71 100644
--- a/content/renderer/history_controller.h
+++ b/content/renderer/history_controller.h
@@ -51,6 +51,7 @@ class WebFrame;
 namespace content {
 class RenderFrameImpl;
 class RenderViewImpl;
+struct NavigationParams;
 
 // A guide to history state in the renderer:
 //
@@ -110,6 +111,7 @@ class CONTENT_EXPORT HistoryController {
   ~HistoryController();
 
   void GoToEntry(scoped_ptr<HistoryEntry> entry,
+                 scoped_ptr<NavigationParams> navigation_params,
                  blink::WebURLRequest::CachePolicy cache_policy);
 
   void UpdateForCommit(RenderFrameImpl* frame,
@@ -136,8 +138,17 @@ class CONTENT_EXPORT HistoryController {
 
   RenderViewImpl* render_view_;
 
+  // A HistoryEntry representing the currently-loaded page.
   scoped_ptr<HistoryEntry> current_entry_;
+  // A HistoryEntry representing the page that is being loaded, or an empty
+  // scoped_ptr if no page is being loaded.
   scoped_ptr<HistoryEntry> provisional_entry_;
+  // The NavigationParams corresponding to the last load that was initiated by
+  // |GoToEntry|. This is kept around so that it can be passed into existing
+  // frames modified during a history navigation in GoToEntry(), and can be
+  // passed into frames created after the commit that resulted from the
+  // navigation in GetItemForNewChildFrame().
+  scoped_ptr<NavigationParams> navigation_params_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryController);
 };