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 bb60cebf691189c8f95c2c1d12d39164ff788672..7a99ca746752f75dd8c0cb1b4bc7a5372607256b 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -43714,7 +43714,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="ServiceWorker.RequestTimeouts.Count"
-    enum="ServiceWorkerVersion.RequestType">
+    enum="ServiceWorkerMetrics.EventType">

[Mark P, 2016/01/07 19:47:53]

It looks like enums are equivalent.  Is that correct?  If so, why are you
bothering to rename the enum name?

Also, is this histogram with this new(-ish) enum type being emitted under
exactly the same conditions / same time as the previous histogram?  I ask
because you've touched a lot of code and it's unclear whether all paths through
the code are identical.

[Marijn Kruisselbrink, 2016/01/07 20:33:44]

Yes, the enums are equivalent. I renamed it here to match the same change in the
code that emits this histograms. Previously that code used
ServiceWorkerVersion::RequestType, now the code uses
ServiceWorkerMetrics::EventType (with new EventType having the same values as
old RequestType, but new RequestType no longer being the same as old
RequestType, and eventually going away entirely).
It is certainly the intention that this enum is still being emitted under
exactly the same conditions with exactly the same values as before this change.
Ensuring that was primarily the reason for using a different enum for this
histogram.

   <owner>jeremyarcher@google.com</owner>
   <summary>
     The number of Service Worker request timeouts, by request type.
@@ -76338,6 +76338,17 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="2" label="All"/>
 </enum>
 
+<enum name="ServiceWorkerMetrics.EventType" type="int">
+  <int value="0" label="ACTIVATE"/>
+  <int value="1" label="INSTALL"/>
+  <int value="2" label="FETCH"/>
+  <int value="3" label="SYNC"/>
+  <int value="4" label="NOTIFICATION_CLICK"/>
+  <int value="5" label="PUSH"/>
+  <int value="6" label="GEOFENCING"/>
+  <int value="7" label="SERVICE_PORT_CONNECT"/>
+</enum>
+
 <enum name="ServiceWorkerReadResponseResult" type="int">
   <int value="0" label="OK"/>
   <int value="1" label="Read headers error"/>
@@ -76423,17 +76434,6 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="18" label="REQUEST_JOB_ERROR_DESTROYED_WITH_STREAM"/>
 </enum>
 
-<enum name="ServiceWorkerVersion.RequestType" type="int">
-  <int value="0" label="REQUEST_ACTIVATE"/>
-  <int value="1" label="REQUEST_INSTALL"/>
-  <int value="2" label="REQUEST_FETCH"/>
-  <int value="3" label="REQUEST_SYNC"/>
-  <int value="4" label="REQUEST_NOTIFICATION_CLICK"/>
-  <int value="5" label="REQUEST_PUSH"/>
-  <int value="6" label="REQUEST_GEOFENCING"/>
-  <int value="7" label="REQUEST_SERVICE_PORT_CONNECT"/>
-</enum>
-
 <enum name="ServiceWorkerWriteResponseResult" type="int">
   <int value="0" label="OK"/>
   <int value="1" label="Write headers error"/>