Move browser_navigation_start to CommonNavigationParams

content/browser/frame_host/navigation_entry_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/navigation_entry_impl.h"
 
 #include <queue>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 437 matching lines @@
   copy->extra_data_ = extra_data_;
 
   return copy.Pass();
 }
 
 CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(
     const GURL& dest_url,
     const Referrer& dest_referrer,
     const FrameNavigationEntry& frame_entry,
     FrameMsg_Navigate_Type::Value navigation_type,
-    LoFiState lofi_state) const {
+    LoFiState lofi_state,
+    const base::TimeTicks& navigation_start) const {
   FrameMsg_UILoadMetricsReportType::Value report_type =
       FrameMsg_UILoadMetricsReportType::NO_REPORT;
   base::TimeTicks ui_timestamp = base::TimeTicks();
 #if defined(OS_ANDROID)
   if (!intent_received_timestamp().is_null())
     report_type = FrameMsg_UILoadMetricsReportType::REPORT_INTENT;
   ui_timestamp = intent_received_timestamp();
 #endif
 
   return CommonNavigationParams(
       dest_url, dest_referrer, GetTransitionType(), navigation_type,
       !IsViewSourceMode(), should_replace_entry(), ui_timestamp, report_type,
-      GetBaseURLForDataURL(), GetHistoryURLForDataURL(), lofi_state);
+      GetBaseURLForDataURL(), GetHistoryURLForDataURL(), lofi_state,
+      navigation_start);
 }
 
 StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams()
     const {
   std::vector<unsigned char> browser_initiated_post_data;
   if (GetBrowserInitiatedPostData()) {
     browser_initiated_post_data.assign(
         GetBrowserInitiatedPostData()->front(),
         GetBrowserInitiatedPostData()->front() +
             GetBrowserInitiatedPostData()->size());
   }
 
   return StartNavigationParams(GetHasPostData(), extra_headers(),
                                browser_initiated_post_data,
 #if defined(OS_ANDROID)
                                has_user_gesture(),
 #endif
                                transferred_global_request_id().child_id,
                                transferred_global_request_id().request_id);
 }
 
 RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams(
     const FrameNavigationEntry& frame_entry,
-    base::TimeTicks navigation_start,
     bool is_same_document_history_load,
     bool has_committed_real_load,
     bool intended_as_new_entry,
     int pending_history_list_offset,
     int current_history_list_offset,
     int current_history_list_length) const {
   // Set the redirect chain to the navigation's redirects, unless returning to a
   // completed navigation (whose previous redirects don't apply).
   std::vector<GURL> redirects;
   if (ui::PageTransitionIsNewNavigation(GetTransitionType())) {
     redirects = GetRedirectChain();
   }
 
   int pending_offset_to_send = pending_history_list_offset;
   int current_offset_to_send = current_history_list_offset;
   int current_length_to_send = current_history_list_length;
   if (should_clear_history_list()) {
     // Set the history list related parameters to the same values a
     // NavigationController would return before its first navigation. This will
     // fully clear the RenderView's view of the session history.
     pending_offset_to_send = -1;
     current_offset_to_send = -1;
     current_length_to_send = 0;
   }
   return RequestNavigationParams(
-      GetIsOverridingUserAgent(), navigation_start, redirects,
-      GetCanLoadLocalResources(), base::Time::Now(), frame_entry.page_state(),
-      GetPageID(), GetUniqueID(), is_same_document_history_load,
-      has_committed_real_load, intended_as_new_entry, pending_offset_to_send,
-      current_offset_to_send, current_length_to_send,
-      should_clear_history_list());
+      GetIsOverridingUserAgent(), redirects, GetCanLoadLocalResources(),
+      base::Time::Now(), frame_entry.page_state(), GetPageID(), GetUniqueID(),
+      is_same_document_history_load, has_committed_real_load,
+      intended_as_new_entry, pending_offset_to_send, current_offset_to_send,
+      current_length_to_send, should_clear_history_list());
 }
 
 void NavigationEntryImpl::ResetForCommit() {
   // Any state that only matters when a navigation entry is pending should be
   // cleared here.
   // TODO(creis): This state should be moved to NavigationRequest once
   // PlzNavigate is enabled.
   SetBrowserInitiatedPostData(nullptr);
   set_source_site_instance(nullptr);
   set_is_renderer_initiated(false);
@@ skipping 83 matching lines @@
       return node;
     }
     // Enqueue any children and keep looking.
     for (auto& child : node->children)
       work_queue.push(child);
   }
   return nullptr;
 }
 
 }  // namespace content