Add additional UMAs to keep track of unprefixed EME promise results

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 e4072d506e7d0835ea15ccaaa9a2f0e36ab78dec..315450946fbfa37cc91e156240508d557d0c5e79 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -12369,6 +12369,14 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="Media.EME.ClearKey" enum="CdmPromiseResult">
+  <owner>sandersd@chromium.org</owner>
+  <summary>
+    Result of promises for Clear Key key systems that were handled by Chromium
+    code.
+  </summary>
+</histogram>
+
 <histogram name="Media.EME.ClearKey.addKey" enum="MediaKeyException">
   <owner>xhwang@chromium.org</owner>
   <summary>addKey result using the Clear Key key system.</summary>
@@ -12379,13 +12387,6 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>cancelKeyRequest result using the Clear Key key system.</summary>
 </histogram>
 
-<histogram name="Media.EME.ClearKey.CreateSession" enum="CdmPromiseResult">
-  <owner>sandersd@chromium.org</owner>
-  <summary>
-    Result of Clear Key createSession promises handled by Chromium code.
-  </summary>
-</histogram>
-
 <histogram name="Media.EME.ClearKey.DecryptError">
   <owner>xhwang@chromium.org</owner>
   <summary>
@@ -12409,13 +12410,6 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>KeyError event count using the Clear Key key system.</summary>
 </histogram>
 
-<histogram name="Media.EME.ClearKey.LoadSession" enum="CdmPromiseResult">
-  <owner>sandersd@chromium.org</owner>
-  <summary>
-    Result of Clear Key loadSession promises handled by Chromium code.
-  </summary>
-</histogram>
-
 <histogram name="Media.EME.KeySystemSupport.Widevine"
     enum="MediaKeySystemSupportStatus">
   <owner>xhwang@chromium.org</owner>
@@ -12438,6 +12432,14 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="Media.EME.Unknown" enum="CdmPromiseResult">
+  <owner>sandersd@chromium.org</owner>
+  <summary>
+    Result of promises for unknown key systems that were handled by Chromium
+    code.
+  </summary>
+</histogram>
+
 <histogram name="Media.EME.Unknown.addKey" enum="MediaKeyException">
   <owner>xhwang@chromium.org</owner>
   <summary>addKey result using an unknown key system.</summary>
@@ -12448,14 +12450,6 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>cancelKeyRequest result using an unknown key system.</summary>
 </histogram>
 
-<histogram name="Media.EME.Unknown.CreateSession" enum="CdmPromiseResult">
-  <owner>sandersd@chromium.org</owner>
-  <summary>
-    Result of createSession promises for unknown key systems promises that were
-    handled by Chromium code.
-  </summary>
-</histogram>
-
 <histogram name="Media.EME.Unknown.DecryptError">
   <owner>xhwang@chromium.org</owner>
   <summary>Decryption error event count using an unknown key system.</summary>
@@ -12476,19 +12470,19 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>KeyError event count using an unknown key system.</summary>
 </histogram>
 
-<histogram name="Media.EME.Unknown.LoadSession" enum="CdmPromiseResult">
-  <owner>sandersd@chromium.org</owner>
-  <summary>
-    Result of loadSession promises for unknown key systems promises that were
-    handled by Chromium code.
-  </summary>
-</histogram>
-
 <histogram name="Media.EME.Unknown.SystemCode" units="system code">
   <owner>xhwang@chromium.org</owner>
   <summary>System code count using an unknown key system.</summary>
 </histogram>
 
+<histogram name="Media.EME.Widevine" enum="CdmPromiseResult">
+  <owner>sandersd@chromium.org</owner>
+  <summary>
+    Result of promises for Widevine key systems that were handled by Chromium
+    code.
+  </summary>
+</histogram>
+
 <histogram name="Media.EME.Widevine.addKey" enum="MediaKeyException">
   <owner>xhwang@chromium.org</owner>
   <summary>addKey result using the Widevine key system.</summary>
@@ -12499,13 +12493,6 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>cancelKeyRequest result using the Widevine key system.</summary>
 </histogram>
 
-<histogram name="Media.EME.Widevine.CreateSession" enum="CdmPromiseResult">
-  <owner>sandersd@chromium.org</owner>
-  <summary>
-    Result of Widevine createSession promises handled by Chromium code.
-  </summary>
-</histogram>
-
 <histogram name="Media.EME.Widevine.DecryptError">
   <owner>xhwang@chromium.org</owner>
   <summary>Decryption error event count using the Widevine key system.</summary>
@@ -12527,13 +12514,6 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>KeyError event count using the Widevine key system.</summary>
 </histogram>
 
-<histogram name="Media.EME.Widevine.LoadSession" enum="CdmPromiseResult">
-  <owner>sandersd@chromium.org</owner>
-  <summary>
-    Result of Widevine loadSession promises handled by Chromium code.
-  </summary>
-</histogram>
-
 <histogram name="Media.EME.Widevine.SystemCode" units="system code">
   <owner>xhwang@chromium.org</owner>
   <summary>System code count using the Widevine key system.</summary>
@@ -59854,6 +59834,22 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="Cookie.ReinstatedCookies"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="EmePromise" separator=".">
+  <suffix name="CloseSession" label="CloseSession promises only."/>
+  <suffix name="CreateSession" label="CreateSession promises only.">
+    <obsolete>
+      Replaced by GenerateRequest.
+    </obsolete>
+  </suffix>
+  <suffix name="GenerateRequest" label="GenerateRequest promises only."/>
+  <suffix name="LoadSession" label="LoadSession promises only."/>
+  <suffix name="RemoveSession" label="RemoveSession promises only."/>
+  <suffix name="UpdateSession" label="UpdateSession promises only."/>
+  <affected-histogram name="Media.EME.ClearKey"/>
+  <affected-histogram name="Media.EME.Unknown"/>
+  <affected-histogram name="Media.EME.Widevine"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="ExternalExtensionEvent" separator="">
   <suffix name="NonWebstore"
       label="sideloaded extensions that don't update from the webstore"/>