Bug 1232795 - Remove VIDEO_EME_DISABLED telemetry probe. r?spohl draft
authorChris Pearce <cpearce@mozilla.com>
Wed, 16 Dec 2015 10:32:41 +1300
changeset 315595 84c1cea6012ac2670dda7c1d5e1aaaad03ee70e6
parent 315548 cb66ffeb6725e8344818e8e2f707ae2eaeb953b4
child 315596 da4e90b6fcb032625c109f4636f39f0897d2fb6b
push id8434
push usercpearce@mozilla.com
push dateTue, 15 Dec 2015 21:41:02 +0000
reviewersspohl
bugs1232795
milestone46.0a1
Bug 1232795 - Remove VIDEO_EME_DISABLED telemetry probe. r?spohl
toolkit/components/telemetry/Histograms.json
toolkit/mozapps/extensions/internal/GMPProvider.jsm
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -9223,22 +9223,16 @@
     "description": "Has the tab queue functionality been enabled."
   },
   "FENNEC_OPEN_URLS_IN_PRIVATE": {
     "alert_emails": ["margaret@mozilla.com"],
     "expires_in_version": "45",
     "kind": "flag",
     "description": "Reports the state of the open external links in private tabs preference"
   },
-  "VIDEO_EME_DISABLED": {
-    "alert_emails": ["edwin@mozilla.com"],
-    "expires_in_version": "45",
-    "kind": "boolean",
-    "description": "Set if media.eme.enabled is false, in a build that supports the Adobe Primetime Content Decryption Module."
-  },
   "GRAPHICS_DRIVER_STARTUP_TEST": {
     "alert_emails": ["danderson@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 20,
     "releaseChannelCollection": "opt-out",
     "description": "Reports whether or not graphics drivers crashed during startup."
   },
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -600,22 +600,16 @@ var GMPProvider = {
         this._log.info("startup - adding clearkey CDM directory " +
                        clearkeyPath);
         gmpService.addPluginDirectory(clearkeyPath);
       } catch (e) {
         this._log.warn("startup - adding clearkey CDM failed", e);
       }
     }
 
-    if (Preferences.get("media.gmp-adobe-eme.enabled", false)) {
-      // Gather telemetry on how many Adobe-compatible installs have
-      // disabled EME.
-      telemetryService.getHistogramById("VIDEO_EME_DISABLED").add(!emeEnabled);
-    }
-
     AddonManagerPrivate.setTelemetryDetails("GMP", telemetry);
   },
 
   shutdown: function() {
     this._log.trace("shutdown");
     Preferences.ignore(GMPPrefs.KEY_LOG_BASE, configureLogging);
 
     let shutdownTask = Task.spawn(function*() {