Bug 885042 - Remove vestigial add-on ignoring code. r=gps
authorRichard Newman <rnewman@mozilla.com>
Thu, 20 Jun 2013 18:39:14 -0700
changeset 135927 a69a04cbdedd99b662205dd721e262d52fd52b2d
parent 135926 41b33ca377851c40a80c57635dc3deb1c5699997
child 135928 a6350e257768e3b6689ed4345231977031c499e5
push id29884
push userrnewman@mozilla.com
push dateFri, 21 Jun 2013 01:39:25 +0000
treeherdermozilla-inbound@a69a04cbdedd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs885042
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 885042 - Remove vestigial add-on ignoring code. r=gps
mobile/android/chrome/content/browser.js
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -5133,17 +5133,17 @@ let HealthReportStatusListener = {
 
   observe: function (aSubject, aTopic, aData) {
     switch (aTopic) {
       case "Addons:FetchAll":
         HealthReportStatusListener.sendAllAddonsToJava();
         break;
       case "nsPref:changed":
         sendMessageToJava({ type: "Pref:Change", pref: aData, value: Services.prefs.getBoolPref(aData) });
-        break
+        break;
     }
   },
 
   MILLISECONDS_PER_DAY: 24 * 60 * 60 * 1000,
 
   COPY_FIELDS: [
     "blocklistState",
     "userDisabled",
@@ -5159,29 +5159,21 @@ let HealthReportStatusListener = {
   // All other types are ignored.
   FULL_DETAIL_TYPES: [
     "plugin",
     "extension",
     "service",
   ],
 
   /**
-   * Return true if either the add-on has opted out of AMO updates, and thus
-   * we shouldn't provide details to FHR, or it's an add-on type that we
-   * don't want to report details for.
+   * Return true if the add-on is not of a type for which we report full details.
    * These add-ons will still make it over to Java, but will be filtered out.
    */
   _shouldIgnore: function (aAddon) {
-    // TODO: check this pref. If it's false, the add-on has opted out of
-    // AMO updates, and should not be reported.
-    let optOutPref = "extensions." + aAddon.id + ".getAddons.cache.enabled";
-    if (this.FULL_DETAIL_TYPES.indexOf(aAddon.type) == -1) {
-      return true;
-    }
-    return false;
+    return this.FULL_DETAIL_TYPES.indexOf(aAddon.type) == -1;
   },
 
   _dateToDays: function (aDate) {
     return Math.floor(aDate.getTime() / this.MILLISECONDS_PER_DAY);
   },
 
   jsonForAddon: function (aAddon) {
     let o = {};