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 1a223f24d4d01ecc59bbc0307868bf1afe4f2fa2..6d5e4506a2aab7a6f859810691d003bc26887767 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -59055,39 +59055,43 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
       label="FILESYSTEMPROVIDERINTERNAL_GETACTIONSREQUESTEDSUCCESS"/>
   <int value="1059"
       label="DASHBOARDPRIVATE_SHOWPERMISSIONPROMPTFORDELEGATEDBUNDLEINSTALL"/>
-  <int value="1060" label="FILEMANAGERPRIVATEINTERNAL_GETCUSTOMACTIONS"/>
-  <int value="1061" label="FILEMANAGERPRIVATEINTERNAL_EXECUTECUSTOMACTION"/>
-  <int value="1062" label="MDNS_FORCEDISCOVERY"/>
-  <int value="1063" label="LANGUAGESETTINGSPRIVATE_GETLANGUAGELIST"/>
-  <int value="1064" label="LANGUAGESETTINGSPRIVATE_SETLANGUAGELIST"/>
-  <int value="1065"
+  <int value="1060" label="FILEMANAGERPRIVATEINTERNAL_GETENTRYACTIONS"/>

[Alexei Svitkine (slow), 2015/10/21 15:45:30]

So the issue was that GETENTRYACTIONS was added smack in the middle of the enum
without anyone noticing? How long ago was this / did this make it into a branch
cut yet? If not, I suggest renumbering it to the end. Then, the bad numbering
will be limited to only a few versions.

[stevenjb, 2015/10/21 16:58:29]

FWIW, I ran into something like this when I ran 'python
tools/metrics/histograms/update_extension_histograms.py' on another CL. Whatever
we do we should make sure that script produces correct output moving forward.

[Alexei Svitkine (slow), 2015/10/21 17:09:57]

To follow-up, this is the bad CL:

https://codereview.chromium.org/1239043002

Looks like it meant to rename FILEMANAGERPRIVATEINTERNAL_GETENTRYACTIONS and 
FILEMANAGERPRIVATEINTERNAL_EXECUTEENTRYACTION, but instead ended up adding the
new ones without deleting the other ones.

I think the correct fix is to remove those ones. Can you do it as part of this
CL? I think when you do that, the diff will look much better and will also fix
the issue with the data (i.e. since that CL landed, all the values have been
mislabeled in UMA, but it's only been 4 days).

[stevenjb, 2015/10/21 17:21:28]

I would suggest doing the fix in a separate CL.

[michaelpg, 2015/10/21 18:06:30]

Done: https://codereview.chromium.org/1414263003/

+  <int value="1061" label="FILEMANAGERPRIVATEINTERNAL_EXECUTEENTRYACTION"/>
+  <int value="1062" label="FILEMANAGERPRIVATEINTERNAL_GETCUSTOMACTIONS"/>
+  <int value="1063" label="FILEMANAGERPRIVATEINTERNAL_EXECUTECUSTOMACTION"/>
+  <int value="1064" label="MDNS_FORCEDISCOVERY"/>
+  <int value="1065" label="LANGUAGESETTINGSPRIVATE_GETLANGUAGELIST"/>
+  <int value="1066" label="LANGUAGESETTINGSPRIVATE_SETLANGUAGELIST"/>
+  <int value="1067"
       label="LANGUAGESETTINGSPRIVATE_GETSPELLCHECKDICTIONARYSTATUS"/>
-  <int value="1066" label="LANGUAGESETTINGSPRIVATE_GETSPELLCHECKWORDS"/>
-  <int value="1067" label="LANGUAGESETTINGSPRIVATE_GETTRANSLATETARGETLANGUAGE"/>
-  <int value="1068" label="LANGUAGESETTINGSPRIVATE_GETINPUTMETHODLISTS"/>
-  <int value="1069" label="LANGUAGESETTINGSPRIVATE_ADDINPUTMETHOD"/>
-  <int value="1070" label="LANGUAGESETTINGSPRIVATE_REMOVEINPUTMETHOD"/>
-  <int value="1071" label="FILEMANAGERPRIVATE_CANCELALLFILETRANSFERS"/>
-  <int value="1072" label="NETWORKINGPRIVATE_UNLOCKCELLULARSIM"/>
-  <int value="1073" label="NETWORKINGPRIVATE_SETCELLULARSIMSTATE"/>
-  <int value="1074" label="ENTERPRISE_DEVICEATTRIBUTES_GETDIRECTORYDEVICEID"/>
-  <int value="1075" label="CASTDEVICESPRIVATE_UPDATEDEVICES"/>
-  <int value="1076" label="SYSTEM_DISPLAY_ENABLEUNIFIEDDESKTOP"/>
-  <int value="1077" label="BROWSINGDATA_REMOVECACHESTORAGE"/>
-  <int value="1078" label="VIRTUALKEYBOARDPRIVATE_SETKEYBOARDSTATE"/>
-  <int value="1079" label="VIRTUALKEYBOARDPRIVATE_SETHOTRODKEYBOARD"/>
-  <int value="1080" label="CERTIFICATEPROVIDERINTERNAL_REPORTSIGNATURE"/>
-  <int value="1081" label="CERTIFICATEPROVIDERINTERNAL_REPORTCERTIFICATES"/>
-  <int value="1082" label="BLUETOOTHPRIVATE_PAIR"/>
-  <int value="1083" label="EASYUNLOCKPRIVATE_FINDSETUPCONNECTION"/>
-  <int value="1084" label="RESOURCESPRIVATE_GETSTRINGS"/>
-  <int value="1085" label="USB_GETCONFIGURATIONS"/>
-  <int value="1086" label="EASYUNLOCKPRIVATE_SETUPCONNECTIONSTATUS"/>
-  <int value="1087" label="EASYUNLOCKPRIVATE_SETUPCONNECTIONDISCONNECT"/>
-  <int value="1088" label="EASYUNLOCKPRIVATE_SETUPCONNECTIONSEND"/>
-  <int value="1089" label="DATAREDUCTIONPROXY_GETDATAUSAGE"/>
-  <int value="1090" label="EASYUNLOCKPRIVATE_SETUPCONNECTIONGETDEVICEADDRESS"/>
-  <int value="1091" label="TABCAPTURE_CAPTUREOFFSCREENTAB"/>
+  <int value="1068" label="LANGUAGESETTINGSPRIVATE_GETSPELLCHECKWORDS"/>
+  <int value="1069" label="LANGUAGESETTINGSPRIVATE_GETTRANSLATETARGETLANGUAGE"/>
+  <int value="1070" label="LANGUAGESETTINGSPRIVATE_GETINPUTMETHODLISTS"/>
+  <int value="1071" label="LANGUAGESETTINGSPRIVATE_ADDINPUTMETHOD"/>
+  <int value="1072" label="LANGUAGESETTINGSPRIVATE_REMOVEINPUTMETHOD"/>
+  <int value="1073" label="FILEMANAGERPRIVATE_CANCELALLFILETRANSFERS"/>

[michaelpg, 2015/10/21 04:00:00]

These entries were shifted as a result of a rebase; is that bad?

The actual rebase conflict only showed an issue with the last 3 entries
(TABCAPTURE_CAPTUREOFFSCREENTAB was added, which conflicted with my addition of
the last two LANGUAGESETTINGSPRIVATE items). So I could have fixed it manually.
But since that caused problems last time[1], I ran
update_extension_histograms.py this time, and this was the result.

How do I fix this?

[1]
https://codereview.chromium.org/1274753006/diff/100001/tools/metrics/histogra...

+  <int value="1074" label="NETWORKINGPRIVATE_UNLOCKCELLULARSIM"/>
+  <int value="1075" label="NETWORKINGPRIVATE_SETCELLULARSIMSTATE"/>
+  <int value="1076" label="ENTERPRISE_DEVICEATTRIBUTES_GETDIRECTORYDEVICEID"/>
+  <int value="1077" label="CASTDEVICESPRIVATE_UPDATEDEVICES"/>
+  <int value="1078" label="SYSTEM_DISPLAY_ENABLEUNIFIEDDESKTOP"/>
+  <int value="1079" label="BROWSINGDATA_REMOVECACHESTORAGE"/>
+  <int value="1080" label="VIRTUALKEYBOARDPRIVATE_SETKEYBOARDSTATE"/>
+  <int value="1081" label="VIRTUALKEYBOARDPRIVATE_SETHOTRODKEYBOARD"/>
+  <int value="1082" label="CERTIFICATEPROVIDERINTERNAL_REPORTSIGNATURE"/>
+  <int value="1083" label="CERTIFICATEPROVIDERINTERNAL_REPORTCERTIFICATES"/>
+  <int value="1084" label="BLUETOOTHPRIVATE_PAIR"/>
+  <int value="1085" label="EASYUNLOCKPRIVATE_FINDSETUPCONNECTION"/>
+  <int value="1086" label="RESOURCESPRIVATE_GETSTRINGS"/>
+  <int value="1087" label="USB_GETCONFIGURATIONS"/>
+  <int value="1088" label="EASYUNLOCKPRIVATE_SETUPCONNECTIONSTATUS"/>
+  <int value="1089" label="EASYUNLOCKPRIVATE_SETUPCONNECTIONDISCONNECT"/>
+  <int value="1090" label="EASYUNLOCKPRIVATE_SETUPCONNECTIONSEND"/>
+  <int value="1091" label="DATAREDUCTIONPROXY_GETDATAUSAGE"/>
+  <int value="1092" label="EASYUNLOCKPRIVATE_SETUPCONNECTIONGETDEVICEADDRESS"/>
+  <int value="1093" label="TABCAPTURE_CAPTUREOFFSCREENTAB"/>
+  <int value="1094" label="LANGUAGESETTINGSPRIVATE_ADDSPELLCHECKWORD"/>
+  <int value="1095" label="LANGUAGESETTINGSPRIVATE_REMOVESPELLCHECKWORD"/>
 </enum>
 
 <enum name="ExtensionInstallCause" type="int">