Fix regression due to navigation refactoring

This fixes a regression introduced by CL
https://chromiumcodereview.appspot.com/379143002/.

BUG=405812, 408684

Review URL: https://codereview.chromium.org/494083002

Cr-Commit-Position: refs/heads/master@{#295274}

content/browser/frame_host/navigator_impl.cc

@@ -342,11 +342,7 @@ bool NavigatorImpl::NavigateToEntry(
   // capture the time needed for the RenderFrameHost initialization.
   base::TimeTicks navigation_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();
 
@@ -355,6 +351,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);
   }
 
@@ -374,6 +373,12 @@ bool NavigatorImpl::NavigateToEntry(
   if (delegate_)
     delegate_->AboutToNavigateRenderFrame(dest_render_frame_host);
 
+  // Create the navigation parameters.
+  // TODO(vitalybuka): Move this before AboutToNavigateRenderFrame once
+  // http://crbug.com/408684 is fixed.
+  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