diff --git a/browser/modules/PluginContent.jsm b/browser/modules/PluginContent.jsm index 13702c0e11ca..7ec6b7c8d358 100644 --- a/browser/modules/PluginContent.jsm +++ b/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; } diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 1ae01e9a1f76..619b23d07280 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/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], diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/components/telemetry/histogram-whitelists.json index adaa721f3cd6..61e845a8d2b4 100644 --- a/toolkit/components/telemetry/histogram-whitelists.json +++ b/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",