Store NavigationEntryImpl data into NavigationRequest for later usage.

content/browser/frame_host/render_frame_host_manager.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/render_frame_host_manager.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/render_view_devtools_agent_host.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/debug_urls.h"
 #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"
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/webui/web_ui_controller_factory_registry.h"
 #include "content/browser/webui/web_ui_impl.h"
@@ skipping 613 matching lines @@
     }
   }
   return false;
 }
 
 void RenderFrameHostManager::ResetProxyHosts() {
   STLDeleteValues(&proxy_hosts_);
 }
 
 // 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.
   // TODO(carlosk): remove this cleanup here once we properly cancel ongoing
   // 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;
 
   // TODO(carlosk): do not swap processes for renderer initiated navigations
   // (see crbug.com/440266).
   if (current_site_instance == dest_site_instance.get() ||
       (!frame_tree_node_->IsMainFrame() &&
        !base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kSitePerProcess))) {
     // Reuse the current RFH if its SiteInstance matches the the navigation's
@@ skipping 13 matching lines @@
           MSG_ROUTING_NONE, frame_tree_node_->IsMainFrame());
     }
 
     // If the SiteInstance for the final URL doesn't match the one from the
     // speculatively created RenderFrameHost, create a new RenderFrameHost using
     // this new SiteInstance.
     if (!speculative_render_frame_host_ ||
         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_);
     navigation_rfh = speculative_render_frame_host_.get();
   }
   DCHECK(navigation_rfh &&
          (navigation_rfh == render_frame_host_.get() ||
           navigation_rfh == speculative_render_frame_host_.get()));
 
   // If the RenderFrame that needs to navigate is not live (its process was just
@@ skipping 1139 matching lines @@
 void RenderFrameHostManager::DeleteRenderFrameProxyHost(
     SiteInstance* instance) {
   RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId());
   if (iter != proxy_hosts_.end()) {
     delete iter->second;
     proxy_hosts_.erase(iter);
   }
 }
 
 }  // namespace content