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

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 77b19aec12c3189b0578141f51bf5b5fa8868a9d..69e1eb9289431ab322929b41c7f3d2f6039ebe36 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -74,6 +74,7 @@ namespace content {
 
 class ChildFrameCompositingHelper;
 class CompositorDependencies;
+class DocumentState;
 class ExternalPopupMenu;
 class GeolocationDispatcher;
 class ManifestManager;
@@ -81,6 +82,7 @@ class MediaStreamDispatcher;
 class MediaStreamRendererFactory;
 class MediaPermissionDispatcher;
 class MidiDispatcher;
+class NavigationState;
 class NotificationPermissionDispatcher;
 class PageState;
 class PepperPluginInstanceImpl;
@@ -103,6 +105,7 @@ struct CommonNavigationParams;
 struct CustomContextMenuContext;
 struct FrameReplicationState;
 struct HistoryNavigationParams;
+struct NavigationParams;
 struct RequestNavigationParams;
 struct ResourceResponseHead;
 struct StartNavigationParams;
@@ -547,6 +550,11 @@ class CONTENT_EXPORT RenderFrameImpl
 
   ManifestManager* manifest_manager();
 
+  // TODO(creis): Remove when the only caller, the HistoryController, is no
+  // more.
+  void SetProvisionalNavigationParams(
+      scoped_ptr<NavigationParams> navigation_params);
+
  protected:
   RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id);
 
@@ -726,6 +734,14 @@ class CONTENT_EXPORT RenderFrameImpl
   // Returns the URL being loaded by the |frame_|'s request.
   GURL GetLoadingUrl() const;
 
+  // If we initiated a navigation, this function will populate |document_state|
+  // with the navigation information saved in OnNavigate().
+  void PopulateDocumentStateFromPending(DocumentState* document_state);
+
+  // Returns a new NavigationState populated with the navigation information
+  // saved in OnNavigate().
+  NavigationState* CreateNavigationStateFromPending();
+
 #if defined(OS_ANDROID)
   blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
       const blink::WebURL& url,
@@ -768,6 +784,11 @@ class CONTENT_EXPORT RenderFrameImpl
   // own RenderWidgets.
   scoped_refptr<RenderWidget> render_widget_;
 
+  // Temporarily holds state pertaining to a navigation that has been initiated
+  // until the NavigationState corresponding to the new navigation is created in
+  // didCreateDataSource().
+  scoped_ptr<NavigationParams> provisional_navigation_params_;

[Charlie Reis, 2015/03/23 22:23:02]

I've always considered "provisional" as the Blink term for content's "pending." 
I'd like to keep it as pending_navigation_params_ as before, unless there's a
reason to switch it.

[Avi (use Gerrit), 2015/03/24 20:33:46]

That's OK with me.

I called it "pending" because it used to be called "pending" in the
HistoryController to match the pending variable there.

+
 #if defined(ENABLE_PLUGINS)
   // Current text input composition text. Empty if no composition is in
   // progress.