Initial PlzNavigate RDH-side logic.

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"
 #include "content/browser/frame_host/frame_tree_node.h"
-#include "content/browser/frame_host/navigation_before_commit_info.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/navigation_request_info.h"
 #include "content/browser/frame_host/navigator_delegate.h"
 #include "content/browser/frame_host/render_frame_host_impl.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"
 #include "content/common/navigation_params.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/stream_handle.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
 #include "net/base/load_flags.h"
 
 namespace content {
 
 namespace {
@@ skipping 680 matching lines @@
   info->parent_is_main_frame = !frame_tree_node->parent() ?
       false : frame_tree_node->parent()->IsMainFrame();
 
   // TODO(clamy): Inform the RenderFrameHostManager that a navigation is about
   // to begin, so that it can speculatively spawn a new renderer if needed.
 
   navigation_request->BeginNavigation(info.Pass(), params.request_body);
 }
 
 // PlzNavigate
-void NavigatorImpl::CommitNavigation(
-    FrameTreeNode* frame_tree_node,
-    const NavigationBeforeCommitInfo& info) {
+void NavigatorImpl::CommitNavigation(FrameTreeNode* frame_tree_node,
+                                     ResourceResponse* response,
+                                     scoped_ptr<StreamHandle> body) {
   CHECK(CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
   NavigationRequest* navigation_request =
       navigation_request_map_.get(frame_tree_node->frame_tree_node_id());
   DCHECK(navigation_request);
 
-  // Ignores navigation commits if the request ID doesn't match the current
-  // active request.
-  if (navigation_request->navigation_request_id() !=
-          info.navigation_request_id) {
-    return;
-  }
-
-  // Update the navigation url.
-  navigation_request->common_params().url = info.navigation_url;
-
   // Select an appropriate renderer to commit the navigation.
   RenderFrameHostImpl* render_frame_host =
       frame_tree_node->render_manager()->GetFrameHostForNavigation(
-          info.navigation_url, navigation_request->common_params().transition);
+          navigation_request->common_params().url,
+          navigation_request->common_params().transition);
   CheckWebUIRendererDoesNotDisplayNormalURL(
       render_frame_host, navigation_request->common_params().url);
 
-  render_frame_host->CommitNavigation(info.stream_url,
+  render_frame_host->CommitNavigation(response, body.Pass(),
                                       navigation_request->common_params(),
                                       navigation_request->commit_params());
 }
 
 // PlzNavigate
 void NavigatorImpl::CancelNavigation(FrameTreeNode* frame_tree_node) {
   CHECK(CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
   NavigationRequest* navigation_request =
       navigation_request_map_.get(frame_tree_node->frame_tree_node_id());
   if (!navigation_request)
     return;
-  navigation_request->CancelNavigation();
   navigation_request_map_.erase(frame_tree_node->frame_tree_node_id());
 }
 
 void NavigatorImpl::LogResourceRequestTime(
     base::TimeTicks timestamp, const GURL& url) {
   if (navigation_start_time_and_url.a.ToInternalValue() != 0
       && navigation_start_time_and_url.b == url) {
     base::TimeDelta time_to_network =
         timestamp - navigation_start_time_and_url.a;
     UMA_HISTOGRAM_TIMES("Navigation.TimeToURLJobStart", time_to_network);
@@ skipping 22 matching lines @@
     const NavigationEntryImpl& entry,
     NavigationController::ReloadType reload_type,
     base::TimeTicks navigation_start) {
   CHECK(CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
   DCHECK(frame_tree_node);
   int64 frame_tree_node_id = frame_tree_node->frame_tree_node_id();
   FrameMsg_Navigate_Type::Value navigation_type =
       GetNavigationType(controller_->GetBrowserContext(), entry, reload_type);
   scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
-      frame_tree_node_id,
+      controller_->GetBrowserContext(), frame_tree_node,
       CommonNavigationParams(entry.GetURL(),
                              entry.GetReferrer(),
                              entry.GetTransitionType(),
                              navigation_type,
                              !entry.IsViewSourceMode()),
       CommitNavigationParams(entry.GetPageState(),
                              entry.GetIsOverridingUserAgent(),
                              navigation_start)));
   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 it must be canceled.
-  NavigationRequest* current_request =
-      navigation_request_map_.get(frame_tree_node_id);
-  if (current_request) {
-    current_request->CancelNavigation();
-  }
-
+  // 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()) {
     // TODO(clamy): send a RequestNavigation IPC.
+    NOTIMPLEMENTED();
     return true;
   }
 
   // The navigation request is sent directly to the IO thread.
   OnBeginNavigation(
       frame_tree_node,
       MakeDefaultBeginNavigation(request_params, navigation_type),
       navigation_request_map_.get(frame_tree_node_id)->common_params());
   return true;
 }
 
 }  // namespace content