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 61836640f95115657c7b5ec36055aed7e9f4e9c6..0441fcaaf0744ab194c11d8f6531e54ed09946cb 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -19283,11 +19283,17 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Media.EME.ClearKey.addKey" enum="MediaKeyException">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>addKey result using the Clear Key key system.</summary>
 </histogram>
 
 <histogram name="Media.EME.ClearKey.cancelKeyRequest" enum="MediaKeyException">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>cancelKeyRequest result using the Clear Key key system.</summary>
 </histogram>
@@ -19301,22 +19307,34 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="Media.EME.ClearKey.generateKeyRequest"
     enum="MediaKeyException">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>generateKeyRequest result using the Clear Key key system.</summary>
 </histogram>
 
 <histogram name="Media.EME.ClearKey.KeyAdded">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>KeyAdded event count using the Clear Key key system.</summary>
 </histogram>
 
 <histogram name="Media.EME.ClearKey.KeyError" enum="MediaKeyError">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>KeyError event count using the Clear Key key system.</summary>
 </histogram>
 
 <histogram name="Media.EME.KeySystemSupport.Widevine"
     enum="MediaKeySystemSupportStatus">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>
     Key system support query status and result. Each enum value will be reported
@@ -19325,6 +19343,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Media.EME.NeedKey">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>

[xhwang, 2016/02/19 23:39:14]

This UMA is also used by unprefixed EME "encrypted" event. We should rename it
instead of marking it as obsolete. There's a TODO to do the renaming.

[ddorwin, 2016/02/20 01:04:46]

Done.

   <owner>xhwang@chromium.org</owner>
   <summary>EME NeedKey event count.</summary>
 </histogram>
@@ -19356,11 +19377,17 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Media.EME.Unknown.addKey" enum="MediaKeyException">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>addKey result using an unknown key system.</summary>
 </histogram>
 
 <histogram name="Media.EME.Unknown.cancelKeyRequest" enum="MediaKeyException">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>cancelKeyRequest result using an unknown key system.</summary>
 </histogram>
@@ -19373,16 +19400,25 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Media.EME.Unknown.generateKeyRequest" enum="MediaKeyException">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>generateKeyRequest result using an unknown key system.</summary>
 </histogram>
 
 <histogram name="Media.EME.Unknown.KeyAdded">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>KeyAdded event count using an unknown key system.</summary>
 </histogram>
 
 <histogram name="Media.EME.Unknown.KeyError" enum="MediaKeyError">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>KeyError event count using an unknown key system.</summary>
 </histogram>
@@ -19401,11 +19437,17 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Media.EME.Widevine.addKey" enum="MediaKeyException">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>addKey result using the Widevine key system.</summary>
 </histogram>
 
 <histogram name="Media.EME.Widevine.cancelKeyRequest" enum="MediaKeyException">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>cancelKeyRequest result using the Widevine key system.</summary>
 </histogram>
@@ -19419,16 +19461,25 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="Media.EME.Widevine.generateKeyRequest"
     enum="MediaKeyException">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>generateKeyRequest result using the Widevine key system.</summary>
 </histogram>
 
 <histogram name="Media.EME.Widevine.KeyAdded">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>KeyAdded event count using the Widevine key system.</summary>
 </histogram>
 
 <histogram name="Media.EME.Widevine.KeyError" enum="MediaKeyError">
+  <obsolete>
+    Deprecated 02/2016 with removal of prefixed EME.
+  </obsolete>
   <owner>xhwang@chromium.org</owner>
   <summary>KeyError event count using the Widevine key system.</summary>
 </histogram>