Move browser_navigation_start to CommonNavigationParams

content/common/navigation_params.h

 // 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.
 
 #ifndef CONTENT_COMMON_NAVIGATION_PARAMS_H_
 #define CONTENT_COMMON_NAVIGATION_PARAMS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 42 matching lines @@
   CommonNavigationParams(const GURL& url,
                          const Referrer& referrer,
                          ui::PageTransition transition,
                          FrameMsg_Navigate_Type::Value navigation_type,
                          bool allow_download,
                          bool should_replace_current_entry,
                          base::TimeTicks ui_timestamp,
                          FrameMsg_UILoadMetricsReportType::Value report_type,
                          const GURL& base_url_for_data_url,
                          const GURL& history_url_for_data_url,
-                         LoFiState lofi_state);
+                         LoFiState lofi_state,
+                         const base::TimeTicks& navigation_start);
   ~CommonNavigationParams();
 
   // The URL to navigate to.
   // PlzNavigate: May be modified when the navigation is ready to commit.
   GURL url;
 
   // The URL to send in the "Referer" header field. Can be empty if there is
   // no referrer.
   Referrer referrer;
 
@@ skipping 26 matching lines @@
   // Is only used with data: URLs.
   GURL base_url_for_data_url;
 
   // History URL for use in Blink's SubstituteData.
   // Is only used with data: URLs.
   GURL history_url_for_data_url;
 
   // Whether or not to request a LoFi version of the document or let the browser
   // decide.
   LoFiState lofi_state;
+
+  // The navigationStart time exposed through the Navigation Timing API to JS.
+  // If this is for a browser-initiated navigation, this can override the
+  // navigation_start value in Blink.
+  // PlzNavigate: For renderer initiated navigations, this will be set on the
+  // renderer side and sent with FrameHostMsg_BeginNavigation.
+  base::TimeTicks navigation_start;
 };
 
 // Provided by the renderer ----------------------------------------------------
 //
 // This struct holds parameters sent by the renderer to the browser. It is only
 // used in PlzNavigate (since in the current architecture, the renderer does not
 // inform the browser of navigations until they commit).
 
 // This struct is not used outside of the PlzNavigate project.
 // PlzNavigate: parameters needed to start a navigation on the IO thread,
@@ skipping 77 matching lines @@
   int transferred_request_request_id;
 };
 
 // Used by FrameMsg_Navigate. Holds the parameters needed by the renderer to
 // start a browser-initiated navigation besides those in CommonNavigationParams.
 // PlzNavigate: sent to the renderer to make it issue a stream request for a
 // navigation that is ready to commit.
 struct CONTENT_EXPORT RequestNavigationParams {
   RequestNavigationParams();
   RequestNavigationParams(bool is_overriding_user_agent,
-                          base::TimeTicks navigation_start,
                           const std::vector<GURL>& redirects,
                           bool can_load_local_resources,
                           base::Time request_time,
                           const PageState& page_state,
                           int32 page_id,
                           int nav_entry_id,
                           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,
                           bool should_clear_history_list);
   ~RequestNavigationParams();
 
   // Whether or not the user agent override string should be used.
   bool is_overriding_user_agent;
 
-  // The navigationStart time to expose through the Navigation Timing API to JS.
-  base::TimeTicks browser_navigation_start;
-
   // Any redirect URLs that occurred before |url|. Useful for cross-process
   // navigations; defaults to empty.
   std::vector<GURL> redirects;
 
   // Whether or not this url should be allowed to access local file://
   // resources.
   bool can_load_local_resources;
 
   // The time the request was created. This is used by the old performance
   // infrastructure to set up DocumentState associated with the RenderView.
@@ skipping 66 matching lines @@
   ~NavigationParams();
 
   CommonNavigationParams common_params;
   StartNavigationParams start_params;
   RequestNavigationParams request_params;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_NAVIGATION_PARAMS_H_