Store NavigationEntryImpl data into NavigationRequest for later usage.

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 828270732bfb47de7c34978cfecd90ec1c5e9916..94ad9f275977b1b369401f0134ba64639233174f 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -17,6 +17,7 @@
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
+#include "content/browser/frame_host/navigation_request.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_factory.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
@@ -650,8 +651,7 @@ void RenderFrameHostManager::ResetProxyHosts() {
 }
 
 // PlzNavigate
-void RenderFrameHostManager::BeginNavigation(
-    const CommonNavigationParams& common_params) {
+void RenderFrameHostManager::BeginNavigation(NavigationRequest* request) {

[nasko, 2015/01/16 15:03:24]

It doesn't seem we modify the request at all here, why not pass it as const
reference?

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

+1. It'd be good if we avoided passing a pointer to the RenderFrameHostManager,
to make it clear that the only class modifying the NavigationRequest is
Navigator.

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

Yes, my bad on this. It's a const reference now.

   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
   // Clean up any state in case there's an ongoing navigation.
@@ -659,24 +659,22 @@ void RenderFrameHostManager::BeginNavigation(
   // navigations.
   CleanUpNavigation();
 
-  RenderFrameHostImpl* dest_rfh =
-      GetFrameHostForNavigation(common_params.url, common_params.transition);
+  RenderFrameHostImpl* dest_rfh = GetFrameHostForNavigation(request);
   DCHECK(dest_rfh);
 }
 
 // PlzNavigate
 RenderFrameHostImpl* RenderFrameHostManager::GetFrameHostForNavigation(
-    const GURL& url,
-    ui::PageTransition transition) {
+    NavigationRequest* request) {

[nasko, 2015/01/16 15:03:24]

Same comment about const reference.

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

Done.

   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
 
   SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
 
-  // TODO(carlosk): Replace the default values with the right ones for
-  // source_instance, dest_instance, dest_is_restore, dest_is_view_source_mode.
   scoped_refptr<SiteInstance> dest_site_instance = GetSiteInstanceForNavigation(
-      url, nullptr, nullptr, transition, false, false);
+      request->common_params().url, request->source_site_instance(),
+      request->dest_site_instance(), request->common_params().transition,
+      request->is_restore(), request->is_view_source());
   // The appropriate RenderFrameHost to commit the navigation.
   RenderFrameHostImpl* navigation_rfh = nullptr;
 
@@ -710,10 +708,9 @@ RenderFrameHostImpl* RenderFrameHostManager::GetFrameHostForNavigation(
         speculative_render_frame_host_->GetSiteInstance() !=
             dest_site_instance.get()) {
       CleanUpNavigation();
-      // TODO(carlosk): Replace the binding value with the right one.
       bool success = CreateSpeculativeRenderFrameHost(
-          url, current_site_instance, dest_site_instance.get(),
-          NavigationEntryImpl::kInvalidBindings);
+          request->common_params().url, current_site_instance,
+          dest_site_instance.get(), request->bindings());
       DCHECK(success);
     }
     DCHECK(speculative_render_frame_host_);