Remove the FrameMsg_Navigate_Params

content/browser/frame_host/navigation_request.cc

 // Copyright 2014 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/navigation_request.h"
 
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
+#include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/loader/navigation_url_loader.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/resource_request_body.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/common/content_client.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
@@ skipping 36 matching lines @@
   // TODO(clamy): same document navigations should not make network requests.
   return !url.SchemeIs(url::kDataScheme);
 }
 
 // static
 scoped_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated(
     FrameTreeNode* frame_tree_node,
     const NavigationEntryImpl& entry,
     FrameMsg_Navigate_Type::Value navigation_type,
     base::TimeTicks navigation_start,
-    const HistoryNavigationParams& history_params) {
+    NavigationControllerImpl* controller) {
   std::string method = entry.GetHasPostData() ? "POST" : "GET";
 
   // Copy existing headers and add necessary headers that may not be present
   // in the RequestNavigationParams.
   net::HttpRequestHeaders headers;
   headers.AddHeadersFromString(entry.extra_headers());
   headers.SetHeaderIfMissing(net::HttpRequestHeaders::kUserAgent,
                              GetContentClient()->GetUserAgent());
   // TODO(clamy): match what blink is doing with accept headers.
   headers.SetHeaderIfMissing("Accept", "*/*");
 
   // Fill POST data from the browser in the request body.
   scoped_refptr<ResourceRequestBody> request_body;
   if (entry.GetHasPostData()) {
     request_body = new ResourceRequestBody();
     request_body->AppendBytes(
         reinterpret_cast<const char *>(
             entry.GetBrowserInitiatedPostData()->front()),
         entry.GetBrowserInitiatedPostData()->size());
   }
 
-  FrameMsg_UILoadMetricsReportType::Value report_type =
-      FrameMsg_UILoadMetricsReportType::NO_REPORT;
-  base::TimeTicks ui_timestamp = base::TimeTicks();
-#if defined(OS_ANDROID)
-  if (!entry.intent_received_timestamp().is_null())
-    report_type = FrameMsg_UILoadMetricsReportType::REPORT_INTENT;
-  ui_timestamp = entry.intent_received_timestamp();
-#endif
-
   scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
-      frame_tree_node,
-      CommonNavigationParams(
-          entry.GetURL(), entry.GetReferrer(), entry.GetTransitionType(),
-          navigation_type, !entry.IsViewSourceMode(), ui_timestamp, report_type,
-          entry.GetBaseURLForDataURL(), entry.GetHistoryURLForDataURL()),
+      frame_tree_node, entry.ConstructCommonNavigationParams(navigation_type),
       BeginNavigationParams(method, headers.ToString(),
                             LoadFlagFromNavigationType(navigation_type), false),
-      CommitNavigationParams(entry.GetIsOverridingUserAgent(),
-                             navigation_start),
-      history_params, request_body, true, &entry));
+      entry.ConstructCommitNavigationParams(navigation_start),
+      entry.ConstructHistoryNavigationParams(controller), request_body, true,
+      &entry));
   return navigation_request.Pass();
 }
 
 // static
 scoped_ptr<NavigationRequest> NavigationRequest::CreateRendererInitiated(
     FrameTreeNode* frame_tree_node,
     const CommonNavigationParams& common_params,
     const BeginNavigationParams& begin_params,
     scoped_refptr<ResourceRequestBody> body,
     int current_history_list_offset,
     int current_history_list_length) {
   // TODO(clamy): Check if some PageState should be provided here.
   // TODO(clamy): See how we should handle override of the user agent when the
   // navigation may start in a renderer and commit in another one.
   // TODO(clamy): See if the navigation start time should be measured in the
   // renderer and sent to the browser instead of being measured here.
   scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
-      frame_tree_node, common_params, begin_params,
-      CommitNavigationParams(false, base::TimeTicks::Now()),
+      frame_tree_node, common_params, begin_params, CommitNavigationParams(),

[nasko, 2015/03/11 13:59:00]

This looks much nicer this way!

       HistoryNavigationParams(PageState(), -1, -1, current_history_list_offset,
                               current_history_list_length, false),
       body, false, nullptr));
   return navigation_request.Pass();
 }
 
 NavigationRequest::NavigationRequest(
     FrameTreeNode* frame_tree_node,
     const CommonNavigationParams& common_params,
     const BeginNavigationParams& begin_params,
@@ skipping 84 matching lines @@
   // TODO(davidben): Network failures should display a network error page.
   NOTIMPLEMENTED() << " where net_error=" << net_error;
 }
 
 void NavigationRequest::OnRequestStarted(base::TimeTicks timestamp) {
   frame_tree_node_->navigator()->LogResourceRequestTime(timestamp,
                                                         common_params_.url);
 }
 
 }  // namespace content