Bug 1354778 - Remove expired telemetry probes PLUGIN_ACTIVATION_COUNT and PLUGIN_TINY_CONTENT. r=bsmedberg

As of Firefox 52, Flash is the only NPAPI plugin ever activated. As a keyed histogram for all plugin names, PLUGIN_ACTIVATION_COUNT telemetry is unwieldy to view. We can use the BLOCKED_ON_PLUGIN_INSTANCE_INIT_MS telemetry probe's sample count to track the number of Flash instantiations.

MozReview-Commit-ID: 62iGNLQ0nnE

--HG--
extra : rebase_source : b4a31a6bcb7b2525693b078838de726023f37d14

browser/modules/PluginContent.jsm

@@ -537,13 +537,7 @@ PluginContent.prototype = {
         break;
 
       case "PluginInstantiated":
-        let key = this._getPluginInfo(plugin).pluginTag.niceName;
-        Services.telemetry.getKeyedHistogramById("PLUGIN_ACTIVATION_COUNT").add(key);
         shouldShowNotification = true;
-        let pluginRect = plugin.getBoundingClientRect();
-        if (pluginRect.width <= 5 && pluginRect.height <= 5) {
-          Services.telemetry.getHistogramById("PLUGIN_TINY_CONTENT").add(1);
-        }
         break;
     }
 

toolkit/components/telemetry/Histograms.json

@@ -10518,15 +10518,6 @@
     "releaseChannelCollection": "opt-out",
     "description": "Graphics Crash Reason (...)"
   },
-  "PLUGIN_ACTIVATION_COUNT": {
-    "alert_emails": ["cpeterson@mozilla.com"],
-    "expires_in_version": "53",
-    "kind": "count",
-    "keyed": true,
-    "releaseChannelCollection": "opt-out",
-    "bug_numbers": [722110,1260065],
-    "description": "Counts number of times a certain plugin has been activated."
-  },
   "SCROLL_INPUT_METHODS": {
     "alert_emails": ["botond@mozilla.com"],
     "bug_numbers": [1238137],
@@ -10764,13 +10755,6 @@
     "bug_numbers": [1237198],
     "description": "Count plugins blocked for stability"
   },
-  "PLUGIN_TINY_CONTENT": {
-    "alert_emails": ["cpeterson@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "count",
-    "bug_numbers": [1237198],
-    "description": "Count tiny plugin content"
-  },
   "IPC_MESSAGE_SIZE": {
     "alert_emails": ["wmccloskey@mozilla.com"],
     "bug_numbers": [1260908],

toolkit/components/telemetry/histogram-whitelists.json

@@ -2026,10 +2026,8 @@
     "ONBEFOREUNLOAD_PROMPT_COUNT",
     "OPENGL_COMPOSITING_FAILURE_ID",
     "PERMISSIONS_SQL_CORRUPTED",
-    "PLUGIN_ACTIVATION_COUNT",
     "PLUGIN_BLOCKED_FOR_STABILITY",
     "PLUGIN_HANG_NOTICE_COUNT",
-    "PLUGIN_TINY_CONTENT",
     "PRINT_COUNT",
     "PRINT_DIALOG_OPENED_COUNT",
     "PRINT_PREVIEW_OPENED_COUNT",