Page load metrics observers cleanup

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 b5ebd73ce213ba382d8b986e8f03a1373fbc4020..a8f655467a29150162c92800e71fe80345ed38de 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -43623,52 +43623,14 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram
-    name="PageLoad.Clients.DataReductionProxy.Experimental.Requests.Network"
-    units="requests">
-  <owner>bengr@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <summary>
-    The number of network requests in a page load when the main resource was
-    loaded through data reduction proxy. Recorded per page load when the user
-    navigates away, hides the tab, or backgrounds the app.
-  </summary>
-</histogram>
-
-<histogram
-    name="PageLoad.Clients.DataReductionProxy.Experimental.Requests.Network.NonProxied"
-    units="requests">
-  <owner>bengr@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <summary>
-    The number of network requests in a page load that were not fetched through
-    the data reduction proxy when the main resource was loaded through data
-    reduction proxy. Recorded per page load when the user navigates away, hides
-    the tab, or backgrounds the app.
-  </summary>
-</histogram>
-
-<histogram
-    name="PageLoad.Clients.DataReductionProxy.Experimental.Requests.Network.PercentProxied"
+    name="PageLoad.Clients.DataReductionProxy.Experimental.CompletedResources.Network.PercentProxied"
     units="%">
   <owner>bengr@chromium.org</owner>
   <owner>ryansturm@chromium.org</owner>
   <summary>
-    The percent of network requests in a page load that use data reduction proxy
-    when the main resource was loaded through data reduction proxy. Recorded per
-    page load when the user navigates away, hides the tab, or backgrounds the
-    app.
-  </summary>
-</histogram>
-
-<histogram
-    name="PageLoad.Clients.DataReductionProxy.Experimental.Requests.Network.Proxied"
-    units="requests">
-  <owner>bengr@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <summary>
-    The number of network requests in a page load that were fetched through the
-    data reduction proxy when the main resource was loaded through data
-    reduction proxy. Recorded per page load when the user navigates away, hides
+    The percent of completed resources loaded from network in a page load that
+    use data reduction proxy when the main resource was loaded through data
+    reduction proxy.  Recorded per page load when the user navigates away, hides
     the tab, or backgrounds the app.
   </summary>
 </histogram>
@@ -43904,7 +43866,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <owner>jkarlin@chromium.org</owner>
   <summary>
     The number of prefiltered (e.g., compressed) KiloBytes loaded from the cache
-    via the browser process for a page load. Recorded when the page is closed.
+    via the browser process for a page load. Recorded when the page load is
+    terminated.
   </summary>
 </histogram>
 
@@ -43912,8 +43875,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <owner>jkarlin@chromium.org</owner>
   <summary>
     The number of prefiltered (e.g., compressed) KiloBytes loaded over the
-    network via the browser process for a page load. Recorded when the page is
-    closed.
+    network via the browser process for a page load. Recorded when the page load
+    is terminated.
   </summary>
 </histogram>
 
@@ -43921,7 +43884,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <owner>jkarlin@chromium.org</owner>
   <summary>
     The number of prefiltered (e.g., compressed) KiloBytes loaded via the
-    browser process for a page load. Recorded when the page is closed.
+    browser process for a page load. Recorded when the page load is terminated.
   </summary>
 </histogram>
 
@@ -43943,6 +43906,36 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="PageLoad.Experimental.CompletedResources.Cache"
+    units="resources">
+  <owner>csharrison@chromium.org</owner>
+  <owner>jkarlin@chromium.org</owner>
+  <summary>
+    The number of completed resources loaded from the cache via the browser
+    process for a page load. Recorded when the page load is terminated.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.Experimental.CompletedResources.Network"
+    units="resources">
+  <owner>csharrison@chromium.org</owner>
+  <owner>jkarlin@chromium.org</owner>
+  <summary>
+    The number of completed resources loaded from the network via the browser
+    process for a page load. Recorded when the page load is terminated.
+  </summary>
+</histogram>
+
+<histogram name="PageLoad.Experimental.CompletedResources.Total"
+    units="resources">
+  <owner>csharrison@chromium.org</owner>
+  <owner>jkarlin@chromium.org</owner>
+  <summary>
+    The total number of completed resources loaded via the browser process for a
+    page load. Recorded when the page load is terminated.
+  </summary>
+</histogram>
+
 <histogram
     name="PageLoad.Experimental.PaintTiming.FirstMeaningfulPaintSignalStatus"
     enum="FirstMeaningfulPaintSignalStatus">
@@ -116801,6 +116794,7 @@ value.
   <affected-histogram
       name="PageLoad.DocumentTiming.NavigationToLoadEventFired"/>
   <affected-histogram name="PageLoad.Experimental.Bytes.Network"/>
+  <affected-histogram name="PageLoad.Experimental.CompletedResources.Network"/>
   <affected-histogram
       name="PageLoad.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint"/>
   <affected-histogram
@@ -116813,6 +116807,16 @@ value.
   <affected-histogram name="PageLoad.ParseTiming.ParseDuration"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="PageLoadMetricsClientsDataReductionProxyResources"
+    separator=".">
+  <suffix name="NonProxied"
+      label="Resources not loaded through data reduction proxy."/>
+  <suffix name="Proxied"
+      label="Resources loaded through data reduction proxy."/>
+  <affected-histogram
+      name="PageLoad.Clients.DataReductionProxy.Experimental.CompletedResources.Network"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="PageLoadMetricsClientsDocWrite" separator="."
     ordering="prefix">
   <suffix name="Clients.DocWrite.Block"