Refactor PageLoadExtraInfo::committed_url to url and did_commit fields.

chrome/browser/page_load_metrics/page_load_tracker.h

 // 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.
 
 #ifndef CHROME_BROWSER_PAGE_LOAD_METRICS_PAGE_LOAD_TRACKER_H_
 #define CHROME_BROWSER_PAGE_LOAD_METRICS_PAGE_LOAD_TRACKER_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 180 matching lines @@
 
   // This method returns true if this page load has been aborted with type of
   // ABORT_OTHER, and the |abort_cause_time| is within a sufficiently close
   // delta to when it was aborted. Note that only provisional loads can be
   // aborted with ABORT_OTHER. While this heuristic is coarse, it works better
   // and is simpler than other feasible methods. See https://goo.gl/WKRG98.
   bool IsLikelyProvisionalAbort(base::TimeTicks abort_cause_time) const;
 
   bool MatchesOriginalNavigation(content::NavigationHandle* navigation_handle);
 
-  // Only valid to call post-commit.
-  const GURL& committed_url() const {
-    DCHECK(!committed_url_.is_empty());
-    return committed_url_;
+  bool did_commit() const { return did_commit_; }
+  const GURL& url() const { return url_; }
+  const GURL& start_url() const {

[jkarlin, 2017/02/15 19:55:36]

With suggestion in .cc file this function can be removed.

[Bryan McQuade, 2017/02/15 20:27:10]

Thanks! Removed.

+    return start_url_.is_empty() ? url_ : start_url_;
   }
 
   base::TimeTicks navigation_start() const { return navigation_start_; }
 
   PageLoadExtraInfo ComputePageLoadExtraInfo();
 
   ui::PageTransition page_transition() const { return page_transition_; }
 
   UserInitiatedInfo user_initiated_info() const { return user_initiated_info_; }
 
@@ skipping 19 matching lines @@
   void UpdateAbortInternal(UserAbortType abort_type,
                            UserInitiatedInfo user_initiated_info,
                            base::TimeTicks timestamp,
                            bool is_certainly_browser_timestamp);
 
   // If |final_navigation| is null, then this is an "unparented" abort chain,
   // and represents a sequence of provisional aborts that never ends with a
   // committed load.
   void LogAbortChainHistograms(content::NavigationHandle* final_navigation);
 
+  void MaybeUpdateURL(content::NavigationHandle* navigation_handle);
+
   UserInputTracker input_tracker_;
 
   // Whether we stopped tracking this navigation after it was initiated. We may
   // stop tracking a navigation if it doesn't meet the criteria for tracking
   // metrics in DidFinishNavigation.
   bool did_stop_tracking_;
 
   // Whether the application went into the background when this PageLoadTracker
   // was active. This is a temporary boolean for UMA tracking.
   bool app_entered_background_;
 
   // The navigation start in TimeTicks, not the wall time reported by Blink.
   const base::TimeTicks navigation_start_;
 
-  // The committed URL of this page load.
-  GURL committed_url_;
+  // The most recent URL of this page load. Updated at navigation start, upon
+  // redirection, and at commit time.
+  GURL url_;
 
-  // The start URL for this page load (before redirects).
+  // The start URL for this page load (before redirects), if different from
+  // |url_|.
   GURL start_url_;
 
+  // Whether this page load committed.
+  bool did_commit_;
+
   std::unique_ptr<FailedProvisionalLoadInfo> failed_provisional_load_info_;
 
   // Will be ABORT_NONE if we have not aborted this load yet. Otherwise will
   // be the first abort action the user performed.
   UserAbortType abort_type_;
 
   // Whether the abort for this page load was user initiated. For example, if
   // this page load was aborted by a new navigation, this field tracks whether
   // that new navigation was user-initiated. This field is only useful if this
   // page load's abort type is a value other than ABORT_NONE. Note that this
@@ skipping 38 matching lines @@
   PageLoadMetricsEmbedderInterface* const embedder_interface_;
 
   std::vector<std::unique_ptr<PageLoadMetricsObserver>> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PageLoadTracker);
 };
 
 }  // namespace page_load_metrics
 
 #endif  // CHROME_BROWSER_PAGE_LOAD_METRICS_PAGE_LOAD_TRACKER_H_