Associate a main resource request with its PageLoadTracker.

chrome/browser/page_load_metrics/page_load_tracker.cc

 // Copyright 2016 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 "chrome/browser/page_load_metrics/page_load_tracker.h"
 
 #include <algorithm>
 #include <ostream>
 #include <string>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "chrome/browser/page_load_metrics/page_load_metrics_embedder_interface.h"
 #include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
 #include "chrome/common/page_load_metrics/page_load_timing.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_handle.h"
+#include "content/public/common/browser_side_navigation_policy.h"
 #include "ui/base/page_transition_types.h"
 
 // This macro invokes the specified method on each observer, passing the
 // variable length arguments as the method's arguments, and removes the observer
 // from the list of observers if the given method returns STOP_OBSERVING.
 #define INVOKE_AND_PRUNE_OBSERVERS(observers, Method, ...)    \
   for (auto it = observers.begin(); it != observers.end();) { \
     if ((*it)->Method(__VA_ARGS__) ==                         \
         PageLoadMetricsObserver::STOP_OBSERVING) {            \
       it = observers.erase(it);                               \
@@ skipping 387 matching lines @@
     // backgrounded yet, or started in the foreground and have already been
     // backgrounded.
     DCHECK_NE(started_in_foreground_, background_time_.is_null());
     foreground_time_ = base::TimeTicks::Now();
     ClampBrowserTimestampIfInterProcessTimeTickSkew(&foreground_time_);
   }
 
   INVOKE_AND_PRUNE_OBSERVERS(observers_, OnShown);
 }
 
+void PageLoadTracker::ReadyToCommit(
+    content::NavigationHandle* navigation_handle) {
+  // When browser side navigation is enabled,

[Charlie Harrison, 2017/01/13 15:56:23]

nit: Just replace this line with "PlzNavigate:", which is more common in
PlzNavigate code and is the common way of describing PlzNavigate-only paths.

[Bryan McQuade, 2017/01/17 15:06:26]

done

+  // NavigationHandle::GetGlobalRequestID() sometimes returns an uninitialized
+  // GlobalRequestID. Bail early in this case. See crbug.com/680841 for details.
+  if (content::IsBrowserSideNavigationEnabled() &&
+      navigation_handle->GetGlobalRequestID() == content::GlobalRequestID())
+    return;
+
+  DCHECK(!navigation_request_id_.has_value());
+  navigation_request_id_ = navigation_handle->GetGlobalRequestID();
+  DCHECK(navigation_request_id_.value() != content::GlobalRequestID());

[Charlie Harrison, 2017/01/13 15:56:23]

nit: DCHECK_NE

[Bryan McQuade, 2017/01/17 15:06:26]

i tried this but it doesn't compile, as DCHECK_NE requires an operator<< which
isn't provided by GlobalRequestID yet. will ask clamy/nasko about this as well.
moved back to DCHECK for now per our chat.

+}
+
 void PageLoadTracker::Commit(content::NavigationHandle* navigation_handle) {
   committed_url_ = navigation_handle->GetURL();
   // Some transitions (like CLIENT_REDIRECT) are only known at commit time.
   page_transition_ = navigation_handle->GetPageTransition();
   user_initiated_info_.user_gesture = navigation_handle->HasUserGesture();
 
   INVOKE_AND_PRUNE_OBSERVERS(observers_, OnCommit, navigation_handle);
   LogAbortChainHistograms(navigation_handle);
 }
 
@@ skipping 151 matching lines @@
   DCHECK(abort_type_ != ABORT_NONE ||
          (!abort_user_initiated_info_.browser_initiated &&
           !abort_user_initiated_info_.user_gesture &&
           !abort_user_initiated_info_.user_input_event));
   return PageLoadExtraInfo(
       first_background_time, first_foreground_time, started_in_foreground_,
       user_initiated_info_, committed_url_, start_url_, abort_type_,
       abort_user_initiated_info_, time_to_abort, metadata_);
 }
 
+bool PageLoadTracker::HasMatchingNavigationRequestID(
+    const content::GlobalRequestID& request_id) const {
+  DCHECK(request_id != content::GlobalRequestID());

[Charlie Harrison, 2017/01/13 15:56:23]

ditto

[Bryan McQuade, 2017/01/17 15:06:26]

same

+  return navigation_request_id_.has_value() &&
+         navigation_request_id_.value() == request_id;
+}
+
 void PageLoadTracker::NotifyAbort(UserAbortType abort_type,
                                   UserInitiatedInfo user_initiated_info,
                                   base::TimeTicks timestamp,
                                   bool is_certainly_browser_timestamp) {
   DCHECK_NE(abort_type, ABORT_NONE);
   // Use UpdateAbort to update an already notified PageLoadTracker.
   if (abort_type_ != ABORT_NONE)
     return;
 
   UpdateAbortInternal(abort_type, user_initiated_info, timestamp,
@@ skipping 62 matching lines @@
   // user initiated.
   if (abort_type != ABORT_CLIENT_REDIRECT)
     abort_user_initiated_info_ = user_initiated_info;
 
   if (is_certainly_browser_timestamp) {
     ClampBrowserTimestampIfInterProcessTimeTickSkew(&abort_time_);
   }
 }
 
 }  // namespace page_load_metrics