Only include PageLoad.AbortTiming histograms for histograms with data.

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 9d00901a8d18cb0f51b705b2daf771e47e753501..e8b94ff98c7c13fcff9aea28574bae5b0116d212 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -40191,76 +40191,225 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="PageLoad.AbortTiming.Background" units="ms">
+<histogram name="PageLoad.AbortTiming.Background.AfterCommit.BeforePaint"
+    units="ms">
+  <owner>bmcquade@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted due to being backgrounded, for aborts that happened after commit but
+    before paint.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.Background.BeforeCommit" units="ms">
+  <owner>bmcquade@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted due to being backgrounded, for aborts that happened before commit.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.Background.DuringParse" units="ms">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
     Measures the time from navigation start to the time the page load was
-    aborted due to being backgrounded.
+    aborted due to being backgrounded, for aborts that happened during parsing.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.ClientRedirect.AfterCommit.BeforePaint"
+    units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a client side redirect (Javascript navigation), for aborts that
+    happened after commit but before paint.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.ClientRedirect.BeforeCommit" units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a client side redirect (Javascript navigation), for aborts that
+    happened before commit.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.ClientRedirect.DuringParse" units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a client side redirect (Javascript navigation), for aborts that
+    happened during parsing.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.Close.AfterCommit.BeforePaint" units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by the user closing the tab or browser, for aborts that happened
+    after commit but before paint.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.Close.BeforeCommit" units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by the user closing the tab or browser, for aborts that happened
+    before commit.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.Close.DuringParse" units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by the user closing the tab or browser
+  </summary>
+</histogram>
+
+<histogram
+    name="PageLoad.AbortTiming.ForwardBackNavigation.AfterCommit.BeforePaint"
+    units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a forward or back navigation, for aborts that happened after
+    commit but before paint.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.ForwardBackNavigation.BeforeCommit"
+    units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a forward or back navigation, for aborts that happened before
+    commit.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.ForwardBackNavigation.DuringParse"
+    units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a forward or back navigation, for aborts that happened during
+    parsing.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.NewNavigation.AfterCommit.BeforePaint"
+    units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a new navigation, for aborts that happened after commit but
+    before paint.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.NewNavigation.BeforeCommit" units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a new navigation, for aborts that happened before commit.
   </summary>
 </histogram>
 
-<histogram name="PageLoad.AbortTiming.ClientRedirect" units="ms">
+<histogram name="PageLoad.AbortTiming.NewNavigation.DuringParse" units="ms">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
     Measures the time from navigation start to the time the page load was
-    aborted by a client side redirect (Javascript navigation).
+    aborted by a new navigation, for aborts that happened during parsing.
   </summary>
 </histogram>
 
-<histogram name="PageLoad.AbortTiming.Close" units="ms">
+<histogram name="PageLoad.AbortTiming.Other.BeforeCommit" units="ms">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
     Measures the time from navigation start to the time the page load was
-    aborted by the user closing the tab or browser.
+    aborted, for aborts that happened before commit. The abort cause is unknown.
   </summary>
 </histogram>
 
-<histogram name="PageLoad.AbortTiming.ForwardBackNavigation" units="ms">
+<histogram name="PageLoad.AbortTiming.Reload.AfterCommit.BeforePaint"
+    units="ms">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
     Measures the time from navigation start to the time the page load was
-    aborted by a forward or back navigation.
+    aborted by a reload, for aborts that happened after commit but before paint.
   </summary>
 </histogram>
 
-<histogram name="PageLoad.AbortTiming.NewNavigation" units="ms">
+<histogram name="PageLoad.AbortTiming.Reload.BeforeCommit" units="ms">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
     Measures the time from navigation start to the time the page load was
-    aborted by a new navigation.
+    aborted by a reload, for aborts that happened before commit.
+
+
   </summary>
 </histogram>
 
-<histogram name="PageLoad.AbortTiming.Other" units="ms">
+<histogram name="PageLoad.AbortTiming.Reload.DuringParse" units="ms">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
     Measures the time from navigation start to the time the page load was
-    aborted. The abort cause is unknown.
+    aborted by a reload, for aborts that happened during parsing.
   </summary>
 </histogram>
 
-<histogram name="PageLoad.AbortTiming.Reload" units="ms">
+<histogram name="PageLoad.AbortTiming.Stop.AfterCommit.BeforePaint" units="ms">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
     Measures the time from navigation start to the time the page load was
-    aborted by a reload.
+    aborted by the user pressing stop, for aborts that happened after commit but
+    before paint.
   </summary>
 </histogram>
 
-<histogram name="PageLoad.AbortTiming.Stop" units="ms">
+<histogram name="PageLoad.AbortTiming.Stop.BeforeCommit" units="ms">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
     Measures the time from navigation start to the time the page load was
-    aborted by the user pressing stop.
+    aborted by the user pressing stop, for aborts that happened before commit.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.AbortTiming.Stop.DuringParse" units="ms">
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by the user pressing stop, for aborts that happened during parsing.
   </summary>
 </histogram>
 
@@ -40287,6 +40436,76 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram
+    name="PageLoad.Clients.FromGoogleSearch.AbortTiming.Close.AfterPaint.BeforeInteraction"
+    units="ms">
+  <owner>bmcquade@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by the user closing the tab or browser, for aborts that happened
+    after paint but before interaction. Restricted to page loads that are the
+    result of a navigation from a Google web search.
+  </summary>
+</histogram>
+
+<histogram
+    name="PageLoad.Clients.FromGoogleSearch.AbortTiming.ForwardBackNavigation.AfterPaint.Before1sDelayedInteraction"
+    units="ms">
+  <owner>bmcquade@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a forward or back navigation, for aborts that happened after
+    paint but before up to 1 second after interaction. Restricted to page loads
+    that are the result of a navigation from a Google web search.
+  </summary>
+</histogram>
+
+<histogram
+    name="PageLoad.Clients.FromGoogleSearch.AbortTiming.NewNavigation.AfterPaint.BeforeInteraction"
+    units="ms">
+  <owner>bmcquade@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a new navigation, for aborts that happened after paint but before
+    up to 1 second after interaction. Restricted to page loads that are the
+    result of a navigation from a Google web search.
+  </summary>
+</histogram>
+
+<histogram
+    name="PageLoad.Clients.FromGoogleSearch.AbortTiming.Reload.AfterPaint.Before1sDelayedInteraction"
+    units="ms">
+  <owner>bmcquade@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by a reload, for aborts that happened after paint but before up to 1
+    second after interaction. Restricted to page loads that are the result of a
+    navigation from a Google web search.
+  </summary>
+</histogram>
+
+<histogram
+    name="PageLoad.Clients.FromGoogleSearch.AbortTiming.Stop.AfterPaint.BeforeInteraction"
+    units="ms">
+  <owner>bmcquade@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    This metric is still experimental and not yet ready to be relied upon.
+    Measures the time from navigation start to the time the page load was
+    aborted by the user pressing stop, for aborts that happened after paint but
+    before interaction.  Restricted to page loads that are the result of a
+    navigation from a Google web search.
+  </summary>
+</histogram>
+
 <histogram name="PageLoad.Clients.GoogleCaptcha.Events"
     enum="GoogleCaptchaEvent">
   <owner>mdw@chromium.org</owner>
@@ -107985,24 +108204,6 @@ value.
   <affected-histogram name="PageLoad.Timing2.ParseDuration"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PageLoadEventConditions" separator=".">
-  <suffix name="BeforeCommit"/>
-  <suffix name="AfterCommit.BeforePaint"/>
-  <suffix name="AfterPaint.BeforeInteraction"/>
-  <suffix name="AfterPaint.Before1sDelayedInteraction"/>
-  <suffix name="DuringParse"/>
-  <affected-histogram name="PageLoad.AbortTiming.Background"/>
-  <affected-histogram name="PageLoad.AbortTiming.ClientRedirect"/>
-  <affected-histogram name="PageLoad.AbortTiming.Close"/>
-  <affected-histogram name="PageLoad.AbortTiming.ForwardBackNavigation"/>
-  <affected-histogram name="PageLoad.AbortTiming.NewNavigation"/>
-  <affected-histogram name="PageLoad.AbortTiming.Other"/>
-  <affected-histogram name="PageLoad.AbortTiming.Reload"/>
-  <affected-histogram name="PageLoad.AbortTiming.Stop"/>
-  <affected-histogram name="PageLoad.AbortTiming.UnknownNavigation"/>
-  <affected-histogram name="PageLoad.Timing2.NavigationToFirstBackground"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="PageLoadMetricsCacheInfo" separator=".">
   <suffix name="NoStore" label="Main resource had cache-control: no-store"/>
   <affected-histogram
@@ -108104,29 +108305,17 @@ value.
   </suffix>
   <affected-histogram
       name="PageLoad.AbortTiming.Close.AfterCommit.BeforePaint"/>
-  <affected-histogram
-      name="PageLoad.AbortTiming.Close.AfterPaint.BeforeInteraction"/>
   <affected-histogram name="PageLoad.AbortTiming.Close.BeforeCommit"/>
   <affected-histogram
       name="PageLoad.AbortTiming.ForwardBackNavigation.AfterCommit.BeforePaint"/>
   <affected-histogram
-      name="PageLoad.AbortTiming.ForwardBackNavigation.AfterPaint.Before1sDelayedInteraction"/>
-  <affected-histogram
       name="PageLoad.AbortTiming.NewNavigation.AfterCommit.BeforePaint"/>
-  <affected-histogram
-      name="PageLoad.AbortTiming.NewNavigation.AfterPaint.BeforeInteraction"/>
   <affected-histogram name="PageLoad.AbortTiming.Other.BeforeCommit"/>
   <affected-histogram
       name="PageLoad.AbortTiming.Reload.AfterCommit.BeforePaint"/>
-  <affected-histogram
-      name="PageLoad.AbortTiming.Reload.AfterPaint.Before1sDelayedInteraction"/>
   <affected-histogram name="PageLoad.AbortTiming.Stop.AfterCommit.BeforePaint"/>
-  <affected-histogram
-      name="PageLoad.AbortTiming.Stop.AfterPaint.BeforeInteraction"/>
   <affected-histogram name="PageLoad.AbortTiming.Stop.BeforeCommit"/>
   <affected-histogram
-      name="PageLoad.AbortTiming.UnknownNavigation.BeforeCommit"/>
-  <affected-histogram
       name="PageLoad.DocumentTiming.NavigationToDOMContentLoadedEventFired"/>
   <affected-histogram
       name="PageLoad.DocumentTiming.NavigationToLoadEventFired"/>