Index: content/public/renderer/navigation_state.cc |
diff --git a/content/public/renderer/navigation_state.cc b/content/public/renderer/navigation_state.cc |
index c461835037208386d51d0372b46706d72f04a77d..008ecbac92187153bdb651d7d3ce17667d46f96d 100644 |
--- a/content/public/renderer/navigation_state.cc |
+++ b/content/public/renderer/navigation_state.cc |
@@ -20,16 +20,14 @@ void NavigationState::set_alt_error_page_fetcher( |
alt_error_page_fetcher_.reset(f); |
} |
-NavigationState::NavigationState(content::PageTransition transition_type, |
- const base::Time& request_time, |
+NavigationState::NavigationState(const LoadTimes& load_times, |
+ content::PageTransition transition_type, |
bool is_content_initiated, |
int32 pending_page_id, |
int pending_history_list_offset) |
- : transition_type_(transition_type), |
+ : load_times_(load_times), |
+ transition_type_(transition_type), |
load_type_(UNDEFINED_LOAD), |
- request_time_(request_time), |
- load_histograms_recorded_(false), |
- web_timing_histograms_recorded_(false), |
request_committed_(false), |
is_content_initiated_(is_content_initiated), |
pending_page_id_(pending_page_id), |
@@ -37,15 +35,20 @@ NavigationState::NavigationState(content::PageTransition transition_type, |
use_error_page_(false), |
cache_policy_override_set_(false), |
cache_policy_override_(WebKit::WebURLRequest::UseProtocolCachePolicy), |
+ was_within_same_page_(false), |
+ was_prefetcher_(false), |
+ was_referred_by_prefetcher_(false) { |
+} |
+ |
+NavigationState::LoadTimes::LoadTimes(const base::Time& request_time) |
+ : request_time_(request_time), |
+ load_histograms_recorded_(false), |
+ web_timing_histograms_recorded_(false), |
http_status_code_(0), |
was_fetched_via_spdy_(false), |
was_npn_negotiated_(false), |
was_alternate_protocol_available_(false), |
- was_fetched_via_proxy_(false), |
- was_translated_(false), |
- was_within_same_page_(false), |
- was_prefetcher_(false), |
- was_referred_by_prefetcher_(false) { |
+ was_fetched_via_proxy_(false) { |
} |
} // namespace content |