| Index: content/browser/frame_host/navigation_request.cc
|
| diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
|
| index 93d9887eed0109858c360b3ac98c8b1f21d3dc7d..eb212193e94e1b611739ad018262989dde2293c6 100644
|
| --- a/content/browser/frame_host/navigation_request.cc
|
| +++ b/content/browser/frame_host/navigation_request.cc
|
| @@ -62,7 +62,7 @@ scoped_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated(
|
| const NavigationEntryImpl& entry,
|
| FrameMsg_Navigate_Type::Value navigation_type,
|
| bool is_same_document_history_load,
|
| - base::TimeTicks navigation_start,
|
| + const base::TimeTicks& navigation_start,
|
| NavigationControllerImpl* controller) {
|
| std::string method = entry.GetHasPostData() ? "POST" : "GET";
|
|
|
| @@ -86,17 +86,16 @@ scoped_ptr<NavigationRequest> NavigationRequest::CreateBrowserInitiated(
|
| }
|
|
|
| scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
|
| - frame_tree_node,
|
| - entry.ConstructCommonNavigationParams(dest_url, dest_referrer,
|
| - frame_entry, navigation_type,
|
| - LOFI_UNSPECIFIED),
|
| + frame_tree_node, entry.ConstructCommonNavigationParams(
|
| + dest_url, dest_referrer, frame_entry,
|
| + navigation_type, LOFI_UNSPECIFIED, navigation_start),
|
| BeginNavigationParams(method, headers.ToString(),
|
| LoadFlagFromNavigationType(navigation_type),
|
| false, // has_user_gestures
|
| false, // skip_service_worker
|
| REQUEST_CONTEXT_TYPE_LOCATION),
|
| entry.ConstructRequestNavigationParams(
|
| - frame_entry, navigation_start, is_same_document_history_load,
|
| + frame_entry, is_same_document_history_load,
|
| frame_tree_node->has_committed_real_load(),
|
| controller->GetPendingEntryIndex() == -1,
|
| controller->GetIndexOfEntry(&entry),
|
| @@ -123,7 +122,6 @@ scoped_ptr<NavigationRequest> NavigationRequest::CreateRendererInitiated(
|
| // TODO(clamy): Set has_committed_real_load.
|
| RequestNavigationParams request_params(
|
| false, // is_overriding_user_agent
|
| - base::TimeTicks::Now(), // browser_navigation_start
|
| std::vector<GURL>(), // redirects
|
| false, // can_load_local_resources
|
| base::Time::Now(), // request_time
|
| @@ -219,7 +217,7 @@ void NavigationRequest::BeginNavigation() {
|
|
|
| void NavigationRequest::CreateNavigationHandle() {
|
| navigation_handle_ = NavigationHandleImpl::Create(
|
| - common_params_.url, frame_tree_node_);
|
| + common_params_.url, frame_tree_node_, common_params_.navigation_start);
|
| }
|
|
|
| void NavigationRequest::TransferNavigationHandleOwnership(
|
|
|