Move browser initiated navigation from RenderViewHost to RenderFrameHost.

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index a3eb957d2483cbc449442713ca63df5b0f8d3460..f5fd6269aac0d6012d6b2972d17c745df6ac0a05 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -75,7 +75,7 @@ class CommandLine;
 class PepperDeviceTest;
 class SkBitmap;
 struct PP_NetAddress_Private;
-struct ViewMsg_Navigate_Params;
+struct FrameMsg_Navigate_Params;
 struct ViewMsg_PostMessage_Params;
 struct ViewMsg_StopFinding_Params;
 
@@ -807,14 +807,14 @@ class CONTENT_EXPORT RenderViewImpl
     CONNECTION_ERROR,
   };
 
-  static blink::WebReferrerPolicy GetReferrerPolicyFromRequest(
-      blink::WebFrame* frame,
-      const blink::WebURLRequest& request);
+  static bool IsReload(const FrameMsg_Navigate_Params& params);
 
   static Referrer GetReferrerFromRequest(
       blink::WebFrame* frame,
       const blink::WebURLRequest& request);
 
+  static void NotifyTimezoneChange(blink::WebFrame* frame);
+
   void UpdateTitle(blink::WebFrame* frame, const base::string16& title,
                    blink::WebTextDirection title_direction);
   void UpdateSessionHistory(blink::WebFrame* frame);
@@ -927,7 +927,6 @@ class CONTENT_EXPORT RenderViewImpl
   void OnPluginActionAt(const gfx::Point& location,
                         const blink::WebPluginAction& action);
   void OnMoveOrResizeStarted();
-  void OnNavigate(const ViewMsg_Navigate_Params& params);
   void OnPostMessageEvent(const ViewMsg_PostMessage_Params& params);
   void OnReleaseDisambiguationPopupDIB(TransportDIB::Handle dib_handle);
   void OnReloadFrame();
@@ -1028,9 +1027,13 @@ class CONTENT_EXPORT RenderViewImpl
 
   // Returns true if the |params| navigation is to an entry that has been
   // cropped due to a recent navigation the browser did not know about.
-  bool IsBackForwardToStaleEntry(const ViewMsg_Navigate_Params& params,
+  bool IsBackForwardToStaleEntry(const FrameMsg_Navigate_Params& params,
                                  bool is_reload);
 
+  // TODO(nasko): Remove this method, once all callers are migrated to use

[Charlie Reis, 2014/02/13 19:27:21]

This comment isn't quite right-- the only caller is RenderFrame, right?  We want
to remove this once we move this event to RenderFrameObserver.

[nasko, 2014/02/13 19:37:25]

You would think : ). Unit tests call directly into this method through
TestRenderViewHost.

+  // RenderFrameHost.
+  void OnNavigate(const FrameMsg_Navigate_Params& params);
+
   // Make this RenderView show an empty, unscriptable page.
   void NavigateToSwappedOutURL(blink::WebFrame* frame);
 
@@ -1162,6 +1165,7 @@ class CONTENT_EXPORT RenderViewImpl
   bool is_loading_;
 
   // The gesture that initiated the current navigation.
+  // TODO(nasko): Move to RenderFrame, as this is per-frame state.
   NavigationGesture navigation_gesture_;
 
   // Used for popups.
@@ -1181,7 +1185,8 @@ class CONTENT_EXPORT RenderViewImpl
   // the WebDataSource::ExtraData attribute.  We use pending_navigation_state_
   // as a temporary holder for the state until the WebDataSource corresponding
   // to the new navigation is created.  See DidCreateDataSource.
-  scoped_ptr<ViewMsg_Navigate_Params> pending_navigation_params_;
+  // TODO(nasko): Move to RenderFrame, as this is per-frame state.
+  scoped_ptr<FrameMsg_Navigate_Params> pending_navigation_params_;
 
   // Timer used to delay the updating of nav state (see SyncNavigationState).
   base::OneShotTimer<RenderViewImpl> nav_state_sync_timer_;