Fix regression due to navigation refactoring

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index b64af9abe8acce4fd5dfc61a78a21e329e54b82d..e09953555fa5beb8d08e93e4a9af40f1f82d7732 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -348,11 +348,7 @@ bool NavigatorImpl::NavigateToEntry(
   // TODO(ppi): make this go away.
   current_load_start_ = base::TimeTicks::Now();
 
-  // Create the navigation parameters.
   FrameMsg_Navigate_Params navigate_params;
-  MakeNavigateParams(
-      entry, *controller_, reload_type, navigation_start, &navigate_params);
-
   RenderFrameHostManager* manager =
       render_frame_host->frame_tree_node()->render_manager();
 
@@ -361,6 +357,9 @@ bool NavigatorImpl::NavigateToEntry(
   // node.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation)) {
+    // Create the navigation parameters.
+    MakeNavigateParams(
+        entry, *controller_, reload_type, navigation_start, &navigate_params);
     return manager->RequestNavigation(entry, navigate_params);
   }
 
@@ -380,6 +379,10 @@ bool NavigatorImpl::NavigateToEntry(
   if (delegate_)
     delegate_->AboutToNavigateRenderFrame(dest_render_frame_host);
 
+  // Create the navigation parameters.

[Charlie Reis, 2014/09/16 21:13:20]

Please add something like:
// TODO(vitalybuka): Move this before AboutToNavigateRenderFrame once
http://crbug.com/408684 is fixed.

[clamy, 2014/09/17 13:33:46]

Done.

+  MakeNavigateParams(
+      entry, *controller_, reload_type, navigation_start, &navigate_params);
+
   // Navigate in the desired RenderFrameHost.
   // We can skip this step in the rare case that this is a transfer navigation
   // which began in the chosen RenderFrameHost, since the request has already