Correctly record and pass around navigation start time.

components/web_view/navigation_controller.cc

 // Copyright 2015 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 "components/web_view/navigation_controller.h"
 
 #include "components/web_view/frame.h"
 #include "components/web_view/navigation_controller_delegate.h"
 #include "components/web_view/navigation_entry.h"
 #include "components/web_view/reload_type.h"
@@ skipping 57 matching lines @@
     return;
   }
 
   // Base the navigation on where we are now...
   int current_index = GetCurrentEntryIndex();
 
   DiscardPendingEntry(false);
 
   pending_entry_index_ = current_index - 1;
   // TODO(erg): Transition type handled here.
-  NavigateToPendingEntry(ReloadType::NO_RELOAD);
+  NavigateToPendingEntry(ReloadType::NO_RELOAD, true);
 }
 
 void NavigationController::GoForward() {
   if (!CanGoForward()) {
     NOTREACHED();
     return;
   }
 
   // TODO(erg): The upstream version handles transience here.
 
   // Base the navigation on where we are now...
   int current_index = GetCurrentEntryIndex();
 
   DiscardPendingEntry(false);
 
   pending_entry_index_ = current_index + 1;
   // TODO(erg): Transition type handled here.
-  NavigateToPendingEntry(ReloadType::NO_RELOAD);
+  NavigateToPendingEntry(ReloadType::NO_RELOAD, true);
 }
 
 void NavigationController::LoadURL(mojo::URLRequestPtr request) {
   // TODO(erg): This mimics part of NavigationControllerImpl::LoadURL(), minus
   // all the error checking.
   SetPendingEntry(make_scoped_ptr(new NavigationEntry(request.Pass())));
-  NavigateToPendingEntry(ReloadType::NO_RELOAD);
+  NavigateToPendingEntry(ReloadType::NO_RELOAD, false);
 }
 
-void NavigationController::NavigateToPendingEntry(ReloadType reload_type) {
+void NavigationController::NavigateToPendingEntry(
+    ReloadType reload_type,
+    bool update_navigation_start_time) {
   // TODO(erg): Deal with session history navigations while trying to navigate
   // to a slow-to-commit page.
 
   // TODO(erg): Deal with interstitials.
 
   // For session history navigations only the pending_entry_index_ is set.
   if (!pending_entry_) {
     CHECK_NE(pending_entry_index_, -1);
     pending_entry_ = entries_[pending_entry_index_];
   }
 
   // TODO(erg): Eventually, we need to deal with restoring the state of the
   // full tree. For now, we'll just shell back to the WebView.
-  delegate_->OnNavigate(pending_entry_->BuildURLRequest());
+  delegate_->OnNavigate(
+      pending_entry_->BuildURLRequest(update_navigation_start_time));
 }
 
 void NavigationController::DiscardPendingEntry(bool was_failure) {
   // TODO(erg): We might copy the CHECK regarding NavigateToEntry here.
 
   // TODO(erg): We need to maintain the failed_pending_entry_ during
   // |was_failure| here.
 
   if (pending_entry_index_ == -1)
     delete pending_entry_;
@@ skipping 69 matching lines @@
   int current_size = static_cast<int>(entries_.size());
   if (current_size > 0) {
     while (last_committed_entry_index_ < (current_size - 1)) {
       entries_.pop_back();
       current_size--;
     }
   }
 }
 
 }  // namespace web_view