Bug 1345075 - Remove FX_SANITIZE_LOADED_FLASH and FX_SANITIZE_UNLOADED_FLASH. r=Felipe

MozReview-Commit-ID: 1WoxWh3OkL4

--HG--
extra : rebase_source : 66a0de288fd3066e034394f30ffa990c1e4aaf57

browser/base/content/sanitize.js

@@ -734,13 +734,6 @@ Sanitizer.clearPluginData = Task.async(function* (range) {
     if (!range || age >= 0) {
       let tags = ph.getPluginTags();
       for (let tag of tags) {
-        let refObj = {};
-        let probe = "";
-        if (/\bFlash\b/.test(tag.name)) {
-          probe = tag.loaded ? "FX_SANITIZE_LOADED_FLASH"
-                             : "FX_SANITIZE_UNLOADED_FLASH";
-          TelemetryStopwatch.start(probe, refObj);
-        }
         try {
           let rv = yield new Promise(resolve =>
             ph.clearSiteData(tag, null, FLAG_CLEAR_ALL, age, resolve)
@@ -751,14 +744,8 @@ Sanitizer.clearPluginData = Task.async(function* (range) {
               ph.clearSiteData(tag, null, FLAG_CLEAR_ALL, -1, resolve)
             );
           }
-          if (probe) {
-            TelemetryStopwatch.finish(probe, refObj);
-          }
         } catch (ex) {
           // Ignore errors from plug-ins
-          if (probe) {
-            TelemetryStopwatch.cancel(probe, refObj);
-          }
         }
       }
     }

toolkit/components/telemetry/Histograms.json

@@ -9593,24 +9593,6 @@
     "n_buckets": 20,
     "description": "Sanitize: Time it takes to sanitize firefox cookies (ms). A subset of FX_SANITIZE_COOKIES."
   },
-  "FX_SANITIZE_LOADED_FLASH": {
-    "alert_emails": ["firefox-dev@mozilla.org"],
-    "bug_numbers": [1251469],
-    "expires_in_version": "55",
-    "kind": "exponential",
-    "high": 30000,
-    "n_buckets": 20,
-    "description": "Sanitize: Time it takes to sanitize Flash when it's already loaded (ms). A subset of FX_SANITIZE_PLUGINS."
-  },
-  "FX_SANITIZE_UNLOADED_FLASH": {
-    "alert_emails": ["firefox-dev@mozilla.org"],
-    "bug_numbers": [1251469],
-    "expires_in_version": "55",
-    "kind": "exponential",
-    "high": 30000,
-    "n_buckets": 20,
-    "description": "Sanitize: Time it takes to sanitize Flash when it's not yet loaded (ms). A subset of FX_SANITIZE_PLUGINS."
-  },
   "FX_SANITIZE_HISTORY": {
     "alert_emails": ["firefox-dev@mozilla.org"],
     "expires_in_version": "never",