Store NavigationEntryImpl data into NavigationRequest for later usage.

content/browser/frame_host/navigator_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigator_impl.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/frame_tree.h"
@@ skipping 765 matching lines @@
           : frame_tree_node->frame_tree()->root()->current_url();
   info->is_main_frame = frame_tree_node->IsMainFrame();
   info->parent_is_main_frame = !frame_tree_node->parent() ?
       false : frame_tree_node->parent()->IsMainFrame();
 
   // First start the request on the IO thread.
   navigation_request->BeginNavigation(info.Pass(), params.request_body);
 
   // Then notify the RenderFrameHostManager so it can speculatively create a
   // RenderFrameHost (and potentially a new renderer process) in parallel.
-  frame_tree_node->render_manager()->BeginNavigation(common_params);
+  frame_tree_node->render_manager()->BeginNavigation(navigation_request);
 }
 
 // PlzNavigate
 void NavigatorImpl::CommitNavigation(FrameTreeNode* frame_tree_node,
                                      ResourceResponse* response,
                                      scoped_ptr<StreamHandle> body) {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
 
   // HTTP 204 (No Content) and HTTP 205 (Reset Content) responses should not
   // commit; they leave the frame showing the previous page.
   if (response->head.headers.get() &&
       (response->head.headers->response_code() == 204 ||
        response->head.headers->response_code() == 205)) {
     CancelNavigation(frame_tree_node);
     return;
   }
 
   NavigationRequest* navigation_request =
       navigation_request_map_.get(frame_tree_node->frame_tree_node_id());
   DCHECK(navigation_request);
 
   // Select an appropriate renderer to commit the navigation.
   RenderFrameHostImpl* render_frame_host =
       frame_tree_node->render_manager()->GetFrameHostForNavigation(
-          navigation_request->common_params().url,
-          navigation_request->common_params().transition);
+          navigation_request);
   CheckWebUIRendererDoesNotDisplayNormalURL(
       render_frame_host, navigation_request->common_params().url);
 
   render_frame_host->CommitNavigation(response, body.Pass(),
                                       navigation_request->common_params(),
                                       navigation_request->commit_params());
 }
 
 // PlzNavigate
 void NavigatorImpl::CancelNavigation(FrameTreeNode* frame_tree_node) {
@@ skipping 64 matching lines @@
   scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
       frame_tree_node,
       CommonNavigationParams(entry.GetURL(),
                              entry.GetReferrer(),
                              entry.GetTransitionType(),
                              navigation_type,
                              !entry.IsViewSourceMode()),
       CommitNavigationParams(entry.GetPageState(),
                              entry.GetIsOverridingUserAgent(),
                              navigation_start)));
+  navigation_request->CopyDataFrom(entry);

[clamy, 2015/01/16 16:39:02]

Considering that we only call CopyDataFrom once, just below the constructor, how
about making NavigationEntry a parameter of the constructor and doing the work
there?

[carlosk, 2015/01/19 15:02:52]

Done.

   RequestNavigationParams request_params(entry.GetHasPostData(),
                                          entry.extra_headers(),
                                          entry.GetBrowserInitiatedPostData());
   // TODO(clamy): Check if navigations are blocked and if so store the
   // parameters.
 
   // If there is an ongoing request, replace it.
   navigation_request_map_.set(frame_tree_node_id, navigation_request.Pass());
 
   if (frame_tree_node->current_frame_host()->IsRenderFrameLive()) {
@@ skipping 61 matching lines @@
         "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted",
         time_to_commit);
     UMA_HISTOGRAM_TIMES(
         "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted",
         time_to_network);
   }
   navigation_data_.reset();
 }
 
 }  // namespace content