Revert "Notifications: Split up image loading histograms by image type"

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 856d9955fc5ad0ec94a1d83b1dabbf178804f6c9..5c51940f6690ee8d141cd95d6a419a4d2aaea350 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -39349,17 +39349,11 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Notifications.Icon.FileSize" units="bytes">
-  <obsolete>
-    Deprecated Nov 2016 in favor of Notifications.LoadFileSize.*
-  </obsolete>
   <owner>peter@chromium.org</owner>
   <summary>The number of bytes loaded for a Web Notification icon.</summary>
 </histogram>
 
 <histogram name="Notifications.Icon.LoadFailTime" units="ms">
-  <obsolete>
-    Deprecated Nov 2016 in favor of Notifications.LoadFailTime.*
-  </obsolete>
   <owner>peter@chromium.org</owner>
   <summary>
     The number of milliseconds it took to fail loading an icon for a Web
@@ -39368,9 +39362,6 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Notifications.Icon.LoadFinishTime" units="ms">
-  <obsolete>
-    Deprecated Nov 2016 in favor of Notifications.LoadFinishTime.*
-  </obsolete>
   <owner>peter@chromium.org</owner>
   <summary>
     The number of milliseconds it took to finish successfully loading an icon
@@ -39379,9 +39370,6 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Notifications.Icon.ScaleDownTime" units="ms">
-  <obsolete>
-    Deprecated Nov 2016 in favor of Notifications.LoadScaleDownTime.*
-  </obsolete>
   <owner>peter@chromium.org</owner>
   <summary>
     The number of milliseconds it took to scale down an icon for a Web
@@ -39389,45 +39377,6 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="Notifications.LoadFailTime" units="ms">
-<!-- Name completed by histogram_suffixes name="NotificationImageTypes" -->
-
-  <owner>johnme@chromium.org</owner>
-  <summary>
-    The number of milliseconds it took to fail loading an icon/image for a Web
-    Notification.
-  </summary>
-</histogram>
-
-<histogram name="Notifications.LoadFileSize" units="bytes">
-<!-- Name completed by histogram_suffixes name="NotificationImageTypes" -->
-
-  <owner>johnme@chromium.org</owner>
-  <summary>
-    The number of bytes loaded for a Web Notification icon/image.
-  </summary>
-</histogram>
-
-<histogram name="Notifications.LoadFinishTime" units="ms">
-<!-- Name completed by histogram_suffixes name="NotificationImageTypes" -->
-
-  <owner>johnme@chromium.org</owner>
-  <summary>
-    The number of milliseconds it took to finish successfully loading an
-    icon/image for a Web Notification.
-  </summary>
-</histogram>
-
-<histogram name="Notifications.LoadScaleDownTime" units="ms">
-<!-- Name completed by histogram_suffixes name="NotificationImageTypes" -->
-
-  <owner>johnme@chromium.org</owner>
-  <summary>
-    The number of milliseconds it took to scale down an icon/image for a Web
-    Notification.
-  </summary>
-</histogram>
-
 <histogram name="Notifications.PerNotificationActions"
     enum="NotificationActionType">
   <owner>dewittj@chromium.org</owner>
@@ -110803,17 +110752,6 @@ value.
   <affected-histogram name="Notifications.Display"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="NotificationImageTypes" separator=".">
-  <suffix name="ActionIcon"/>
-  <suffix name="Badge"/>
-  <suffix name="Icon"/>
-  <suffix name="Image"/>
-  <affected-histogram name="Notifications.LoadFailTime"/>
-  <affected-histogram name="Notifications.LoadFileSize"/>
-  <affected-histogram name="Notifications.LoadFinishTime"/>
-  <affected-histogram name="Notifications.LoadScaleDownTime"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="NQE.Accuracy.Metric.Accuracy.DiffPositiveOrNegative"
     separator=".">
   <suffix name="Negative"