Merge branch 'master' into Basilisk-release

38 files changed, 53 insertions, 4083 deletions

diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index fc4392231..1e185f879 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -4,10 +4,10 @@
 
 "use strict";
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-const Cr = Components.results;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
+var Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
diff --git a/toolkit/mozapps/extensions/content/newaddon.js b/toolkit/mozapps/extensions/content/newaddon.js
index 2b2a54af5..e45b3c1cc 100644
--- a/toolkit/mozapps/extensions/content/newaddon.js
+++ b/toolkit/mozapps/extensions/content/newaddon.js
@@ -2,9 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
diff --git a/toolkit/mozapps/extensions/content/selectAddons.js b/toolkit/mozapps/extensions/content/selectAddons.js
index f80932b3f..01b9030ee 100644
--- a/toolkit/mozapps/extensions/content/selectAddons.js
+++ b/toolkit/mozapps/extensions/content/selectAddons.js
@@ -10,8 +10,8 @@ Components.utils.import("resource://gre/modules/AddonManager.jsm");
 Components.utils.import("resource://gre/modules/addons/AddonRepository.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
 
 var gView = null;
 
diff --git a/toolkit/mozapps/extensions/extensions.manifest b/toolkit/mozapps/extensions/extensions.manifest
index 14aca3ff6..7efb74a9d 100644
--- a/toolkit/mozapps/extensions/extensions.manifest
+++ b/toolkit/mozapps/extensions/extensions.manifest
@@ -1,7 +1,3 @@
-component {66354bc9-7ed1-4692-ae1d-8da97d6b205e} nsBlocklistService.js
-contract @mozilla.org/extensions/blocklist;1 {66354bc9-7ed1-4692-ae1d-8da97d6b205e}
-category profile-after-change nsBlocklistService @mozilla.org/extensions/blocklist;1
-category update-timer nsBlocklistService @mozilla.org/extensions/blocklist;1,getService,blocklist-background-update-timer,extensions.blocklist.interval,86400
 component {4399533d-08d1-458c-a87a-235f74451cfa} addonManager.js
 contract @mozilla.org/addons/integration;1 {4399533d-08d1-458c-a87a-235f74451cfa}
 category update-timer addonManager @mozilla.org/addons/integration;1,getService,addon-background-update-timer,extensions.update.interval,86400
diff --git a/toolkit/mozapps/extensions/internal/Content.js b/toolkit/mozapps/extensions/internal/Content.js
index 61a8b0323..9ab3b9ad6 100644
--- a/toolkit/mozapps/extensions/internal/Content.js
+++ b/toolkit/mozapps/extensions/internal/Content.js
@@ -6,7 +6,7 @@
 
 (function() {
 
-const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 var {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
index 52affa9ba..25651f1b8 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -4,9 +4,9 @@
 
 "use strict";
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
 
 this.EXPORTED_SYMBOLS = [];
 
@@ -58,6 +58,7 @@ const GMP_PLUGINS = [
     optionsURL:      "chrome://mozapps/content/extensions/gmpPrefs.xul",
     isEME:           true
   }];
+XPCOMUtils.defineConstant(this, "GMP_PLUGINS", GMP_PLUGINS);
 
 XPCOMUtils.defineLazyGetter(this, "pluginsBundle",
   () => Services.strings.createBundle("chrome://global/locale/plugins.properties"));
diff --git a/toolkit/mozapps/webextensions/internal/ProductAddonChecker.jsm b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
index f98dd2a94..f98dd2a94 100644
--- a/toolkit/mozapps/webextensions/internal/ProductAddonChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 5b3585cd8..b522bd3ae 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -144,6 +144,7 @@ const FIREFOX_APPCOMPATVERSION        = "56.9"
 
 // The value for this is in Makefile.in
 #expand const DB_SCHEMA                       = __MOZ_EXTENSIONS_DB_SCHEMA__;
+XPCOMUtils.defineConstant(this, "DB_SCHEMA", DB_SCHEMA);
 #ifdef MOZ_DEVTOOLS
 const NOTIFICATION_TOOLBOXPROCESS_LOADED      = "ToolboxProcessLoaded";
 #endif
diff --git a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js b/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
index 6b37ed640..f2420bd1a 100644
--- a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
+++ b/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
@@ -4,10 +4,10 @@
 
 "use strict";
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-const Cu = Components.utils;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cr = Components.results;
+var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build
index efcd2af21..337df3104 100644
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ b/toolkit/mozapps/extensions/internal/moz.build
@@ -5,12 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES.addons += [
-    '../../webextensions/internal/ProductAddonChecker.jsm',
     'AddonLogging.jsm',
     'AddonRepository_SQLiteMigrator.jsm',
     'Content.js',
     'GMPProvider.jsm',
     'LightweightThemeImageOptimizer.jsm',
+    'ProductAddonChecker.jsm',
     'SpellCheckDictionaryBootstrap.js',
 ]
 
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build
index 19f449210..ca04d74a0 100644
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -25,7 +25,6 @@ EXTRA_COMPONENTS += [
 
 EXTRA_PP_COMPONENTS += [
     'extensions.manifest',
-    'nsBlocklistService.js',
 ]
 
 EXTRA_JS_MODULES += [
diff --git a/toolkit/mozapps/extensions/nsBlocklistService.js b/toolkit/mozapps/extensions/nsBlocklistService.js
deleted file mode 100644
index 487dae8e5..000000000
--- a/toolkit/mozapps/extensions/nsBlocklistService.js
+++ /dev/null
@@ -1,1478 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-try {
-  // AddonManager.jsm doesn't allow itself to be imported in the child
-  // process. We're used in the child process (for now), so guard against
-  // this.
-  Components.utils.import("resource://gre/modules/AddonManager.jsm");
-} catch (e) {
-}
-
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-                                  "resource://gre/modules/FileUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel",
-                                  "resource://gre/modules/UpdateChannel.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "OS",
-                                  "resource://gre/modules/osfile.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "Task",
-                                  "resource://gre/modules/Task.jsm");
-
-const TOOLKIT_ID                      = "toolkit@mozilla.org"
-const KEY_PROFILEDIR                  = "ProfD";
-const KEY_APPDIR                      = "XCurProcD";
-const FILE_BLOCKLIST                  = "blocklist.xml";
-const PREF_BLOCKLIST_LASTUPDATETIME   = "app.update.lastUpdateTime.blocklist-background-update-timer";
-const PREF_BLOCKLIST_URL              = "extensions.blocklist.url";
-const PREF_BLOCKLIST_ITEM_URL         = "extensions.blocklist.itemURL";
-const PREF_BLOCKLIST_ENABLED          = "extensions.blocklist.enabled";
-const PREF_BLOCKLIST_INTERVAL         = "extensions.blocklist.interval";
-const PREF_BLOCKLIST_LEVEL            = "extensions.blocklist.level";
-const PREF_BLOCKLIST_PINGCOUNTTOTAL   = "extensions.blocklist.pingCountTotal";
-const PREF_BLOCKLIST_PINGCOUNTVERSION = "extensions.blocklist.pingCountVersion";
-const PREF_BLOCKLIST_SUPPRESSUI       = "extensions.blocklist.suppressUI";
-const PREF_PLUGINS_NOTIFYUSER         = "plugins.update.notifyUser";
-const PREF_GENERAL_USERAGENT_LOCALE   = "general.useragent.locale";
-const PREF_APP_DISTRIBUTION           = "distribution.id";
-const PREF_APP_DISTRIBUTION_VERSION   = "distribution.version";
-const PREF_EM_LOGGING_ENABLED         = "extensions.logging.enabled";
-const XMLURI_BLOCKLIST                = "http://www.mozilla.org/2006/addons-blocklist";
-const XMLURI_PARSE_ERROR              = "http://www.mozilla.org/newlayout/xml/parsererror.xml"
-const UNKNOWN_XPCOM_ABI               = "unknownABI";
-const URI_BLOCKLIST_DIALOG            = "chrome://mozapps/content/extensions/blocklist.xul"
-const DEFAULT_SEVERITY                = 3;
-const DEFAULT_LEVEL                   = 2;
-const MAX_BLOCK_LEVEL                 = 3;
-const SEVERITY_OUTDATED               = 0;
-const VULNERABILITYSTATUS_NONE             = 0;
-const VULNERABILITYSTATUS_UPDATE_AVAILABLE = 1;
-const VULNERABILITYSTATUS_NO_UPDATE        = 2;
-
-const EXTENSION_BLOCK_FILTERS = ["id", "name", "creator", "homepageURL", "updateURL"];
-
-var gLoggingEnabled = null;
-var gBlocklistEnabled = true;
-var gBlocklistLevel = DEFAULT_LEVEL;
-
-XPCOMUtils.defineLazyServiceGetter(this, "gConsole",
-                                   "@mozilla.org/consoleservice;1",
-                                   "nsIConsoleService");
-
-XPCOMUtils.defineLazyServiceGetter(this, "gVersionChecker",
-                                   "@mozilla.org/xpcom/version-comparator;1",
-                                   "nsIVersionComparator");
-
-XPCOMUtils.defineLazyServiceGetter(this, "gCertBlocklistService",
-                                   "@mozilla.org/security/certblocklist;1",
-                                   "nsICertBlocklist");
-
-XPCOMUtils.defineLazyGetter(this, "gPref", function bls_gPref() {
-  return Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService).
-         QueryInterface(Ci.nsIPrefBranch);
-});
-
-XPCOMUtils.defineLazyGetter(this, "gApp", function bls_gApp() {
-  return Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo).
-         QueryInterface(Ci.nsIXULRuntime);
-});
-
-XPCOMUtils.defineLazyGetter(this, "gABI", function bls_gABI() {
-  let abi = null;
-  try {
-    abi = gApp.XPCOMABI;
-  }
-  catch (e) {
-    LOG("BlockList Global gABI: XPCOM ABI unknown.");
-  }
-#ifdef XP_MACOSX
-  // Mac universal build should report a different ABI than either macppc
-  // or mactel.
-  let macutils = Cc["@mozilla.org/xpcom/mac-utils;1"].
-                 getService(Ci.nsIMacUtils);
-
-  if (macutils.isUniversalBinary)
-    abi += "-u-" + macutils.architecturesInBinary;
-#endif
-  return abi;
-});
-
-XPCOMUtils.defineLazyGetter(this, "gOSVersion", function bls_gOSVersion() {
-  let osVersion;
-  let sysInfo = Cc["@mozilla.org/system-info;1"].
-                getService(Ci.nsIPropertyBag2);
-  try {
-    osVersion = sysInfo.getProperty("name") + " " + sysInfo.getProperty("version");
-  }
-  catch (e) {
-    LOG("BlockList Global gOSVersion: OS Version unknown.");
-  }
-
-  if (osVersion) {
-    try {
-      osVersion += " (" + sysInfo.getProperty("secondaryLibrary") + ")";
-    }
-    catch (e) {
-      // Not all platforms have a secondary widget library, so an error is nothing to worry about.
-    }
-    osVersion = encodeURIComponent(osVersion);
-  }
-  return osVersion;
-});
-
-// shared code for suppressing bad cert dialogs
-XPCOMUtils.defineLazyGetter(this, "gCertUtils", function bls_gCertUtils() {
-  let temp = { };
-  Components.utils.import("resource://gre/modules/CertUtils.jsm", temp);
-  return temp;
-});
-
-/**
- * Logs a string to the error console.
- * @param   string
- *          The string to write to the error console..
- */
-function LOG(string) {
-  if (gLoggingEnabled) {
-    dump("*** " + string + "\n");
-    gConsole.logStringMessage(string);
-  }
-}
-
-/**
- * Gets a preference value, handling the case where there is no default.
- * @param   func
- *          The name of the preference function to call, on nsIPrefBranch
- * @param   preference
- *          The name of the preference
- * @param   defaultValue
- *          The default value to return in the event the preference has
- *          no setting
- * @returns The value of the preference, or undefined if there was no
- *          user or default value.
- */
-function getPref(func, preference, defaultValue) {
-  try {
-    return gPref[func](preference);
-  }
-  catch (e) {
-  }
-  return defaultValue;
-}
-
-/**
- * Constructs a URI to a spec.
- * @param   spec
- *          The spec to construct a URI to
- * @returns The nsIURI constructed.
- */
-function newURI(spec) {
-  var ioServ = Cc["@mozilla.org/network/io-service;1"].
-               getService(Ci.nsIIOService);
-  return ioServ.newURI(spec, null, null);
-}
-
-// Restarts the application checking in with observers first
-function restartApp() {
-  // Notify all windows that an application quit has been requested.
-  var os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  var cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].
-                   createInstance(Ci.nsISupportsPRBool);
-  os.notifyObservers(cancelQuit, "quit-application-requested", null);
-
-  // Something aborted the quit process.
-  if (cancelQuit.data)
-    return;
-
-  var as = Cc["@mozilla.org/toolkit/app-startup;1"].
-           getService(Ci.nsIAppStartup);
-  as.quit(Ci.nsIAppStartup.eRestart | Ci.nsIAppStartup.eAttemptQuit);
-}
-
-/**
- * Checks whether this blocklist element is valid for the current OS and ABI.
- * If the element has an "os" attribute then the current OS must appear in
- * its comma separated list for the element to be valid. Similarly for the
- * xpcomabi attribute.
- */
-function matchesOSABI(blocklistElement) {
-  if (blocklistElement.hasAttribute("os")) {
-    var choices = blocklistElement.getAttribute("os").split(",");
-    if (choices.length > 0 && choices.indexOf(gApp.OS) < 0)
-      return false;
-  }
-
-  if (blocklistElement.hasAttribute("xpcomabi")) {
-    choices = blocklistElement.getAttribute("xpcomabi").split(",");
-    if (choices.length > 0 && choices.indexOf(gApp.XPCOMABI) < 0)
-      return false;
-  }
-
-  return true;
-}
-
-/**
- * Gets the current value of the locale.  It's possible for this preference to
- * be localized, so we have to do a little extra work here.  Similar code
- * exists in nsHttpHandler.cpp when building the UA string.
- */
-function getLocale() {
-  try {
-      // Get the default branch
-      var defaultPrefs = gPref.getDefaultBranch(null);
-      return defaultPrefs.getComplexValue(PREF_GENERAL_USERAGENT_LOCALE,
-                                          Ci.nsIPrefLocalizedString).data;
-  } catch (e) {}
-
-  return gPref.getCharPref(PREF_GENERAL_USERAGENT_LOCALE);
-}
-
-/* Get the distribution pref values, from defaults only */
-function getDistributionPrefValue(aPrefName) {
-  var prefValue = "default";
-
-  var defaults = gPref.getDefaultBranch(null);
-  try {
-    prefValue = defaults.getCharPref(aPrefName);
-  } catch (e) {
-    // use default when pref not found
-  }
-
-  return prefValue;
-}
-
-/**
- * Parse a string representation of a regular expression. Needed because we
- * use the /pattern/flags form (because it's detectable), which is only
- * supported as a literal in JS.
- *
- * @param  aStr
- *         String representation of regexp
- * @return RegExp instance
- */
-function parseRegExp(aStr) {
-  let lastSlash = aStr.lastIndexOf("/");
-  let pattern = aStr.slice(1, lastSlash);
-  let flags = aStr.slice(lastSlash + 1);
-  return new RegExp(pattern, flags);
-}
-
-/**
- * Helper function to test if the blockEntry matches with the plugin.
- *
- * @param   blockEntry
- *          The plugin blocklist entries to compare against.
- * @param   plugin
- *          The nsIPluginTag to get the blocklist state for.
- * @returns True if the blockEntry matches the plugin, false otherwise.
- */
-function matchesAllPluginNames(blockEntry, plugin) {
-  for (let name in blockEntry.matches) {
-    if (!(name in plugin) ||
-        typeof(plugin[name]) != "string" ||
-        !blockEntry.matches[name].test(plugin[name])) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/**
- * Manages the Blocklist. The Blocklist is a representation of the contents of
- * blocklist.xml and allows us to remotely disable / re-enable blocklisted
- * items managed by the Extension Manager with an item's appDisabled property.
- * It also blocklists plugins with data from blocklist.xml.
- */
-
-function Blocklist() {
-  Services.obs.addObserver(this, "xpcom-shutdown", false);
-  Services.obs.addObserver(this, "sessionstore-windows-restored", false);
-  gLoggingEnabled = getPref("getBoolPref", PREF_EM_LOGGING_ENABLED, false);
-  gBlocklistEnabled = getPref("getBoolPref", PREF_BLOCKLIST_ENABLED, true);
-  gBlocklistLevel = Math.min(getPref("getIntPref", PREF_BLOCKLIST_LEVEL, DEFAULT_LEVEL),
-                                     MAX_BLOCK_LEVEL);
-  gPref.addObserver("extensions.blocklist.", this, false);
-  gPref.addObserver(PREF_EM_LOGGING_ENABLED, this, false);
-  this.wrappedJSObject = this;
-}
-
-Blocklist.prototype = {
-  /**
-   * Extension ID -> array of Version Ranges
-   * Each value in the version range array is a JS Object that has the
-   * following properties:
-   *   "minVersion"  The minimum version in a version range (default = 0)
-   *   "maxVersion"  The maximum version in a version range (default = *)
-   *   "targetApps"  Application ID -> array of Version Ranges
-   *                 (default = current application ID)
-   *                 Each value in the version range array is a JS Object that
-   *                 has the following properties:
-   *                   "minVersion"  The minimum version in a version range
-   *                                 (default = 0)
-   *                   "maxVersion"  The maximum version in a version range
-   *                                 (default = *)
-   */
-  _addonEntries: null,
-  _pluginEntries: null,
-
-  observe: function Blocklist_observe(aSubject, aTopic, aData) {
-    switch (aTopic) {
-    case "xpcom-shutdown":
-      Services.obs.removeObserver(this, "xpcom-shutdown");
-      gPref.removeObserver("extensions.blocklist.", this);
-      gPref.removeObserver(PREF_EM_LOGGING_ENABLED, this);
-      break;
-    case "nsPref:changed":
-      switch (aData) {
-        case PREF_EM_LOGGING_ENABLED:
-          gLoggingEnabled = getPref("getBoolPref", PREF_EM_LOGGING_ENABLED, false);
-          break;
-        case PREF_BLOCKLIST_ENABLED:
-          gBlocklistEnabled = getPref("getBoolPref", PREF_BLOCKLIST_ENABLED, true);
-          this._loadBlocklist();
-          this._blocklistUpdated(null, null);
-          break;
-        case PREF_BLOCKLIST_LEVEL:
-          gBlocklistLevel = Math.min(getPref("getIntPref", PREF_BLOCKLIST_LEVEL, DEFAULT_LEVEL),
-                                     MAX_BLOCK_LEVEL);
-          this._blocklistUpdated(null, null);
-          break;
-      }
-      break;
-    case "sessionstore-windows-restored":
-      Services.obs.removeObserver(this, "sessionstore-windows-restored");
-      this._preloadBlocklist();
-      break;
-    }
-  },
-
-  /* See nsIBlocklistService */
-  isAddonBlocklisted: function Blocklist_isAddonBlocklisted(addon, appVersion, toolkitVersion) {
-    return this.getAddonBlocklistState(addon, appVersion, toolkitVersion) ==
-                   Ci.nsIBlocklistService.STATE_BLOCKED;
-  },
-
-  /* See nsIBlocklistService */
-  getAddonBlocklistState: function Blocklist_getAddonBlocklistState(addon, appVersion, toolkitVersion) {
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-    return this._getAddonBlocklistState(addon, this._addonEntries,
-                                        appVersion, toolkitVersion);
-  },
-
-  /**
-   * Private version of getAddonBlocklistState that allows the caller to pass in
-   * the add-on blocklist entries to compare against.
-   *
-   * @param   id
-   *          The ID of the item to get the blocklist state for.
-   * @param   version
-   *          The version of the item to get the blocklist state for.
-   * @param   addonEntries
-   *          The add-on blocklist entries to compare against.
-   * @param   appVersion
-   *          The application version to compare to, will use the current
-   *          version if null.
-   * @param   toolkitVersion
-   *          The toolkit version to compare to, will use the current version if
-   *          null.
-   * @returns The blocklist state for the item, one of the STATE constants as
-   *          defined in nsIBlocklistService.
-   */
-  _getAddonBlocklistState: function Blocklist_getAddonBlocklistStateCall(addon,
-                           addonEntries, appVersion, toolkitVersion) {
-    if (!gBlocklistEnabled)
-      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-
-    if (!appVersion)
-      appVersion = gApp.version;
-    if (!toolkitVersion)
-      toolkitVersion = gApp.platformVersion;
-
-    var blItem = this._findMatchingAddonEntry(addonEntries, addon);
-    if (!blItem)
-      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-
-    for (let currentblItem of blItem.versions) {
-      if (currentblItem.includesItem(addon.version, appVersion, toolkitVersion))
-        return currentblItem.severity >= gBlocklistLevel ? Ci.nsIBlocklistService.STATE_BLOCKED :
-                                                       Ci.nsIBlocklistService.STATE_SOFTBLOCKED;
-    }
-    return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-  },
-
-  /**
-   * Returns the set of prefs of the add-on stored in the blocklist file
-   * (probably to revert them on disabling).
-   * @param addon
-   *        The add-on whose to-be-reset prefs are to be found.
-   */
-  _getAddonPrefs: function Blocklist_getAddonPrefs(addon) {
-    let entry = this._findMatchingAddonEntry(this._addonEntries, addon);
-    return entry.prefs.slice(0);
-  },
-
-  _findMatchingAddonEntry: function Blocklist_findMatchingAddonEntry(aAddonEntries,
-                                                                     aAddon) {
-    if (!aAddon)
-      return null;
-    // Returns true if the params object passes the constraints set by entry.
-    // (For every non-null property in entry, the same key must exist in
-    // params and value must be the same)
-    function checkEntry(entry, params) {
-      for (let [key, value] of entry) {
-        if (value === null || value === undefined)
-          continue;
-        if (params[key]) {
-          if (value instanceof RegExp) {
-            if (!value.test(params[key])) {
-              return false;
-            }
-          } else if (value !== params[key]) {
-            return false;
-          }
-        } else {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    let params = {};
-    for (let filter of EXTENSION_BLOCK_FILTERS) {
-      params[filter] = aAddon[filter];
-    }
-    if (params.creator)
-      params.creator = params.creator.name;
-    for (let entry of aAddonEntries) {
-      if (checkEntry(entry.attributes, params)) {
-         return entry;
-       }
-     }
-     return null;
-  },
-
-  /* See nsIBlocklistService */
-  getAddonBlocklistURL: function Blocklist_getAddonBlocklistURL(addon, appVersion, toolkitVersion) {
-    if (!gBlocklistEnabled)
-      return "";
-
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-
-    let blItem = this._findMatchingAddonEntry(this._addonEntries, addon);
-    if (!blItem || !blItem.blockID)
-      return null;
-
-    return this._createBlocklistURL(blItem.blockID);
-  },
-
-  _createBlocklistURL: function Blocklist_createBlocklistURL(id) {
-    let url = Services.urlFormatter.formatURLPref(PREF_BLOCKLIST_ITEM_URL);
-    url = url.replace(/%blockID%/g, id);
-
-    return url;
-  },
-
-  notify: function Blocklist_notify(aTimer) {
-    if (!gBlocklistEnabled)
-      return;
-
-    try {
-      var dsURI = gPref.getCharPref(PREF_BLOCKLIST_URL);
-    }
-    catch (e) {
-      LOG("Blocklist::notify: The " + PREF_BLOCKLIST_URL + " preference" +
-          " is missing!");
-      return;
-    }
-
-    var pingCountVersion = getPref("getIntPref", PREF_BLOCKLIST_PINGCOUNTVERSION, 0);
-    var pingCountTotal = getPref("getIntPref", PREF_BLOCKLIST_PINGCOUNTTOTAL, 1);
-    var daysSinceLastPing = 0;
-    if (pingCountVersion == 0) {
-      daysSinceLastPing = "new";
-    }
-    else {
-      // Seconds in one day is used because nsIUpdateTimerManager stores the
-      // last update time in seconds.
-      let secondsInDay = 60 * 60 * 24;
-      let lastUpdateTime = getPref("getIntPref", PREF_BLOCKLIST_LASTUPDATETIME, 0);
-      if (lastUpdateTime == 0) {
-        daysSinceLastPing = "invalid";
-      }
-      else {
-        let now = Math.round(Date.now() / 1000);
-        daysSinceLastPing = Math.floor((now - lastUpdateTime) / secondsInDay);
-      }
-
-      if (daysSinceLastPing == 0 || daysSinceLastPing == "invalid") {
-        pingCountVersion = pingCountTotal = "invalid";
-      }
-    }
-
-    if (pingCountVersion < 1)
-      pingCountVersion = 1;
-    if (pingCountTotal < 1)
-      pingCountTotal = 1;
-
-    dsURI = dsURI.replace(/%APP_ID%/g, gApp.ID);
-    dsURI = dsURI.replace(/%APP_VERSION%/g, gApp.version);
-    dsURI = dsURI.replace(/%PRODUCT%/g, gApp.name);
-    dsURI = dsURI.replace(/%VERSION%/g, gApp.version);
-    dsURI = dsURI.replace(/%BUILD_ID%/g, gApp.appBuildID);
-    dsURI = dsURI.replace(/%BUILD_TARGET%/g, gApp.OS + "_" + gABI);
-    dsURI = dsURI.replace(/%OS_VERSION%/g, gOSVersion);
-    dsURI = dsURI.replace(/%LOCALE%/g, getLocale());
-    dsURI = dsURI.replace(/%CHANNEL%/g, UpdateChannel.get());
-    dsURI = dsURI.replace(/%PLATFORM_VERSION%/g, gApp.platformVersion);
-    dsURI = dsURI.replace(/%DISTRIBUTION%/g,
-                      getDistributionPrefValue(PREF_APP_DISTRIBUTION));
-    dsURI = dsURI.replace(/%DISTRIBUTION_VERSION%/g,
-                      getDistributionPrefValue(PREF_APP_DISTRIBUTION_VERSION));
-    dsURI = dsURI.replace(/%PING_COUNT%/g, pingCountVersion);
-    dsURI = dsURI.replace(/%TOTAL_PING_COUNT%/g, pingCountTotal);
-    dsURI = dsURI.replace(/%DAYS_SINCE_LAST_PING%/g, daysSinceLastPing);
-    dsURI = dsURI.replace(/\+/g, "%2B");
-
-    // Under normal operations it will take around 5,883,516 years before the
-    // preferences used to store pingCountVersion and pingCountTotal will rollover
-    // so this code doesn't bother trying to do the "right thing" here.
-    if (pingCountVersion != "invalid") {
-      pingCountVersion++;
-      if (pingCountVersion > 2147483647) {
-        // Rollover to -1 if the value is greater than what is support by an
-        // integer preference. The -1 indicates that the counter has been reset.
-        pingCountVersion = -1;
-      }
-      gPref.setIntPref(PREF_BLOCKLIST_PINGCOUNTVERSION, pingCountVersion);
-    }
-
-    if (pingCountTotal != "invalid") {
-      pingCountTotal++;
-      if (pingCountTotal > 2147483647) {
-        // Rollover to 1 if the value is greater than what is support by an
-        // integer preference.
-        pingCountTotal = -1;
-      }
-      gPref.setIntPref(PREF_BLOCKLIST_PINGCOUNTTOTAL, pingCountTotal);
-    }
-
-    // Verify that the URI is valid
-    try {
-      var uri = newURI(dsURI);
-    }
-    catch (e) {
-      LOG("Blocklist::notify: There was an error creating the blocklist URI\r\n" +
-          "for: " + dsURI + ", error: " + e);
-      return;
-    }
-
-    LOG("Blocklist::notify: Requesting " + uri.spec);
-    var request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].
-                  createInstance(Ci.nsIXMLHttpRequest);
-    request.open("GET", uri.spec, true);
-    request.channel.notificationCallbacks = new gCertUtils.BadCertHandler();
-    request.overrideMimeType("text/xml");
-    request.setRequestHeader("Cache-Control", "no-cache");
-    request.QueryInterface(Components.interfaces.nsIJSXMLHttpRequest);
-
-    var self = this;
-    request.addEventListener("error", function errorEventListener(event) {
-                                      self.onXMLError(event); }, false);
-    request.addEventListener("load", function loadEventListener(event) {
-                                     self.onXMLLoad(event);  }, false);
-    request.send(null);
-
-    // When the blocklist loads we need to compare it to the current copy so
-    // make sure we have loaded it.
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-  },
-
-  onXMLLoad: Task.async(function* (aEvent) {
-    let request = aEvent.target;
-    try {
-      gCertUtils.checkCert(request.channel);
-    }
-    catch (e) {
-      LOG("Blocklist::onXMLLoad: " + e);
-      return;
-    }
-    let responseXML = request.responseXML;
-    if (!responseXML || responseXML.documentElement.namespaceURI == XMLURI_PARSE_ERROR ||
-        (request.status != 200 && request.status != 0)) {
-      LOG("Blocklist::onXMLLoad: there was an error during load");
-      return;
-    }
-
-    var oldAddonEntries = this._addonEntries;
-    var oldPluginEntries = this._pluginEntries;
-    this._addonEntries = [];
-    this._pluginEntries = [];
-
-    this._loadBlocklistFromString(request.responseText);
-    this._blocklistUpdated(oldAddonEntries, oldPluginEntries);
-
-    try {
-      let path = OS.Path.join(OS.Constants.Path.profileDir, FILE_BLOCKLIST);
-      yield OS.File.writeAtomic(path, request.responseText, {tmpPath: path + ".tmp"});
-    } catch (e) {
-      LOG("Blocklist::onXMLLoad: " + e);
-    }
-  }),
-
-  onXMLError: function Blocklist_onXMLError(aEvent) {
-    try {
-      var request = aEvent.target;
-      // the following may throw (e.g. a local file or timeout)
-      var status = request.status;
-    }
-    catch (e) {
-      request = aEvent.target.channel.QueryInterface(Ci.nsIRequest);
-      status = request.status;
-    }
-    var statusText = "nsIXMLHttpRequest channel unavailable";
-    // When status is 0 we don't have a valid channel.
-    if (status != 0) {
-      try {
-        statusText = request.statusText;
-      } catch (e) {
-      }
-    }
-    LOG("Blocklist:onError: There was an error loading the blocklist file\r\n" +
-        statusText);
-  },
-
-  /**
-   * Finds the newest blocklist file from the application and the profile and
-   * load it or does nothing if neither exist.
-   */
-  _loadBlocklist: function Blocklist_loadBlocklist() {
-    this._addonEntries = [];
-    this._pluginEntries = [];
-    var profFile = FileUtils.getFile(KEY_PROFILEDIR, [FILE_BLOCKLIST]);
-    if (profFile.exists()) {
-      this._loadBlocklistFromFile(profFile);
-      return;
-    }
-    var appFile = FileUtils.getFile(KEY_APPDIR, [FILE_BLOCKLIST]);
-    if (appFile.exists()) {
-      this._loadBlocklistFromFile(appFile);
-      return;
-    }
-    LOG("Blocklist::_loadBlocklist: no XML File found");
-  },
-
-  /**
-#    The blocklist XML file looks something like this:
-#
-#    <blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
-#      <emItems>
-#        <emItem id="item_1@domain" blockID="i1">
-#          <prefs>
-#            <pref>accessibility.accesskeycausesactivation</pref>
-#            <pref>accessibility.blockautorefresh</pref>
-#          </prefs>
-#          <versionRange minVersion="1.0" maxVersion="2.0.*">
-#            <targetApplication id="{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}">
-#              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
-#              <versionRange minVersion="1.7" maxVersion="1.7.*"/>
-#            </targetApplication>
-#            <targetApplication id="toolkit@mozilla.org">
-#              <versionRange minVersion="1.9" maxVersion="1.9.*"/>
-#            </targetApplication>
-#          </versionRange>
-#          <versionRange minVersion="3.0" maxVersion="3.0.*">
-#            <targetApplication id="{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}">
-#              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
-#            </targetApplication>
-#            <targetApplication id="toolkit@mozilla.org">
-#              <versionRange minVersion="1.9" maxVersion="1.9.*"/>
-#            </targetApplication>
-#          </versionRange>
-#        </emItem>
-#        <emItem id="item_2@domain" blockID="i2">
-#          <versionRange minVersion="3.1" maxVersion="4.*"/>
-#        </emItem>
-#        <emItem id="item_3@domain">
-#          <versionRange>
-#            <targetApplication id="{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}">
-#              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
-#            </targetApplication>
-#          </versionRange>
-#        </emItem>
-#        <emItem id="item_4@domain" blockID="i3">
-#          <versionRange>
-#            <targetApplication>
-#              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
-#            </targetApplication>
-#          </versionRange>
-#        <emItem id="/@badperson\.com$/"/>
-#      </emItems>
-#      <pluginItems>
-#        <pluginItem blockID="i4">
-#          <!-- All match tags must match a plugin to blocklist a plugin -->
-#          <match name="name" exp="some plugin"/>
-#          <match name="description" exp="1[.]2[.]3"/>
-#        </pluginItem>
-#      </pluginItems>
-#      <certItems>
-#        <!-- issuerName is the DER issuer name data base64 encoded... -->
-#        <certItem issuerName="MA0xCzAJBgNVBAMMAmNh">
-#          <!-- ... as is the serial number DER data -->
-#          <serialNumber>AkHVNA==</serialNumber>
-#        </certItem>
-#      </certItems>
-#    </blocklist>
-   */
-
-  _loadBlocklistFromFile: function Blocklist_loadBlocklistFromFile(file) {
-    if (!gBlocklistEnabled) {
-      LOG("Blocklist::_loadBlocklistFromFile: blocklist is disabled");
-      return;
-    }
-
-    let telemetry = Services.telemetry;
-
-    if (this._isBlocklistPreloaded()) {
-      telemetry.getHistogramById("BLOCKLIST_SYNC_FILE_LOAD").add(false);
-      this._loadBlocklistFromString(this._preloadedBlocklistContent);
-      delete this._preloadedBlocklistContent;
-      return;
-    }
-
-    if (!file.exists()) {
-      LOG("Blocklist::_loadBlocklistFromFile: XML File does not exist " + file.path);
-      return;
-    }
-
-    telemetry.getHistogramById("BLOCKLIST_SYNC_FILE_LOAD").add(true);
-
-    let text = "";
-    let fstream = null;
-    let cstream = null;
-
-    try {
-      fstream = Components.classes["@mozilla.org/network/file-input-stream;1"]
-                          .createInstance(Components.interfaces.nsIFileInputStream);
-      cstream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
-                          .createInstance(Components.interfaces.nsIConverterInputStream);
-
-      fstream.init(file, FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE, 0);
-      cstream.init(fstream, "UTF-8", 0, 0);
-
-      let str = {};
-      let read = 0;
-
-      do {
-        read = cstream.readString(0xffffffff, str); // read as much as we can and put it in str.value
-        text += str.value;
-      } while (read != 0);
-    } catch (e) {
-      LOG("Blocklist::_loadBlocklistFromFile: Failed to load XML file " + e);
-    } finally {
-      if (cstream)
-        cstream.close();
-      if (fstream)
-        fstream.close();
-    }
-
-    if (text)
-        this._loadBlocklistFromString(text);
-  },
-
-  _isBlocklistLoaded: function() {
-    return this._addonEntries != null && this._pluginEntries != null;
-  },
-
-  _isBlocklistPreloaded: function() {
-    return this._preloadedBlocklistContent != null;
-  },
-
-  /* Used for testing */
-  _clear: function() {
-    this._addonEntries = null;
-    this._pluginEntries = null;
-    this._preloadedBlocklistContent = null;
-  },
-
-  _preloadBlocklist: Task.async(function*() {
-    let profPath = OS.Path.join(OS.Constants.Path.profileDir, FILE_BLOCKLIST);
-    try {
-      yield this._preloadBlocklistFile(profPath);
-      return;
-    } catch (e) {
-      LOG("Blocklist::_preloadBlocklist: Failed to load XML file " + e)
-    }
-
-    var appFile = FileUtils.getFile(KEY_APPDIR, [FILE_BLOCKLIST]);
-    try{
-      yield this._preloadBlocklistFile(appFile.path);
-      return;
-    } catch (e) {
-      LOG("Blocklist::_preloadBlocklist: Failed to load XML file " + e)
-    }
-
-    LOG("Blocklist::_preloadBlocklist: no XML File found");
-  }),
-
-  _preloadBlocklistFile: Task.async(function* (path){
-    if (this._addonEntries) {
-      // The file has been already loaded.
-      return;
-    }
-
-    if (!gBlocklistEnabled) {
-      LOG("Blocklist::_preloadBlocklistFile: blocklist is disabled");
-      return;
-    }
-
-    let text = yield OS.File.read(path, { encoding: "utf-8" });
-
-    if (!this._addonEntries) {
-      // Store the content only if a sync load has not been performed in the meantime.
-      this._preloadedBlocklistContent = text;
-    }
-  }),
-
-  _loadBlocklistFromString : function Blocklist_loadBlocklistFromString(text) {
-    try {
-      var parser = Cc["@mozilla.org/xmlextras/domparser;1"].
-                   createInstance(Ci.nsIDOMParser);
-      var doc = parser.parseFromString(text, "text/xml");
-      if (doc.documentElement.namespaceURI != XMLURI_BLOCKLIST) {
-        LOG("Blocklist::_loadBlocklistFromFile: aborting due to incorrect " +
-            "XML Namespace.\r\nExpected: " + XMLURI_BLOCKLIST + "\r\n" +
-            "Received: " + doc.documentElement.namespaceURI);
-        return;
-      }
-
-      var childNodes = doc.documentElement.childNodes;
-      for (let element of childNodes) {
-        if (!(element instanceof Ci.nsIDOMElement))
-          continue;
-        switch (element.localName) {
-        case "emItems":
-          this._addonEntries = this._processItemNodes(element.childNodes, "em",
-                                                      this._handleEmItemNode);
-          break;
-        case "pluginItems":
-          this._pluginEntries = this._processItemNodes(element.childNodes, "plugin",
-                                                       this._handlePluginItemNode);
-          break;
-        case "certItems":
-          this._processItemNodes(element.childNodes, "cert",
-                                 this._handleCertItemNode.bind(this));
-          break;
-        default:
-          Services.obs.notifyObservers(element,
-                                       "blocklist-data-" + element.localName,
-                                       null);
-        }
-      }
-      gCertBlocklistService.saveEntries();
-    }
-    catch (e) {
-      LOG("Blocklist::_loadBlocklistFromFile: Error constructing blocklist " + e);
-      return;
-    }
-  },
-
-  _processItemNodes: function Blocklist_processItemNodes(itemNodes, prefix, handler) {
-    var result = [];
-    var itemName = prefix + "Item";
-    for (var i = 0; i < itemNodes.length; ++i) {
-      var blocklistElement = itemNodes.item(i);
-      if (!(blocklistElement instanceof Ci.nsIDOMElement) ||
-          blocklistElement.localName != itemName)
-        continue;
-
-      handler(blocklistElement, result);
-    }
-    return result;
-  },
-
-  _handleCertItemNode: function Blocklist_handleCertItemNode(blocklistElement,
-                                                             result) {
-    let issuer = blocklistElement.getAttribute("issuerName");
-    for (let snElement of blocklistElement.children) {
-      try {
-        gCertBlocklistService.revokeCertByIssuerAndSerial(issuer, snElement.textContent);
-      } catch (e) {
-        // we want to keep trying other elements since missing all items
-        // is worse than missing one
-        LOG("Blocklist::_handleCertItemNode: Error adding revoked cert " + e);
-      }
-    }
-  },
-
-  _handleEmItemNode: function Blocklist_handleEmItemNode(blocklistElement, result) {
-    if (!matchesOSABI(blocklistElement))
-      return;
-
-    let blockEntry = {
-      versions: [],
-      prefs: [],
-      blockID: null,
-      attributes: new Map()
-      // Atleast one of EXTENSION_BLOCK_FILTERS must get added to attributes
-    };
-
-    // Any filter starting with '/' is interpreted as a regex. So if an attribute
-    // starts with a '/' it must be checked via a regex.
-    function regExpCheck(attr) {
-      return attr.startsWith("/") ? parseRegExp(attr) : attr;
-    }
-
-    for (let filter of EXTENSION_BLOCK_FILTERS) {
-      let attr = blocklistElement.getAttribute(filter);
-      if (attr)
-        blockEntry.attributes.set(filter, regExpCheck(attr));
-    }
-
-    var childNodes = blocklistElement.childNodes;
-
-    for (let x = 0; x < childNodes.length; x++) {
-      var childElement = childNodes.item(x);
-      if (!(childElement instanceof Ci.nsIDOMElement))
-        continue;
-      if (childElement.localName === "prefs") {
-        let prefElements = childElement.childNodes;
-        for (let i = 0; i < prefElements.length; i++) {
-          let prefElement = prefElements.item(i);
-          if (!(prefElement instanceof Ci.nsIDOMElement) ||
-              prefElement.localName !== "pref")
-            continue;
-          blockEntry.prefs.push(prefElement.textContent);
-        }
-      }
-      else if (childElement.localName === "versionRange")
-        blockEntry.versions.push(new BlocklistItemData(childElement));
-    }
-    // if only the extension ID is specified block all versions of the
-    // extension for the current application.
-    if (blockEntry.versions.length == 0)
-      blockEntry.versions.push(new BlocklistItemData(null));
-
-    blockEntry.blockID = blocklistElement.getAttribute("blockID");
-
-    result.push(blockEntry);
-  },
-
-  _handlePluginItemNode: function Blocklist_handlePluginItemNode(blocklistElement, result) {
-    if (!matchesOSABI(blocklistElement))
-      return;
-
-    var matchNodes = blocklistElement.childNodes;
-    var blockEntry = {
-      matches: {},
-      versions: [],
-      blockID: null,
-      infoURL: null,
-    };
-    var hasMatch = false;
-    for (var x = 0; x < matchNodes.length; ++x) {
-      var matchElement = matchNodes.item(x);
-      if (!(matchElement instanceof Ci.nsIDOMElement))
-        continue;
-      if (matchElement.localName == "match") {
-        var name = matchElement.getAttribute("name");
-        var exp = matchElement.getAttribute("exp");
-        try {
-          blockEntry.matches[name] = new RegExp(exp, "m");
-          hasMatch = true;
-        } catch (e) {
-          // Ignore invalid regular expressions
-        }
-      }
-      if (matchElement.localName == "versionRange") {
-        blockEntry.versions.push(new BlocklistItemData(matchElement));
-      }
-      else if (matchElement.localName == "infoURL") {
-        blockEntry.infoURL = matchElement.textContent;
-      }
-    }
-    // Plugin entries require *something* to match to an actual plugin
-    if (!hasMatch)
-      return;
-    // Add a default versionRange if there wasn't one specified
-    if (blockEntry.versions.length == 0)
-      blockEntry.versions.push(new BlocklistItemData(null));
-
-    blockEntry.blockID = blocklistElement.getAttribute("blockID");
-
-    result.push(blockEntry);
-  },
-
-  /* See nsIBlocklistService */
-  getPluginBlocklistState: function Blocklist_getPluginBlocklistState(plugin,
-                           appVersion, toolkitVersion) {
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-    return this._getPluginBlocklistState(plugin, this._pluginEntries,
-                                         appVersion, toolkitVersion);
-  },
-
-  /**
-   * Private version of getPluginBlocklistState that allows the caller to pass in
-   * the plugin blocklist entries.
-   *
-   * @param   plugin
-   *          The nsIPluginTag to get the blocklist state for.
-   * @param   pluginEntries
-   *          The plugin blocklist entries to compare against.
-   * @param   appVersion
-   *          The application version to compare to, will use the current
-   *          version if null.
-   * @param   toolkitVersion
-   *          The toolkit version to compare to, will use the current version if
-   *          null.
-   * @returns The blocklist state for the item, one of the STATE constants as
-   *          defined in nsIBlocklistService.
-   */
-  _getPluginBlocklistState: function Blocklist_getPluginBlocklistState(plugin,
-                            pluginEntries, appVersion, toolkitVersion) {
-    if (!gBlocklistEnabled)
-      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-
-    if (!appVersion)
-      appVersion = gApp.version;
-    if (!toolkitVersion)
-      toolkitVersion = gApp.platformVersion;
-
-    for each (var blockEntry in pluginEntries) {
-      var matchFailed = false;
-      for (var name in blockEntry.matches) {
-        if (!(name in plugin) ||
-            typeof(plugin[name]) != "string" ||
-            !blockEntry.matches[name].test(plugin[name])) {
-          matchFailed = true;
-          break;
-        }
-      }
-
-      if (matchFailed)
-        continue;
-
-      for (let blockEntryVersion of blockEntry.versions) {
-        if (blockEntryVersion.includesItem(plugin.version, appVersion,
-                                                toolkitVersion)) {
-          if (blockEntryVersion.severity >= gBlocklistLevel)
-            return Ci.nsIBlocklistService.STATE_BLOCKED;
-          if (blockEntryVersion.severity == SEVERITY_OUTDATED) {
-            let vulnerabilityStatus = blockEntryVersion.vulnerabilityStatus;
-            if (vulnerabilityStatus == VULNERABILITYSTATUS_UPDATE_AVAILABLE)
-              return Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE;
-            if (vulnerabilityStatus == VULNERABILITYSTATUS_NO_UPDATE)
-              return Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE;
-            return Ci.nsIBlocklistService.STATE_OUTDATED;
-          }
-          return Ci.nsIBlocklistService.STATE_SOFTBLOCKED;
-        }
-      }
-    }
-
-    return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-  },
-
-  /**
-   * Get the matching blocklist entry for the passed plugin, if
-   * available.
-   * @param plugin The plugin to find the block entry for.
-   * @returns The block entry which matches the passed plugin, null
-   *          otherwise.
-   */
-  _getPluginBlockEntry: function (plugin) {
-    if (!gBlocklistEnabled)
-      return null;
-
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-
-    for each (let blockEntry in this._pluginEntries) {
-      if (matchesAllPluginNames(blockEntry, plugin)) {
-        return blockEntry;
-      }
-    }
-
-	  return null;
-  },
-
-  /* See nsIBlocklistService */
-  getPluginBlocklistURL: function Blocklist_getPluginBlocklistURL(plugin) {
-    let blockEntry = this._getPluginBlockEntry(plugin);
-    if (!blockEntry || !blockEntry.blockID) {
-      return null;
-    }
-
-    return this._createBlocklistURL(blockEntry.blockID);
-  },
-
-  /* See nsIBlocklistService */
-  getPluginInfoURL: function (plugin) {
-    let blockEntry = this._getPluginBlockEntry(plugin);
-    if (!blockEntry || !blockEntry.blockID) {
-      return null;
-    }
-
-    return blockEntry.infoURL;
-  },
-
-  _blocklistUpdated: function Blocklist_blocklistUpdated(oldAddonEntries, oldPluginEntries) {
-    var addonList = [];
-
-    // A helper function that reverts the prefs passed to default values.
-    function resetPrefs(prefs) {
-      for (let pref of prefs)
-        gPref.clearUserPref(pref);
-    }
-    var self = this;
-    const types = ["extension", "theme", "locale", "dictionary", "service"];
-    AddonManager.getAddonsByTypes(types, function blocklistUpdated_getAddonsByTypes(addons) {
-
-      for (let addon of addons) {
-        let oldState = Ci.nsIBlocklistService.STATE_NOTBLOCKED;
-        if (oldAddonEntries)
-          oldState = self._getAddonBlocklistState(addon, oldAddonEntries);
-        let state = self.getAddonBlocklistState(addon);
-
-        LOG("Blocklist state for " + addon.id + " changed from " +
-            oldState + " to " + state);
-
-        // We don't want to re-warn about add-ons
-        if (state == oldState)
-          continue;
-
-        if (state === Ci.nsIBlocklistService.STATE_BLOCKED) {
-          // It's a hard block. We must reset certain preferences.
-          let prefs = self._getAddonPrefs(addon);
-          resetPrefs(prefs);
-         }
-
-        // Ensure that softDisabled is false if the add-on is not soft blocked
-        if (state != Ci.nsIBlocklistService.STATE_SOFTBLOCKED)
-          addon.softDisabled = false;
-
-        // Don't warn about add-ons becoming unblocked.
-        if (state == Ci.nsIBlocklistService.STATE_NOT_BLOCKED)
-          continue;
-
-        // If an add-on has dropped from hard to soft blocked just mark it as
-        // soft disabled and don't warn about it.
-        if (state == Ci.nsIBlocklistService.STATE_SOFTBLOCKED &&
-            oldState == Ci.nsIBlocklistService.STATE_BLOCKED) {
-          addon.softDisabled = true;
-          continue;
-        }
-
-        // If the add-on is already disabled for some reason then don't warn
-        // about it
-        if (!addon.isActive)
-          continue;
-
-        addonList.push({
-          name: addon.name,
-          version: addon.version,
-          icon: addon.iconURL,
-          disable: false,
-          blocked: state == Ci.nsIBlocklistService.STATE_BLOCKED,
-          item: addon,
-          url: self.getAddonBlocklistURL(addon),
-        });
-      }
-
-      AddonManagerPrivate.updateAddonAppDisabledStates();
-
-      var phs = Cc["@mozilla.org/plugin/host;1"].
-                getService(Ci.nsIPluginHost);
-      var plugins = phs.getPluginTags();
-
-      for (let plugin of plugins) {
-        let oldState = -1;
-        if (oldPluginEntries)
-          oldState = self._getPluginBlocklistState(plugin, oldPluginEntries);
-        let state = self.getPluginBlocklistState(plugin);
-        LOG("Blocklist state for " + plugin.name + " changed from " +
-            oldState + " to " + state);
-        // We don't want to re-warn about items
-        if (state == oldState)
-          continue;
-
-        if (oldState == Ci.nsIBlocklistService.STATE_BLOCKED) {
-          if (state == Ci.nsIBlocklistService.STATE_SOFTBLOCKED)
-            plugin.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
-        }
-        else if (!plugin.disabled && state != Ci.nsIBlocklistService.STATE_NOT_BLOCKED) {
-          if (state == Ci.nsIBlocklistService.STATE_OUTDATED) {
-            gPref.setBoolPref(PREF_PLUGINS_NOTIFYUSER, true);
-          }
-          else if (state != Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE &&
-                   state != Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE) {
-            addonList.push({
-              name: plugin.name,
-              version: plugin.version,
-              icon: "chrome://mozapps/skin/plugins/pluginGeneric.png",
-              disable: false,
-              blocked: state == Ci.nsIBlocklistService.STATE_BLOCKED,
-              item: plugin,
-              url: self.getPluginBlocklistURL(plugin),
-            });
-          }
-        }
-      }
-
-      if (addonList.length == 0) {
-        Services.obs.notifyObservers(self, "blocklist-updated", "");
-        return;
-      }
-
-      if ("@mozilla.org/addons/blocklist-prompt;1" in Cc) {
-        try {
-          let blockedPrompter = Cc["@mozilla.org/addons/blocklist-prompt;1"]
-                                 .getService(Ci.nsIBlocklistPrompt);
-          blockedPrompter.prompt(addonList);
-        } catch (e) {
-          LOG(e);
-        }
-        Services.obs.notifyObservers(self, "blocklist-updated", "");
-        return;
-      }
-
-      var args = {
-        restart: false,
-        list: addonList
-      };
-      // This lets the dialog get the raw js object
-      args.wrappedJSObject = args;
-
-      /*
-        Some tests run without UI, so the async code listens to a message
-        that can be sent programatically
-      */
-      let applyBlocklistChanges = function blocklistUpdated_applyBlocklistChanges() {
-        for (let addon of addonList) {
-          if (!addon.disable)
-            continue;
-
-          if (addon.item instanceof Ci.nsIPluginTag)
-            addon.item.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
-          else {
-            // This add-on is softblocked.
-            addon.item.softDisabled = true;
-            // We must revert certain prefs.
-            let prefs = self._getAddonPrefs(addon.item);
-            resetPrefs(prefs);
-          }
-        }
-
-        if (args.restart)
-          restartApp();
-
-        Services.obs.notifyObservers(self, "blocklist-updated", "");
-        Services.obs.removeObserver(applyBlocklistChanges, "addon-blocklist-closed");
-      }
-
-      Services.obs.addObserver(applyBlocklistChanges, "addon-blocklist-closed", false);
-
-      if (getPref("getBoolPref", PREF_BLOCKLIST_SUPPRESSUI, false)) {
-        applyBlocklistChanges();
-        return;
-      }
-
-      function blocklistUnloadHandler(event) {
-        if (event.target.location == URI_BLOCKLIST_DIALOG) {
-          applyBlocklistChanges();
-          blocklistWindow.removeEventListener("unload", blocklistUnloadHandler);
-        }
-      }
-
-      let blocklistWindow = Services.ww.openWindow(null, URI_BLOCKLIST_DIALOG, "",
-                              "chrome,centerscreen,dialog,titlebar", args);
-      if (blocklistWindow)
-        blocklistWindow.addEventListener("unload", blocklistUnloadHandler, false);
-    });
-  },
-
-  classID: Components.ID("{66354bc9-7ed1-4692-ae1d-8da97d6b205e}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                         Ci.nsIBlocklistService,
-                                         Ci.nsITimerCallback]),
-};
-
-/**
- * Helper for constructing a blocklist.
- */
-function BlocklistItemData(versionRangeElement) {
-  var versionRange = this.getBlocklistVersionRange(versionRangeElement);
-  this.minVersion = versionRange.minVersion;
-  this.maxVersion = versionRange.maxVersion;
-  if (versionRangeElement && versionRangeElement.hasAttribute("severity"))
-    this.severity = versionRangeElement.getAttribute("severity");
-  else
-    this.severity = DEFAULT_SEVERITY;
-  if (versionRangeElement && versionRangeElement.hasAttribute("vulnerabilitystatus")) {
-    this.vulnerabilityStatus = versionRangeElement.getAttribute("vulnerabilitystatus");
-  } else {
-    this.vulnerabilityStatus = VULNERABILITYSTATUS_NONE;
-  }
-  this.targetApps = { };
-  var found = false;
-
-  if (versionRangeElement) {
-    for (var i = 0; i < versionRangeElement.childNodes.length; ++i) {
-      var targetAppElement = versionRangeElement.childNodes.item(i);
-      if (!(targetAppElement instanceof Ci.nsIDOMElement) ||
-          targetAppElement.localName != "targetApplication")
-        continue;
-      found = true;
-      // default to the current application if id is not provided.
-      var appID = targetAppElement.hasAttribute("id") ? targetAppElement.getAttribute("id") : gApp.ID;
-      this.targetApps[appID] = this.getBlocklistAppVersions(targetAppElement);
-    }
-  }
-  // Default to all versions of the current application when no targetApplication
-  // elements were found
-  if (!found)
-    this.targetApps[gApp.ID] = this.getBlocklistAppVersions(null);
-}
-
-BlocklistItemData.prototype = {
-  /**
-   * Tests if a version of an item is included in the version range and target
-   * application information represented by this BlocklistItemData using the
-   * provided application and toolkit versions.
-   * @param   version
-   *          The version of the item being tested.
-   * @param   appVersion
-   *          The application version to test with.
-   * @param   toolkitVersion
-   *          The toolkit version to test with.
-   * @returns True if the version range covers the item version and application
-   *          or toolkit version.
-   */
-  includesItem: function BlocklistItemData_includesItem(version, appVersion, toolkitVersion) {
-    // Some platforms have no version for plugins, these don't match if there
-    // was a min/maxVersion provided
-    if (!version && (this.minVersion || this.maxVersion))
-      return false;
-
-    // Check if the item version matches
-    if (!this.matchesRange(version, this.minVersion, this.maxVersion))
-      return false;
-
-    // Check if the application version matches
-    if (this.matchesTargetRange(gApp.ID, appVersion))
-      return true;
-
-    // Check if the toolkit version matches
-    return this.matchesTargetRange(TOOLKIT_ID, toolkitVersion);
-  },
-
-  /**
-   * Checks if a version is higher than or equal to the minVersion (if provided)
-   * and lower than or equal to the maxVersion (if provided).
-   * @param   version
-   *          The version to test.
-   * @param   minVersion
-   *          The minimum version. If null it is assumed that version is always
-   *          larger.
-   * @param   maxVersion
-   *          The maximum version. If null it is assumed that version is always
-   *          smaller.
-   */
-  matchesRange: function BlocklistItemData_matchesRange(version, minVersion, maxVersion) {
-    if (minVersion && gVersionChecker.compare(version, minVersion) < 0)
-      return false;
-    if (maxVersion && gVersionChecker.compare(version, maxVersion) > 0)
-      return false;
-    return true;
-  },
-
-  /**
-   * Tests if there is a matching range for the given target application id and
-   * version.
-   * @param   appID
-   *          The application ID to test for, may be for an application or toolkit
-   * @param   appVersion
-   *          The version of the application to test for.
-   * @returns True if this version range covers the application version given.
-   */
-  matchesTargetRange: function BlocklistItemData_matchesTargetRange(appID, appVersion) {
-    var blTargetApp = this.targetApps[appID];
-    if (!blTargetApp)
-      return false;
-
-    for (let app of blTargetApp) {
-      if (this.matchesRange(appVersion, app.minVersion, app.maxVersion))
-        return true;
-    }
-
-    return false;
-  },
-
-  /**
-   * Retrieves a version range (e.g. minVersion and maxVersion) for a
-   * blocklist item's targetApplication element.
-   * @param   targetAppElement
-   *          A targetApplication blocklist element.
-   * @returns An array of JS objects with the following properties:
-   *          "minVersion"  The minimum version in a version range (default = null).
-   *          "maxVersion"  The maximum version in a version range (default = null).
-   */
-  getBlocklistAppVersions: function BlocklistItemData_getBlocklistAppVersions(targetAppElement) {
-    var appVersions = [ ];
-
-    if (targetAppElement) {
-      for (var i = 0; i < targetAppElement.childNodes.length; ++i) {
-        var versionRangeElement = targetAppElement.childNodes.item(i);
-        if (!(versionRangeElement instanceof Ci.nsIDOMElement) ||
-            versionRangeElement.localName != "versionRange")
-          continue;
-        appVersions.push(this.getBlocklistVersionRange(versionRangeElement));
-      }
-    }
-    // return minVersion = null and maxVersion = null if no specific versionRange
-    // elements were found
-    if (appVersions.length == 0)
-      appVersions.push(this.getBlocklistVersionRange(null));
-    return appVersions;
-  },
-
-  /**
-   * Retrieves a version range (e.g. minVersion and maxVersion) for a blocklist
-   * versionRange element.
-   * @param   versionRangeElement
-   *          The versionRange blocklist element.
-   * @returns A JS object with the following properties:
-   *          "minVersion"  The minimum version in a version range (default = null).
-   *          "maxVersion"  The maximum version in a version range (default = null).
-   */
-  getBlocklistVersionRange: function BlocklistItemData_getBlocklistVersionRange(versionRangeElement) {
-    var minVersion = null;
-    var maxVersion = null;
-    if (!versionRangeElement)
-      return { minVersion: minVersion, maxVersion: maxVersion };
-
-    if (versionRangeElement.hasAttribute("minVersion"))
-      minVersion = versionRangeElement.getAttribute("minVersion");
-    if (versionRangeElement.hasAttribute("maxVersion"))
-      maxVersion = versionRangeElement.getAttribute("maxVersion");
-
-    return { minVersion: minVersion, maxVersion: maxVersion };
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([Blocklist]);
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
index 9abfd855a..25103ff37 100644
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -349,10 +349,6 @@ ifndef MOZ_PKG_MANIFEST
   NO_PKG_FILES += ssltunnel*
 endif
 
-ifdef MOZ_DMD
-  NO_PKG_FILES += SmokeDMD
-endif
-
 DEFINES += -DDLL_PREFIX=$(DLL_PREFIX) -DDLL_SUFFIX=$(DLL_SUFFIX) -DBIN_SUFFIX=$(BIN_SUFFIX)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff --git a/toolkit/mozapps/webextensions/amIAddonManager.idl b/toolkit/mozapps/webextensions/amIAddonManager.idl
deleted file mode 100644
index 58a58b62d..000000000
--- a/toolkit/mozapps/webextensions/amIAddonManager.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsIURI;
-
-/**
- * A service to make some AddonManager functionality available to C++ callers.
- * Javascript callers should still use AddonManager.jsm directly.
- */
-[scriptable, function, uuid(7b45d82d-7ad5-48d7-9b05-f32eb9818cd4)]
-interface amIAddonManager : nsISupports
-{
-  /**
-   * Synchronously map a URI to the corresponding Addon ID.
-   *
-   * Mappable URIs are limited to in-application resources belonging to the
-   * add-on, such as Javascript compartments, XUL windows, XBL bindings, etc.
-   * but do not include URIs from meta data, such as the add-on homepage.
-   *
-   * @param  aURI
-   *         The nsIURI to map
-   * @return
-   *         true if the URI has been mapped successfully to an Addon ID
-   */
-  boolean mapURIToAddonID(in nsIURI aURI, out AUTF8String aID);
-};
diff --git a/toolkit/mozapps/webextensions/amIAddonPathService.idl b/toolkit/mozapps/webextensions/amIAddonPathService.idl
deleted file mode 100644
index 9c9197a61..000000000
--- a/toolkit/mozapps/webextensions/amIAddonPathService.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsIURI;
-
-/**
- * This service maps file system paths where add-ons reside to the ID
- * of the add-on. Paths are added by the add-on manager. They can
- * looked up by anyone.
- */
-[scriptable, uuid(fcd9e270-dfb1-11e3-8b68-0800200c9a66)]
-interface amIAddonPathService : nsISupports
-{
-  /**
-   * Given a path to a file, return the ID of the add-on that the file belongs
-   * to. Returns an empty string if there is no add-on there. Note that if an
-   * add-on is located at /a/b/c, then looking up the path /a/b/c/d will return
-   * that add-on.
-   */
-  AString findAddonId(in AString path);
-
-  /**
-   * Call this function to inform the service that the given file system path is
-   * associated with the given add-on ID.
-   */
-  void insertPath(in AString path, in AString addonId);
-
-  /**
-   * Given a URI to a file, return the ID of the add-on that the file belongs
-   * to. Returns an empty string if there is no add-on there.
-   */
-  AString mapURIToAddonId(in nsIURI aURI);
-};
diff --git a/toolkit/mozapps/webextensions/amIWebInstallListener.idl b/toolkit/mozapps/webextensions/amIWebInstallListener.idl
deleted file mode 100644
index eed108097..000000000
--- a/toolkit/mozapps/webextensions/amIWebInstallListener.idl
+++ /dev/null
@@ -1,134 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsIDOMElement;
-interface nsIURI;
-interface nsIVariant;
-
-/**
- * amIWebInstallInfo is used by the default implementation of
- * amIWebInstallListener to communicate with the running application and allow
- * it to warn the user about blocked installs and start the installs running.
- */
-[scriptable, uuid(fa0b47a3-f819-47ac-bc66-4bd1d7f67b1d)]
-interface amIWebInstallInfo : nsISupports
-{
-  readonly attribute nsIDOMElement browser;
-  readonly attribute nsIURI originatingURI;
-  readonly attribute nsIVariant installs;
-
-  /**
-   * Starts all installs.
-   */
-  void install();
-};
-
-/**
- * The registered amIWebInstallListener is used to notify about new installs
- * triggered by websites. The default implementation displays a confirmation
- * dialog when add-ons are ready to install and uses the observer service to
- * notify when installations are blocked.
- */
-[scriptable, uuid(d9240d4b-6b3a-4cad-b402-de6c93337e0c)]
-interface amIWebInstallListener : nsISupports
-{
-  /**
-   * Called when installation by websites is currently disabled.
-   *
-   * @param  aBrowser
-   *         The browser that triggered the installs
-   * @param  aUri
-   *         The URI of the site that triggered the installs
-   * @param  aInstalls
-   *         The AddonInstalls that were blocked
-   * @param  aCount
-   *         The number of AddonInstalls
-   */
-  void onWebInstallDisabled(in nsIDOMElement aBrowser, in nsIURI aUri,
-                            [array, size_is(aCount)] in nsIVariant aInstalls,
-                            [optional] in uint32_t aCount);
-
-  /**
-   * Called when the website is not allowed to directly prompt the user to
-   * install add-ons.
-   *
-   * @param  aBrowser
-   *         The browser that triggered the installs
-   * @param  aUri
-   *         The URI of the site that triggered the installs
-   * @param  aInstalls
-   *         The AddonInstalls that were blocked
-   * @param  aCount
-   *         The number of AddonInstalls
-   * @return true if the caller should start the installs
-   */
-  boolean onWebInstallBlocked(in nsIDOMElement aBrowser, in nsIURI aUri,
-                              [array, size_is(aCount)] in nsIVariant aInstalls,
-                              [optional] in uint32_t aCount);
-
-  /**
-   * Called when a website wants to ask the user to install add-ons.
-   *
-   * @param  aBrowser
-   *         The browser that triggered the installs
-   * @param  aUri
-   *         The URI of the site that triggered the installs
-   * @param  aInstalls
-   *         The AddonInstalls that were requested
-   * @param  aCount
-   *         The number of AddonInstalls
-   * @return true if the caller should start the installs
-   */
-  boolean onWebInstallRequested(in nsIDOMElement aBrowser, in nsIURI aUri,
-                                [array, size_is(aCount)] in nsIVariant aInstalls,
-                                [optional] in uint32_t aCount);
-};
-
-[scriptable, uuid(a80b89ad-bb1a-4c43-9cb7-3ae656556f78)]
-interface amIWebInstallListener2 : nsISupports
-{
-  /**
-   * Called when a non-same-origin resource attempted to initiate an install.
-   * Installs will have already been cancelled and cannot be restarted.
-   *
-   * @param  aBrowser
-   *         The browser that triggered the installs
-   * @param  aUri
-   *         The URI of the site that triggered the installs
-   * @param  aInstalls
-   *         The AddonInstalls that were blocked
-   * @param  aCount
-   *         The number of AddonInstalls
-   */
-  boolean onWebInstallOriginBlocked(in nsIDOMElement aBrowser, in nsIURI aUri,
-                                    [array, size_is(aCount)] in nsIVariant aInstalls,
-                                    [optional] in uint32_t aCount);
-};
-
-/**
- * amIWebInstallPrompt is used, if available, by the default implementation of 
- * amIWebInstallInfo to display a confirmation UI to the user before running
- * installs.
- */
-[scriptable, uuid(386906f1-4d18-45bf-bc81-5dcd68e42c3b)]
-interface amIWebInstallPrompt : nsISupports
-{
-  /**
-   * Get a confirmation that the user wants to start the installs.
-   *
-   * @param  aBrowser
-   *         The browser that triggered the installs
-   * @param  aUri
-   *         The URI of the site that triggered the installs
-   * @param  aInstalls
-   *         The AddonInstalls that were requested
-   * @param  aCount
-   *         The number of AddonInstalls
-   */
-  void confirm(in nsIDOMElement aBrowser, in nsIURI aUri,
-               [array, size_is(aCount)] in nsIVariant aInstalls,
-               [optional] in uint32_t aCount);
-};
diff --git a/toolkit/mozapps/webextensions/amIWebInstaller.idl b/toolkit/mozapps/webextensions/amIWebInstaller.idl
deleted file mode 100644
index 6c5ebca67..000000000
--- a/toolkit/mozapps/webextensions/amIWebInstaller.idl
+++ /dev/null
@@ -1,82 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsIDOMElement;
-interface nsIVariant;
-interface nsIURI;
-
-/**
- * A callback function used to notify webpages when a requested install has
- * ended.
- *
- * NOTE: This is *not* the same as InstallListener.
- */
-[scriptable, function, uuid(bb22f5c0-3ca1-48f6-873c-54e87987700f)]
-interface amIInstallCallback : nsISupports
-{
-  /**
-   * Called when an install completes or fails.
-   *
-   * @param  aUrl
-   *         The url of the add-on being installed
-   * @param  aStatus
-   *         0 if the install was successful or negative if not
-   */
-  void onInstallEnded(in AString aUrl, in int32_t aStatus);
-};
-
-
-/**
- * This interface is used to allow webpages to start installing add-ons.
- */
-[scriptable, uuid(658d6c09-15e0-4688-bee8-8551030472a9)]
-interface amIWebInstaller : nsISupports
-{
-  /**
-   * Checks if installation is enabled for a webpage.
-   *
-   * @param  aMimetype
-   *         The mimetype for the add-on to be installed
-   * @param  referer
-   *         The URL of the webpage trying to install an add-on
-   * @return true if installation is enabled
-   */
-  boolean isInstallEnabled(in AString aMimetype, in nsIURI aReferer);
-
-  /**
-   * Installs an array of add-ons at the request of a webpage
-   *
-   * @param  aMimetype
-   *         The mimetype for the add-ons
-   * @param  aBrowser
-   *         The browser installing the add-ons.
-   * @param  aReferer
-   *         The URI for the webpage installing the add-ons
-   * @param  aUris
-   *         The URIs of add-ons to be installed
-   * @param  aHashes
-   *         The hashes for the add-ons to be installed
-   * @param  aNames
-   *         The names for the add-ons to be installed
-   * @param  aIcons
-   *         The icons for the add-ons to be installed
-   * @param  aCallback
-   *         An optional callback to notify about installation success and
-   *         failure
-   * @param  aInstallCount
-   *         An optional argument including the number of add-ons to install
-   * @return true if the installation was successfully started
-   */
-  boolean installAddonsFromWebpage(in AString aMimetype,
-                                   in nsIDOMElement aBrowser,
-                                   in nsIURI aReferer,
-                                   [array, size_is(aInstallCount)] in wstring aUris,
-                                   [array, size_is(aInstallCount)] in wstring aHashes,
-                                   [array, size_is(aInstallCount)] in wstring aNames,
-                                   [array, size_is(aInstallCount)] in wstring aIcons,
-                                   [optional] in amIInstallCallback aCallback,
-                                   [optional] in uint32_t aInstallCount);
-};
diff --git a/toolkit/mozapps/webextensions/content/OpenH264-license.txt b/toolkit/mozapps/webextensions/content/OpenH264-license.txt
deleted file mode 100644
index ad37989b8..000000000
--- a/toolkit/mozapps/webextensions/content/OpenH264-license.txt
+++ /dev/null
@@ -1,59 +0,0 @@
--------------------------------------------------------

-About The Cisco-Provided Binary of OpenH264 Video Codec

--------------------------------------------------------

-

-Cisco provides this program under the terms of the BSD license.  

-

-Additionally, this binary is licensed under Cisco’s AVC/H.264 Patent Portfolio License from MPEG LA, at no cost to you, provided that the requirements and conditions shown below in the AVC/H.264 Patent Portfolio sections are met.  

-

-As with all AVC/H.264 codecs, you may also obtain your own patent license from MPEG LA or from the individual patent owners, or proceed at your own risk.  Your rights from Cisco under the BSD license are not affected by this choice.  

-

-For more information on the OpenH264 binary licensing, please see the OpenH264 FAQ found at http://www.openh264.org/faq.html#binary 

-

-A corresponding source code to this binary program is available under the same BSD terms, which can be found at http://www.openh264.org

-

------------

-BSD License

------------

-

-Copyright © 2014 Cisco Systems, Inc.

-

-All rights reserved.

-

-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

-

-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

-

-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

------------------------------------------

-AVC/H.264 Patent Portfolio License Notice

------------------------------------------

-

-The binary form of this Software is distributed by Cisco under the AVC/H.264 Patent Portfolio License from MPEG LA, and is subject to the following requirements, which may or may not be applicable to your use of this software: 

-

-THIS PRODUCT IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR THE PERSONAL USE OF A CONSUMER OR OTHER USES IN WHICH IT DOES NOT RECEIVE REMUNERATION TO (i) ENCODE VIDEO IN COMPLIANCE WITH THE AVC STANDARD (“AVC VIDEO”) AND/OR (ii) DECODE AVC VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PROVIDER LICENSED TO PROVIDE AVC VIDEO.  NO LICENSE IS GRANTED OR SHALL BE IMPLIED FOR ANY OTHER USE.  ADDITIONAL INFORMATION MAY BE OBTAINED FROM MPEG LA, L.L.C. SEE HTTP://WWW.MPEGLA.COM

-

-Accordingly, please be advised that content providers and broadcasters using AVC/H.264 in their service may be required to obtain a separate use license from MPEG LA, referred to as "(b) sublicenses" in the SUMMARY OF AVC/H.264 LICENSE TERMS from MPEG LA found at http://www.openh264.org/mpegla

-

----------------------------------------------

-AVC/H.264 Patent Portfolio License Conditions

----------------------------------------------

-

-In addition, the Cisco-provided binary of this Software is licensed under Cisco's license from MPEG LA only if the following conditions are met:

-

-1. The Cisco-provided binary is separately downloaded to an end user’s device, and not integrated into or combined with third party software prior to being downloaded to the end user’s device;

-

-2. The end user must have the ability to control (e.g., to enable, disable, or re-enable) the use of the Cisco-provided binary;

-

-3. Third party software, in the location where end users can control the use of the Cisco-provided binary, must display the following text:

-

-       "OpenH264 Video Codec provided by Cisco Systems, Inc."

-

-4.  Any third-party software that makes use of the Cisco-provided binary must reproduce all of the above text, as well as this last condition, in the EULA and/or in another location where licensing information is to be presented to the end user.  

- 

-

-

-                          v1.0

diff --git a/toolkit/mozapps/webextensions/content/about.xul b/toolkit/mozapps/webextensions/content/about.xul
deleted file mode 100644
index 6effcf37a..000000000
--- a/toolkit/mozapps/webextensions/content/about.xul
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
-<?xml-stylesheet href="chrome://mozapps/skin/extensions/about.css" type="text/css"?> 
-
-<!DOCTYPE dialog SYSTEM "chrome://mozapps/locale/extensions/about.dtd">
-
-<dialog id="genericAbout"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="init();"
-        buttons="accept"
-        buttoniconaccept="close"
-        onaccept="close();">
-
-  <script type="application/javascript" src="chrome://mozapps/content/extensions/about.js"/>
-  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
-
-  <stringbundleset id="aboutSet">
-    <stringbundle id="extensionsStrings" src="chrome://mozapps/locale/extensions/extensions.properties"/>
-  </stringbundleset>
-
-  <vbox id="clientBox" flex="1">
-    <hbox class="basic-info">
-      <vbox pack="center">
-        <image id="extensionIcon"/>
-      </vbox>
-      <vbox flex="1">
-        <label id="extensionName"/>
-        <label id="extensionVersion" crop="end"/>
-      </vbox>
-    </hbox>
-    <description id="extensionDescription" class="boxIndent"/>
-
-    <separator id="groove" class="groove"/>
-
-    <vbox id="extensionDetailsBox" flex="1">
-      <label id="extensionCreatorLabel" class="sectionTitle">&creator.label;</label>
-      <hbox id="creatorBox" class="boxIndent">
-        <label id="extensionCreator" flex="1" crop="end"/>
-        <label id="extensionHomepage" onclick="if (event.button == 0) { loadHomepage(event); }"
-               class="text-link" value="&homepage.label;"/>
-      </hbox>
-  
-      <label id="extensionDevelopers" class="sectionTitle">&developers.label;</label>
-      <vbox flex="1" id="developersBox" class="boxIndent"/>
-      <label id="extensionTranslators" class="sectionTitle">&translators.label;</label>
-      <vbox flex="1" id="translatorsBox" class="boxIndent"/>
-      <label id="extensionContributors" class="sectionTitle">&contributors.label;</label>
-      <vbox flex="1" id="contributorsBox" class="boxIndent"/>
-    </vbox>
-  </vbox>
-
-</dialog>
diff --git a/toolkit/mozapps/webextensions/content/blocklist.css b/toolkit/mozapps/webextensions/content/blocklist.css
deleted file mode 100644
index cb48005a2..000000000
--- a/toolkit/mozapps/webextensions/content/blocklist.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.hardBlockedAddon {
-  -moz-binding: url("chrome://mozapps/content/extensions/blocklist.xml#hardblockedaddon");
-}
-
-.softBlockedAddon {
-  -moz-binding: url("chrome://mozapps/content/extensions/blocklist.xml#softblockedaddon");
-}
diff --git a/toolkit/mozapps/webextensions/content/blocklist.xml b/toolkit/mozapps/webextensions/content/blocklist.xml
deleted file mode 100644
index 74474392f..000000000
--- a/toolkit/mozapps/webextensions/content/blocklist.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE bindings [
-  <!ENTITY % blocklistDTD SYSTEM "chrome://mozapps/locale/extensions/blocklist.dtd" >
-  %blocklistDTD;
-]>
-
-<bindings id="blocklistBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:xbl="http://www.mozilla.org/xbl">
-
-  <binding id="hardblockedaddon">
-    <content align="start">
-      <xul:image xbl:inherits="src=icon"/>
-      <xul:vbox flex="1">
-        <xul:hbox class="addon-name-version">
-          <xul:label class="addonName" crop="end" xbl:inherits="value=name"/>
-          <xul:label class="addonVersion" xbl:inherits="value=version"/>
-        </xul:hbox>
-        <xul:hbox>
-          <xul:spacer flex="1"/>
-          <xul:label class="blockedLabel" value="&blocklist.blocked.label;"/>
-        </xul:hbox>
-      </xul:vbox>
-    </content>
-  </binding>
-
-  <binding id="softblockedaddon">
-    <content align="start">
-      <xul:image xbl:inherits="src=icon"/>
-      <xul:vbox flex="1">
-        <xul:hbox class="addon-name-version">
-          <xul:label class="addonName" crop="end" xbl:inherits="value=name"/>
-          <xul:label class="addonVersion" xbl:inherits="value=version"/>
-        </xul:hbox>
-        <xul:hbox>
-          <xul:spacer flex="1"/>
-          <xul:checkbox class="disableCheckbox" checked="true" label="&blocklist.checkbox.label;"/>
-        </xul:hbox>
-      </xul:vbox>
-    </content>
-    <implementation>
-      <field name="_checkbox">
-        document.getAnonymousElementByAttribute(this, "class", "disableCheckbox")
-      </field>
-      <property name="checked" readonly="true">
-        <getter>
-          return this._checkbox.checked;
-        </getter>
-      </property>
-    </implementation>
-  </binding>
-</bindings>
diff --git a/toolkit/mozapps/webextensions/content/blocklist.xul b/toolkit/mozapps/webextensions/content/blocklist.xul
deleted file mode 100644
index 240d9e4e1..000000000
--- a/toolkit/mozapps/webextensions/content/blocklist.xul
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://global/skin/"?>
-<?xml-stylesheet href="chrome://mozapps/skin/extensions/blocklist.css"?>
-<?xml-stylesheet href="chrome://mozapps/content/extensions/blocklist.css"?>
-
-<!DOCTYPE dialog [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/blocklist.dtd">
-%extensionsDTD;
-]>
-
-<dialog windowtype="Addons:Blocklist" title="&blocklist.title;" align="stretch"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="init();" ondialogaccept="return finish(true)"
-                         ondialogcancel="return finish(false)"
-        buttons="accept,cancel" style="&blocklist.style;"
-        buttonlabelaccept="&blocklist.accept.label;"
-        buttonaccesskeyaccept="&blocklist.accept.accesskey;">
-
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://mozapps/content/extensions/blocklist.js"/>
-
-  <hbox align="stretch" flex="1">
-    <vbox pack="start">
-      <image class="error-icon"/>
-    </vbox>
-    <vbox flex="1">
-      <label>&blocklist.summary;</label>
-      <separator class="thin"/>
-      <richlistbox id="addonList" flex="1"/>
-      <separator class="thin"/>
-      <description id="bothMessage" hidden="true" class="bold">&blocklist.softandhard;</description>
-      <description id="hardBlockMessage" hidden="true" class="bold">&blocklist.hardblocked;</description>
-      <description id="softBlockMessage" hidden="true" class="bold">&blocklist.softblocked;</description>
-      <hbox pack="start">
-        <label id="moreInfo" class="text-link" value="&blocklist.moreinfo;"/>
-      </hbox>
-    </vbox>
-  </hbox>
-</dialog>
diff --git a/toolkit/mozapps/webextensions/content/eula.xul b/toolkit/mozapps/webextensions/content/eula.xul
deleted file mode 100644
index 10e657951..000000000
--- a/toolkit/mozapps/webextensions/content/eula.xul
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://mozapps/skin/extensions/eula.css" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd">
-%extensionsDTD;
-]>
-
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&eula.title;" width="&eula.width;" height="&eula.height;"
-        buttons="accept,cancel" buttonlabelaccept="&eula.accept;"
-        ondialogaccept="window.arguments[0].accepted = true"
-        onload="Startup();">
-
-  <script type="application/javascript" src="chrome://mozapps/content/extensions/eula.js"/>
-  
-  <stringbundleset id="extensionsSet">
-    <stringbundle id="extensionsStrings" src="chrome://mozapps/locale/extensions/extensions.properties"/>
-  </stringbundleset>
-
-  <hbox id="heading-container">
-    <image id="icon"/>
-    <label id="heading" flex="1"/>
-  </hbox>
-  
-  <textbox id="eula" multiline="true" readonly="true" flex="1"/>
-</dialog>
diff --git a/toolkit/mozapps/webextensions/content/gmpPrefs.xul b/toolkit/mozapps/webextensions/content/gmpPrefs.xul
deleted file mode 100644
index ea7ee92fa..000000000
--- a/toolkit/mozapps/webextensions/content/gmpPrefs.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-- License, v. 2.0. If a copy of the MPL was not distributed with this file,
-- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- This is intentionally empty and a dummy to let the GMPProvider
-     have a preferences button in the list view. -->
diff --git a/toolkit/mozapps/webextensions/content/list.xul b/toolkit/mozapps/webextensions/content/list.xul
deleted file mode 100644
index 65efeb6a2..000000000
--- a/toolkit/mozapps/webextensions/content/list.xul
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://global/skin/"?>
-
-<dialog id="addonList" windowtype="Addons:List"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onunload="shutdown();"
-        buttons="accept,cancel" onload="init();">
-
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" 
-          src="chrome://mozapps/content/extensions/list.js"/>
-          
-  <stringbundle id="extensionsBundle" 
-                src="chrome://mozapps/locale/extensions/extensions.properties"/>
-  <stringbundle id="brandBundle"
-                src="chrome://branding/locale/brand.properties"/>
-
-  <hbox align="start">
-    <vbox>
-      <image id="infoIcon"/>
-    </vbox>
-    <vbox class="spaced" style="min-width: 20em; max-width: 40em">
-      <label id="message1" class="spaced" hidden="true"/>
-      <separator class="thin"/>
-      <tree id="addonsTree" rows="6" hidecolumnpicker="true" hidden="true" class="spaced">
-        <treecols style="max-width: 25em;">
-          <treecol flex="1" id="nameColumn" hideheader="true"/>
-        </treecols>
-        <treechildren id="addonsChildren"/>
-      </tree>
-      <label id="message2" class="spaced" hidden="true"/>
-      <label class="bold spaced" id="message3" hidden="true"/>
-      <hbox id="moreInfoBox" hidden="true">
-        <label id="moreInfo" class="text-link spaced"/>
-        <spacer flex="1"/>
-      </hbox>
-    </vbox>
-  </hbox>
-</dialog>
diff --git a/toolkit/mozapps/webextensions/content/pluginPrefs.xul b/toolkit/mozapps/webextensions/content/pluginPrefs.xul
deleted file mode 100644
index c3fdbfa5b..000000000
--- a/toolkit/mozapps/webextensions/content/pluginPrefs.xul
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
-   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
-
-<!DOCTYPE window SYSTEM "chrome://pluginproblem/locale/pluginproblem.dtd">
-
-<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <setting type="control" title="&plugin.file;">
-    <label class="text-list" id="pluginLibraries"/>
-  </setting>
-  <setting type="control" title="&plugin.mimeTypes;">
-    <label class="text-list" id="pluginMimeTypes"/>
-  </setting>
-  <setting type="bool" pref="dom.ipc.plugins.flash.disable-protected-mode"
-           inverted="true" title="&plugin.flashProtectedMode.label;"
-           id="pluginEnableProtectedMode"
-           learnmore="https://support.mozilla.org/kb/flash-protected-mode-settings" />
-</vbox>
diff --git a/toolkit/mozapps/webextensions/content/updateinfo.xsl b/toolkit/mozapps/webextensions/content/updateinfo.xsl
deleted file mode 100644
index 5fcccd6d7..000000000
--- a/toolkit/mozapps/webextensions/content/updateinfo.xsl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<xsl:stylesheet version="1.0" xmlns:xhtml="http://www.w3.org/1999/xhtml"
-                              xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <!-- Any elements not otherwise specified will be stripped but the contents
-       will be displayed. All attributes are stripped from copied elements. -->
-
-  <!-- Block these elements and their contents -->
-  <xsl:template match="xhtml:head|xhtml:script|xhtml:style">
-  </xsl:template>
-
-  <!-- Allowable styling elements -->
-  <xsl:template match="xhtml:b|xhtml:i|xhtml:em|xhtml:strong|xhtml:u|xhtml:q|xhtml:sub|xhtml:sup|xhtml:code">
-    <xsl:copy><xsl:apply-templates/></xsl:copy>
-  </xsl:template>
-
-  <!-- Allowable block formatting elements -->
-  <xsl:template match="xhtml:h1|xhtml:h2|xhtml:h3|xhtml:p|xhtml:div|xhtml:blockquote|xhtml:pre">
-    <xsl:copy><xsl:apply-templates/></xsl:copy>
-  </xsl:template>
-
-  <!-- Allowable list formatting elements -->
-  <xsl:template match="xhtml:ul|xhtml:ol|xhtml:li|xhtml:dl|xhtml:dt|xhtml:dd">
-    <xsl:copy><xsl:apply-templates/></xsl:copy>
-  </xsl:template>
-
-  <!-- These elements are copied and their contents dropped -->
-  <xsl:template match="xhtml:br|xhtml:hr">
-    <xsl:copy/>
-  </xsl:template>
-
-  <!-- The root document -->
-  <xsl:template match="/">
-    <xhtml:body><xsl:apply-templates/></xhtml:body>
-  </xsl:template>
-  
-</xsl:stylesheet>
diff --git a/toolkit/mozapps/webextensions/content/xpinstallConfirm.css b/toolkit/mozapps/webextensions/content/xpinstallConfirm.css
deleted file mode 100644
index 583facfec..000000000
--- a/toolkit/mozapps/webextensions/content/xpinstallConfirm.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-installitem {
-  -moz-binding: url("chrome://mozapps/content/xpinstall/xpinstallItem.xml#installitem");
-  display: -moz-box;
-}
diff --git a/toolkit/mozapps/webextensions/content/xpinstallConfirm.xul b/toolkit/mozapps/webextensions/content/xpinstallConfirm.xul
deleted file mode 100644
index f1c29eb73..000000000
--- a/toolkit/mozapps/webextensions/content/xpinstallConfirm.xul
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://mozapps/content/xpinstall/xpinstallConfirm.css" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://mozapps/skin/xpinstall/xpinstallConfirm.css" type="text/css"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://mozapps/locale/xpinstall/xpinstallConfirm.dtd">
-
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="xpinstallConfirm" title="&dialog.title;" style="&dialog.style;" 
-        windowtype="Addons:Install"
-        onload="XPInstallConfirm.init()" 
-        ondialogaccept="return XPInstallConfirm.onOK();"
-        ondialogcancel="return XPInstallConfirm.onCancel();">
-
-  <script src="chrome://mozapps/content/xpinstall/xpinstallConfirm.js" type="application/javascript"/>
-
-  <stringbundle id="xpinstallConfirmStrings" 
-                src="chrome://mozapps/locale/xpinstall/xpinstallConfirm.properties"/>
-
-  <vbox flex="1" id="dialogContentBox">
-    <hbox id="xpinstallheader" align="start">
-      <image class="alert-icon"/>
-      <vbox flex="1">
-        <description class="warning">&warningPrimary.label;</description>
-        <description>&warningSecondary.label;</description>
-      </vbox>
-    </hbox>
-    <label id="itemWarningIntro"/>
-    <vbox id="itemList" class="listbox" flex="1" style="overflow: auto;"/>
-  </vbox>
-
-</dialog>
diff --git a/toolkit/mozapps/webextensions/content/xpinstallItem.xml b/toolkit/mozapps/webextensions/content/xpinstallItem.xml
deleted file mode 100644
index 5146af84f..000000000
--- a/toolkit/mozapps/webextensions/content/xpinstallItem.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<!DOCTYPE bindings SYSTEM "chrome://mozapps/locale/xpinstall/xpinstallConfirm.dtd">
-
-<bindings id="xpinstallItemBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:xbl="http://www.mozilla.org/xbl">
-
-  <binding id="installitem">
-    <resources>
-      <stylesheet src="chrome://mozapps/skin/xpinstall/xpinstallConfirm.css"/>
-    </resources>
-    <content>
-      <xul:hbox flex="1">
-        <xul:vbox align="center" pack="center" class="xpinstallIconContainer">
-          <xul:image class="xpinstallItemIcon" xbl:inherits="src=icon"/>
-        </xul:vbox>
-        <xul:vbox flex="1" pack="center">
-          <xul:hbox class="xpinstallItemNameRow" align="center">
-            <xul:label class="xpinstallItemName" xbl:inherits="value=name" crop="right"/>
-            <xul:label class="xpinstallItemSigned" xbl:inherits="value=cert,signed"/>
-          </xul:hbox>
-          <xul:hbox class="xpinstallItemDetailsRow" align="center">
-            <xul:textbox class="xpinstallItemURL" xbl:inherits="value=url" flex="1" readonly="true" crop="right"/>
-          </xul:hbox>
-        </xul:vbox> 
-      </xul:hbox>
-    </content>
-    <implementation>
-      <property name="name"   onset="this.setAttribute('name', val); return val;"
-                              onget="return this.getAttribute('name');"/>
-      <property name="cert"   onset="this.setAttribute('cert', val); return val;"
-                              onget="return this.getAttribute('cert');"/>
-      <property name="signed" onset="this.setAttribute('signed', val); return val;"
-                              onget="return this.getAttribute('signed');"/>
-      <property name="url"    onset="this.setAttribute('url', val); return val;"
-                              onget="return this.getAttribute('url');"/>
-      <property name="icon"   onset="this.setAttribute('icon', val); return val;"
-                              onget="return this.getAttribute('icon');"/>
-      <property name="type"   onset="this.setAttribute('type', val); return val;"
-                              onget="return this.getAttribute('type');"/>
-    </implementation>
-  </binding>
-         
-</bindings>
-
diff --git a/toolkit/mozapps/webextensions/extensions.manifest b/toolkit/mozapps/webextensions/extensions.manifest
index 7ce20c3ec..2129012ab 100644
--- a/toolkit/mozapps/webextensions/extensions.manifest
+++ b/toolkit/mozapps/webextensions/extensions.manifest
@@ -1,10 +1,3 @@
-component {66354bc9-7ed1-4692-ae1d-8da97d6b205e} nsBlocklistService.js process=main
-contract @mozilla.org/extensions/blocklist;1 {66354bc9-7ed1-4692-ae1d-8da97d6b205e} process=main
-category profile-after-change nsBlocklistService @mozilla.org/extensions/blocklist;1  process=main
-component {e0a106ed-6ad4-47a4-b6af-2f1c8aa4712d} nsBlocklistServiceContent.js process=content
-contract @mozilla.org/extensions/blocklist;1 {e0a106ed-6ad4-47a4-b6af-2f1c8aa4712d} process=content
-
-category update-timer nsBlocklistService @mozilla.org/extensions/blocklist;1,getService,blocklist-background-update-timer,extensions.blocklist.interval,86400
 component {4399533d-08d1-458c-a87a-235f74451cfa} addonManager.js
 contract @mozilla.org/addons/integration;1 {4399533d-08d1-458c-a87a-235f74451cfa}
 #ifndef MOZ_WIDGET_ANDROID
diff --git a/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
index bdd3a81e7..391c69a06 100644
--- a/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
+++ b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
@@ -26,6 +26,12 @@ const XMLURI_PARSE_ERROR    = "http://www.mozilla.org/newlayout/xml/parsererror.
 
 const PREF_UPDATE_REQUIREBUILTINCERTS = "extensions.update.requireBuiltInCerts";
 
+#ifdef MOZ_PHOENIX
+const PREF_EM_MIN_COMPAT_APP_VERSION      = "extensions.minCompatibleAppVersion";
+const FIREFOX_ID                      = "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+const FIREFOX_APPCOMPATVERSION        = "56.9"
+#endif
+
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -446,6 +452,7 @@ function parseRDFManifest(aId, aUpdateKey, aRequest, aManifestData) {
  * @throws if the update manifest is invalid in any way
  */
 function parseJSONManifest(aId, aUpdateKey, aRequest, aManifestData) {
+#ifdef MOZ_PHOENIX
   if (aUpdateKey)
     throw Components.Exception("Update keys are not supported for JSON update manifests");
 
@@ -515,10 +522,10 @@ function parseJSONManifest(aId, aUpdateKey, aRequest, aManifestData) {
     let app = getProperty(applications, "gecko", "object");
 
     let appEntry = {
-      id: TOOLKIT_ID,
+      id: FIREFOX_ID,
       minVersion: getProperty(app, "strict_min_version", "string",
-                              AddonManagerPrivate.webExtensionsMinPlatformVersion),
-      maxVersion: "*",
+                              Services.prefs.getCharPref(PREF_EM_MIN_COMPAT_APP_VERSION)),
+      maxVersion: FIREFOX_APPCOMPATVERSION,
     };
 
     let result = {
@@ -539,7 +546,6 @@ function parseJSONManifest(aId, aUpdateKey, aRequest, aManifestData) {
       }
 
       appEntry.maxVersion = getProperty(app, "strict_max_version", "string");
-      result.strictCompatibility = appEntry.maxVersion != "*";
     } else if ("advisory_max_version" in app) {
       appEntry.maxVersion = getProperty(app, "advisory_max_version", "string");
     }
@@ -551,6 +557,9 @@ function parseJSONManifest(aId, aUpdateKey, aRequest, aManifestData) {
     results.push(result);
   }
   return results;
+#else
+  throw Components.Exception("This application does not support JSON update manifests");
+#endif
 }
 
 /**
diff --git a/toolkit/mozapps/webextensions/internal/SpellCheckDictionaryBootstrap.js b/toolkit/mozapps/webextensions/internal/SpellCheckDictionaryBootstrap.js
deleted file mode 100644
index f4f557fc2..000000000
--- a/toolkit/mozapps/webextensions/internal/SpellCheckDictionaryBootstrap.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var hunspell, dir;
-
-function startup(data) {
-  hunspell = Components.classes["@mozilla.org/spellchecker/engine;1"]
-                       .getService(Components.interfaces.mozISpellCheckingEngine);
-  dir = data.installPath.clone();
-  dir.append("dictionaries");
-  hunspell.addDirectory(dir);
-}
-
-function shutdown() {
-  hunspell.removeDirectory(dir);
-}
diff --git a/toolkit/mozapps/webextensions/internal/moz.build b/toolkit/mozapps/webextensions/internal/moz.build
index 28c34f8c9..e3b54ed3b 100644
--- a/toolkit/mozapps/webextensions/internal/moz.build
+++ b/toolkit/mozapps/webextensions/internal/moz.build
@@ -5,17 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES.addons += [
+    '../../extensions/internal/ProductAddonChecker.jsm',
+    '../../extensions/internal/SpellCheckDictionaryBootstrap.js',
     'AddonLogging.jsm',
     'AddonRepository.jsm',
     'AddonRepository_SQLiteMigrator.jsm',
-    'AddonUpdateChecker.jsm',
     'APIExtensionBootstrap.js',
     'Content.js',
     'E10SAddonsRollout.jsm',
     'GMPProvider.jsm',
     'LightweightThemeImageOptimizer.jsm',
-    'ProductAddonChecker.jsm',
-    'SpellCheckDictionaryBootstrap.js',
     'WebExtensionBootstrap.js',
     'XPIProvider.jsm',
     'XPIProviderUtils.js',
@@ -33,4 +32,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
 
 EXTRA_PP_JS_MODULES.addons += [
     'AddonConstants.jsm',
+    'AddonUpdateChecker.jsm',
 ]
diff --git a/toolkit/mozapps/webextensions/jar.mn b/toolkit/mozapps/webextensions/jar.mn
index 77cbf32eb..6da7dc893 100644
--- a/toolkit/mozapps/webextensions/jar.mn
+++ b/toolkit/mozapps/webextensions/jar.mn
@@ -9,27 +9,27 @@ toolkit.jar:
   content/mozapps/extensions/extensions.css                     (content/extensions.css)
 * content/mozapps/extensions/extensions.js                      (content/extensions.js)
 * content/mozapps/extensions/extensions.xml                     (content/extensions.xml)
-  content/mozapps/extensions/updateinfo.xsl                     (content/updateinfo.xsl)
-  content/mozapps/extensions/about.xul                          (content/about.xul)
+  content/mozapps/extensions/updateinfo.xsl                     (../extensions/content/updateinfo.xsl)
+  content/mozapps/extensions/about.xul                          (../extensions/content/about.xul)
   content/mozapps/extensions/about.js                           (content/about.js)
-  content/mozapps/extensions/list.xul                           (content/list.xul)
+  content/mozapps/extensions/list.xul                           (../extensions/content/list.xul)
   content/mozapps/extensions/list.js                            (content/list.js)
-  content/mozapps/extensions/blocklist.xul                      (content/blocklist.xul)
+  content/mozapps/extensions/blocklist.xul                      (../extensions/content/blocklist.xul)
   content/mozapps/extensions/blocklist.js                       (content/blocklist.js)
-  content/mozapps/extensions/blocklist.css                      (content/blocklist.css)
-  content/mozapps/extensions/blocklist.xml                      (content/blocklist.xml)
+  content/mozapps/extensions/blocklist.css                      (../extensions/content/blocklist.css)
+  content/mozapps/extensions/blocklist.xml                      (../extensions/content/blocklist.xml)
 * content/mozapps/extensions/update.xul                         (content/update.xul)
   content/mozapps/extensions/update.js                          (content/update.js)
-  content/mozapps/extensions/eula.xul                           (content/eula.xul)
+  content/mozapps/extensions/eula.xul                           (../extensions/content/eula.xul)
   content/mozapps/extensions/eula.js                            (content/eula.js)
   content/mozapps/extensions/newaddon.xul                       (content/newaddon.xul)
   content/mozapps/extensions/newaddon.js                        (content/newaddon.js)
-  content/mozapps/extensions/pluginPrefs.xul                    (content/pluginPrefs.xul)
-  content/mozapps/extensions/gmpPrefs.xul                       (content/gmpPrefs.xul)
-  content/mozapps/extensions/OpenH264-license.txt               (content/OpenH264-license.txt)
+  content/mozapps/extensions/pluginPrefs.xul                    (../extensions/content/pluginPrefs.xul)
+  content/mozapps/extensions/gmpPrefs.xul                       (../extensions/content/gmpPrefs.xul)
+  content/mozapps/extensions/OpenH264-license.txt               (../extensions/content/OpenH264-license.txt)
 #endif
   content/mozapps/extensions/setting.xml                        (content/setting.xml)
-  content/mozapps/xpinstall/xpinstallConfirm.xul                (content/xpinstallConfirm.xul)
+  content/mozapps/xpinstall/xpinstallConfirm.xul                (../extensions/content/xpinstallConfirm.xul)
   content/mozapps/xpinstall/xpinstallConfirm.js                 (content/xpinstallConfirm.js)
-  content/mozapps/xpinstall/xpinstallConfirm.css                (content/xpinstallConfirm.css)
-  content/mozapps/xpinstall/xpinstallItem.xml                   (content/xpinstallItem.xml)
+  content/mozapps/xpinstall/xpinstallConfirm.css                (../extensions/content/xpinstallConfirm.css)
+  content/mozapps/xpinstall/xpinstallItem.xml                   (../extensions/content/xpinstallItem.xml)
diff --git a/toolkit/mozapps/webextensions/moz.build b/toolkit/mozapps/webextensions/moz.build
index b92915ae8..d039ac68c 100644
--- a/toolkit/mozapps/webextensions/moz.build
+++ b/toolkit/mozapps/webextensions/moz.build
@@ -10,10 +10,10 @@ DIRS += ['internal']
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
-    'amIAddonManager.idl',
-    'amIAddonPathService.idl',
-    'amIWebInstaller.idl',
-    'amIWebInstallListener.idl',
+    '../extensions/amIAddonManager.idl',
+    '../extensions/amIAddonPathService.idl',
+    '../extensions/amIWebInstaller.idl',
+    '../extensions/amIWebInstallListener.idl',
 ]
 
 XPIDL_MODULE = 'extensions'
@@ -24,8 +24,6 @@ EXTRA_COMPONENTS += [
     'amInstallTrigger.js',
     'amWebAPI.js',
     'amWebInstallListener.js',
-    'nsBlocklistService.js',
-    'nsBlocklistServiceContent.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
diff --git a/toolkit/mozapps/webextensions/nsBlocklistService.js b/toolkit/mozapps/webextensions/nsBlocklistService.js
deleted file mode 100644
index 268c197fc..000000000
--- a/toolkit/mozapps/webextensions/nsBlocklistService.js
+++ /dev/null
@@ -1,1658 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/AppConstants.jsm");
-
-try {
-  // AddonManager.jsm doesn't allow itself to be imported in the child
-  // process. We're used in the child process (for now), so guard against
-  // this.
-  Components.utils.import("resource://gre/modules/AddonManager.jsm");
-  /* globals AddonManagerPrivate*/
-} catch (e) {
-}
-
-XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
-                                  "resource://gre/modules/FileUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",
-                                  "resource://gre/modules/UpdateUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "OS",
-                                  "resource://gre/modules/osfile.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ServiceRequest",
-                                  "resource://gre/modules/ServiceRequest.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "Task",
-                                  "resource://gre/modules/Task.jsm");
-
-const TOOLKIT_ID                      = "toolkit@mozilla.org";
-const KEY_PROFILEDIR                  = "ProfD";
-const KEY_APPDIR                      = "XCurProcD";
-const FILE_BLOCKLIST                  = "blocklist.xml";
-const PREF_BLOCKLIST_LASTUPDATETIME   = "app.update.lastUpdateTime.blocklist-background-update-timer";
-const PREF_BLOCKLIST_URL              = "extensions.blocklist.url";
-const PREF_BLOCKLIST_ITEM_URL         = "extensions.blocklist.itemURL";
-const PREF_BLOCKLIST_ENABLED          = "extensions.blocklist.enabled";
-const PREF_BLOCKLIST_INTERVAL         = "extensions.blocklist.interval";
-const PREF_BLOCKLIST_LEVEL            = "extensions.blocklist.level";
-const PREF_BLOCKLIST_PINGCOUNTTOTAL   = "extensions.blocklist.pingCountTotal";
-const PREF_BLOCKLIST_PINGCOUNTVERSION = "extensions.blocklist.pingCountVersion";
-const PREF_BLOCKLIST_SUPPRESSUI       = "extensions.blocklist.suppressUI";
-const PREF_ONECRL_VIA_AMO             = "security.onecrl.via.amo";
-const PREF_BLOCKLIST_UPDATE_ENABLED   = "services.blocklist.update_enabled";
-const PREF_GENERAL_USERAGENT_LOCALE   = "general.useragent.locale";
-const PREF_APP_DISTRIBUTION           = "distribution.id";
-const PREF_APP_DISTRIBUTION_VERSION   = "distribution.version";
-const PREF_EM_LOGGING_ENABLED         = "extensions.logging.enabled";
-const XMLURI_BLOCKLIST                = "http://www.mozilla.org/2006/addons-blocklist";
-const XMLURI_PARSE_ERROR              = "http://www.mozilla.org/newlayout/xml/parsererror.xml"
-const UNKNOWN_XPCOM_ABI               = "unknownABI";
-const URI_BLOCKLIST_DIALOG            = "chrome://mozapps/content/extensions/blocklist.xul"
-const DEFAULT_SEVERITY                = 3;
-const DEFAULT_LEVEL                   = 2;
-const MAX_BLOCK_LEVEL                 = 3;
-const SEVERITY_OUTDATED               = 0;
-const VULNERABILITYSTATUS_NONE             = 0;
-const VULNERABILITYSTATUS_UPDATE_AVAILABLE = 1;
-const VULNERABILITYSTATUS_NO_UPDATE        = 2;
-
-const EXTENSION_BLOCK_FILTERS = ["id", "name", "creator", "homepageURL", "updateURL"];
-
-var gLoggingEnabled = null;
-var gBlocklistEnabled = true;
-var gBlocklistLevel = DEFAULT_LEVEL;
-
-XPCOMUtils.defineLazyServiceGetter(this, "gConsole",
-                                   "@mozilla.org/consoleservice;1",
-                                   "nsIConsoleService");
-
-XPCOMUtils.defineLazyServiceGetter(this, "gVersionChecker",
-                                   "@mozilla.org/xpcom/version-comparator;1",
-                                   "nsIVersionComparator");
-
-XPCOMUtils.defineLazyServiceGetter(this, "gCertBlocklistService",
-                                   "@mozilla.org/security/certblocklist;1",
-                                   "nsICertBlocklist");
-
-XPCOMUtils.defineLazyGetter(this, "gPref", function() {
-  return Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefService).
-         QueryInterface(Ci.nsIPrefBranch);
-});
-
-// From appinfo in Services.jsm. It is not possible to use the one in
-// Services.jsm since it will not successfully QueryInterface nsIXULAppInfo in
-// xpcshell tests due to other code calling Services.appinfo before the
-// nsIXULAppInfo is created by the tests.
-XPCOMUtils.defineLazyGetter(this, "gApp", function() {
-  let appinfo = Cc["@mozilla.org/xre/app-info;1"]
-                  .getService(Ci.nsIXULRuntime);
-  try {
-    appinfo.QueryInterface(Ci.nsIXULAppInfo);
-  } catch (ex) {
-    // Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
-    if (!(ex instanceof Components.Exception) ||
-        ex.result != Cr.NS_NOINTERFACE)
-      throw ex;
-  }
-  return appinfo;
-});
-
-XPCOMUtils.defineLazyGetter(this, "gABI", function() {
-  let abi = null;
-  try {
-    abi = gApp.XPCOMABI;
-  }
-  catch (e) {
-    LOG("BlockList Global gABI: XPCOM ABI unknown.");
-  }
-
-  if (AppConstants.platform == "macosx") {
-    // Mac universal build should report a different ABI than either macppc
-    // or mactel.
-    let macutils = Cc["@mozilla.org/xpcom/mac-utils;1"].
-                   getService(Ci.nsIMacUtils);
-
-    if (macutils.isUniversalBinary)
-      abi += "-u-" + macutils.architecturesInBinary;
-  }
-  return abi;
-});
-
-XPCOMUtils.defineLazyGetter(this, "gOSVersion", function() {
-  let osVersion;
-  let sysInfo = Cc["@mozilla.org/system-info;1"].
-                getService(Ci.nsIPropertyBag2);
-  try {
-    osVersion = sysInfo.getProperty("name") + " " + sysInfo.getProperty("version");
-  }
-  catch (e) {
-    LOG("BlockList Global gOSVersion: OS Version unknown.");
-  }
-
-  if (osVersion) {
-    try {
-      osVersion += " (" + sysInfo.getProperty("secondaryLibrary") + ")";
-    }
-    catch (e) {
-      // Not all platforms have a secondary widget library, so an error is nothing to worry about.
-    }
-    osVersion = encodeURIComponent(osVersion);
-  }
-  return osVersion;
-});
-
-// shared code for suppressing bad cert dialogs
-XPCOMUtils.defineLazyGetter(this, "gCertUtils", function() {
-  let temp = { };
-  Components.utils.import("resource://gre/modules/CertUtils.jsm", temp);
-  return temp;
-});
-
-/**
- * Logs a string to the error console.
- * @param   string
- *          The string to write to the error console..
- */
-function LOG(string) {
-  if (gLoggingEnabled) {
-    dump("*** " + string + "\n");
-    gConsole.logStringMessage(string);
-  }
-}
-
-/**
- * Gets a preference value, handling the case where there is no default.
- * @param   func
- *          The name of the preference function to call, on nsIPrefBranch
- * @param   preference
- *          The name of the preference
- * @param   defaultValue
- *          The default value to return in the event the preference has
- *          no setting
- * @returns The value of the preference, or undefined if there was no
- *          user or default value.
- */
-function getPref(func, preference, defaultValue) {
-  try {
-    return gPref[func](preference);
-  }
-  catch (e) {
-  }
-  return defaultValue;
-}
-
-/**
- * Constructs a URI to a spec.
- * @param   spec
- *          The spec to construct a URI to
- * @returns The nsIURI constructed.
- */
-function newURI(spec) {
-  var ioServ = Cc["@mozilla.org/network/io-service;1"].
-               getService(Ci.nsIIOService);
-  return ioServ.newURI(spec, null, null);
-}
-
-// Restarts the application checking in with observers first
-function restartApp() {
-  // Notify all windows that an application quit has been requested.
-  var os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  var cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].
-                   createInstance(Ci.nsISupportsPRBool);
-  os.notifyObservers(cancelQuit, "quit-application-requested", null);
-
-  // Something aborted the quit process.
-  if (cancelQuit.data)
-    return;
-
-  var as = Cc["@mozilla.org/toolkit/app-startup;1"].
-           getService(Ci.nsIAppStartup);
-  as.quit(Ci.nsIAppStartup.eRestart | Ci.nsIAppStartup.eAttemptQuit);
-}
-
-/**
- * Checks whether this blocklist element is valid for the current OS and ABI.
- * If the element has an "os" attribute then the current OS must appear in
- * its comma separated list for the element to be valid. Similarly for the
- * xpcomabi attribute.
- */
-function matchesOSABI(blocklistElement) {
-  if (blocklistElement.hasAttribute("os")) {
-    var choices = blocklistElement.getAttribute("os").split(",");
-    if (choices.length > 0 && choices.indexOf(gApp.OS) < 0)
-      return false;
-  }
-
-  if (blocklistElement.hasAttribute("xpcomabi")) {
-    choices = blocklistElement.getAttribute("xpcomabi").split(",");
-    if (choices.length > 0 && choices.indexOf(gApp.XPCOMABI) < 0)
-      return false;
-  }
-
-  return true;
-}
-
-/**
- * Gets the current value of the locale.  It's possible for this preference to
- * be localized, so we have to do a little extra work here.  Similar code
- * exists in nsHttpHandler.cpp when building the UA string.
- */
-function getLocale() {
-  try {
-      // Get the default branch
-      var defaultPrefs = gPref.getDefaultBranch(null);
-      return defaultPrefs.getComplexValue(PREF_GENERAL_USERAGENT_LOCALE,
-                                          Ci.nsIPrefLocalizedString).data;
-  } catch (e) {}
-
-  return gPref.getCharPref(PREF_GENERAL_USERAGENT_LOCALE);
-}
-
-/* Get the distribution pref values, from defaults only */
-function getDistributionPrefValue(aPrefName) {
-  var prefValue = "default";
-
-  var defaults = gPref.getDefaultBranch(null);
-  try {
-    prefValue = defaults.getCharPref(aPrefName);
-  } catch (e) {
-    // use default when pref not found
-  }
-
-  return prefValue;
-}
-
-/**
- * Parse a string representation of a regular expression. Needed because we
- * use the /pattern/flags form (because it's detectable), which is only
- * supported as a literal in JS.
- *
- * @param  aStr
- *         String representation of regexp
- * @return RegExp instance
- */
-function parseRegExp(aStr) {
-  let lastSlash = aStr.lastIndexOf("/");
-  let pattern = aStr.slice(1, lastSlash);
-  let flags = aStr.slice(lastSlash + 1);
-  return new RegExp(pattern, flags);
-}
-
-/**
- * Manages the Blocklist. The Blocklist is a representation of the contents of
- * blocklist.xml and allows us to remotely disable / re-enable blocklisted
- * items managed by the Extension Manager with an item's appDisabled property.
- * It also blocklists plugins with data from blocklist.xml.
- */
-
-function Blocklist() {
-  Services.obs.addObserver(this, "xpcom-shutdown", false);
-  Services.obs.addObserver(this, "sessionstore-windows-restored", false);
-  gLoggingEnabled = getPref("getBoolPref", PREF_EM_LOGGING_ENABLED, false);
-  gBlocklistEnabled = getPref("getBoolPref", PREF_BLOCKLIST_ENABLED, true);
-  gBlocklistLevel = Math.min(getPref("getIntPref", PREF_BLOCKLIST_LEVEL, DEFAULT_LEVEL),
-                                     MAX_BLOCK_LEVEL);
-  gPref.addObserver("extensions.blocklist.", this, false);
-  gPref.addObserver(PREF_EM_LOGGING_ENABLED, this, false);
-  this.wrappedJSObject = this;
-  // requests from child processes come in here, see receiveMessage.
-  Services.ppmm.addMessageListener("Blocklist:getPluginBlocklistState", this);
-  Services.ppmm.addMessageListener("Blocklist:content-blocklist-updated", this);
-}
-
-Blocklist.prototype = {
-  /**
-   * Extension ID -> array of Version Ranges
-   * Each value in the version range array is a JS Object that has the
-   * following properties:
-   *   "minVersion"  The minimum version in a version range (default = 0)
-   *   "maxVersion"  The maximum version in a version range (default = *)
-   *   "targetApps"  Application ID -> array of Version Ranges
-   *                 (default = current application ID)
-   *                 Each value in the version range array is a JS Object that
-   *                 has the following properties:
-   *                   "minVersion"  The minimum version in a version range
-   *                                 (default = 0)
-   *                   "maxVersion"  The maximum version in a version range
-   *                                 (default = *)
-   */
-  _addonEntries: null,
-  _gfxEntries: null,
-  _pluginEntries: null,
-
-  shutdown: function() {
-    Services.obs.removeObserver(this, "xpcom-shutdown");
-    Services.ppmm.removeMessageListener("Blocklist:getPluginBlocklistState", this);
-    Services.ppmm.removeMessageListener("Blocklist:content-blocklist-updated", this);
-    gPref.removeObserver("extensions.blocklist.", this);
-    gPref.removeObserver(PREF_EM_LOGGING_ENABLED, this);
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    switch (aTopic) {
-    case "xpcom-shutdown":
-      this.shutdown();
-      break;
-    case "nsPref:changed":
-      switch (aData) {
-        case PREF_EM_LOGGING_ENABLED:
-          gLoggingEnabled = getPref("getBoolPref", PREF_EM_LOGGING_ENABLED, false);
-          break;
-        case PREF_BLOCKLIST_ENABLED:
-          gBlocklistEnabled = getPref("getBoolPref", PREF_BLOCKLIST_ENABLED, true);
-          this._loadBlocklist();
-          this._blocklistUpdated(null, null);
-          break;
-        case PREF_BLOCKLIST_LEVEL:
-          gBlocklistLevel = Math.min(getPref("getIntPref", PREF_BLOCKLIST_LEVEL, DEFAULT_LEVEL),
-                                     MAX_BLOCK_LEVEL);
-          this._blocklistUpdated(null, null);
-          break;
-      }
-      break;
-    case "sessionstore-windows-restored":
-      Services.obs.removeObserver(this, "sessionstore-windows-restored");
-      this._preloadBlocklist();
-      break;
-    }
-  },
-
-  // Message manager message handlers
-  receiveMessage: function(aMsg) {
-    switch (aMsg.name) {
-      case "Blocklist:getPluginBlocklistState":
-        return this.getPluginBlocklistState(aMsg.data.addonData,
-                                            aMsg.data.appVersion,
-                                            aMsg.data.toolkitVersion);
-      case "Blocklist:content-blocklist-updated":
-        Services.obs.notifyObservers(null, "content-blocklist-updated", null);
-        break;
-      default:
-        throw new Error("Unknown blocklist message received from content: " + aMsg.name);
-    }
-    return undefined;
-  },
-
-  /* See nsIBlocklistService */
-  isAddonBlocklisted: function(addon, appVersion, toolkitVersion) {
-    return this.getAddonBlocklistState(addon, appVersion, toolkitVersion) ==
-                   Ci.nsIBlocklistService.STATE_BLOCKED;
-  },
-
-  /* See nsIBlocklistService */
-  getAddonBlocklistState: function(addon, appVersion, toolkitVersion) {
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-    return this._getAddonBlocklistState(addon, this._addonEntries,
-                                        appVersion, toolkitVersion);
-  },
-
-  /**
-   * Private version of getAddonBlocklistState that allows the caller to pass in
-   * the add-on blocklist entries to compare against.
-   *
-   * @param   id
-   *          The ID of the item to get the blocklist state for.
-   * @param   version
-   *          The version of the item to get the blocklist state for.
-   * @param   addonEntries
-   *          The add-on blocklist entries to compare against.
-   * @param   appVersion
-   *          The application version to compare to, will use the current
-   *          version if null.
-   * @param   toolkitVersion
-   *          The toolkit version to compare to, will use the current version if
-   *          null.
-   * @returns The blocklist state for the item, one of the STATE constants as
-   *          defined in nsIBlocklistService.
-   */
-  _getAddonBlocklistState: function(addon, addonEntries, appVersion, toolkitVersion) {
-    if (!gBlocklistEnabled)
-      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-
-    // Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
-    if (!appVersion && !gApp.version)
-      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-
-    if (!appVersion)
-      appVersion = gApp.version;
-    if (!toolkitVersion)
-      toolkitVersion = gApp.platformVersion;
-
-    var blItem = this._findMatchingAddonEntry(addonEntries, addon);
-    if (!blItem)
-      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-
-    for (let currentblItem of blItem.versions) {
-      if (currentblItem.includesItem(addon.version, appVersion, toolkitVersion))
-        return currentblItem.severity >= gBlocklistLevel ? Ci.nsIBlocklistService.STATE_BLOCKED :
-                                                       Ci.nsIBlocklistService.STATE_SOFTBLOCKED;
-    }
-    return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-  },
-
-  /**
-   * Returns the set of prefs of the add-on stored in the blocklist file
-   * (probably to revert them on disabling).
-   * @param addon
-   *        The add-on whose to-be-reset prefs are to be found.
-   */
-  _getAddonPrefs: function(addon) {
-    let entry = this._findMatchingAddonEntry(this._addonEntries, addon);
-    return entry.prefs.slice(0);
-  },
-
-  _findMatchingAddonEntry: function(aAddonEntries, aAddon) {
-    if (!aAddon)
-      return null;
-    // Returns true if the params object passes the constraints set by entry.
-    // (For every non-null property in entry, the same key must exist in
-    // params and value must be the same)
-    function checkEntry(entry, params) {
-      for (let [key, value] of entry) {
-        if (value === null || value === undefined)
-          continue;
-        if (params[key]) {
-          if (value instanceof RegExp) {
-            if (!value.test(params[key])) {
-              return false;
-            }
-          } else if (value !== params[key]) {
-            return false;
-          }
-        } else {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    let params = {};
-    for (let filter of EXTENSION_BLOCK_FILTERS) {
-      params[filter] = aAddon[filter];
-    }
-    if (params.creator)
-      params.creator = params.creator.name;
-    for (let entry of aAddonEntries) {
-      if (checkEntry(entry.attributes, params)) {
-         return entry;
-       }
-     }
-     return null;
-  },
-
-  /* See nsIBlocklistService */
-  getAddonBlocklistURL: function(addon, appVersion, toolkitVersion) {
-    if (!gBlocklistEnabled)
-      return "";
-
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-
-    let blItem = this._findMatchingAddonEntry(this._addonEntries, addon);
-    if (!blItem || !blItem.blockID)
-      return null;
-
-    return this._createBlocklistURL(blItem.blockID);
-  },
-
-  _createBlocklistURL: function(id) {
-    let url = Services.urlFormatter.formatURLPref(PREF_BLOCKLIST_ITEM_URL);
-    url = url.replace(/%blockID%/g, id);
-
-    return url;
-  },
-
-  notify: function(aTimer) {
-    if (!gBlocklistEnabled)
-      return;
-
-    try {
-      var dsURI = gPref.getCharPref(PREF_BLOCKLIST_URL);
-    }
-    catch (e) {
-      LOG("Blocklist::notify: The " + PREF_BLOCKLIST_URL + " preference" +
-          " is missing!");
-      return;
-    }
-
-    var pingCountVersion = getPref("getIntPref", PREF_BLOCKLIST_PINGCOUNTVERSION, 0);
-    var pingCountTotal = getPref("getIntPref", PREF_BLOCKLIST_PINGCOUNTTOTAL, 1);
-    var daysSinceLastPing = 0;
-    if (pingCountVersion == 0) {
-      daysSinceLastPing = "new";
-    }
-    else {
-      // Seconds in one day is used because nsIUpdateTimerManager stores the
-      // last update time in seconds.
-      let secondsInDay = 60 * 60 * 24;
-      let lastUpdateTime = getPref("getIntPref", PREF_BLOCKLIST_LASTUPDATETIME, 0);
-      if (lastUpdateTime == 0) {
-        daysSinceLastPing = "invalid";
-      }
-      else {
-        let now = Math.round(Date.now() / 1000);
-        daysSinceLastPing = Math.floor((now - lastUpdateTime) / secondsInDay);
-      }
-
-      if (daysSinceLastPing == 0 || daysSinceLastPing == "invalid") {
-        pingCountVersion = pingCountTotal = "invalid";
-      }
-    }
-
-    if (pingCountVersion < 1)
-      pingCountVersion = 1;
-    if (pingCountTotal < 1)
-      pingCountTotal = 1;
-
-    dsURI = dsURI.replace(/%APP_ID%/g, gApp.ID);
-    // Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
-    if (gApp.version)
-      dsURI = dsURI.replace(/%APP_VERSION%/g, gApp.version);
-    dsURI = dsURI.replace(/%PRODUCT%/g, gApp.name);
-    // Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
-    if (gApp.version)
-      dsURI = dsURI.replace(/%VERSION%/g, gApp.version);
-    dsURI = dsURI.replace(/%BUILD_ID%/g, gApp.appBuildID);
-    dsURI = dsURI.replace(/%BUILD_TARGET%/g, gApp.OS + "_" + gABI);
-    dsURI = dsURI.replace(/%OS_VERSION%/g, gOSVersion);
-    dsURI = dsURI.replace(/%LOCALE%/g, getLocale());
-    dsURI = dsURI.replace(/%CHANNEL%/g, UpdateUtils.UpdateChannel);
-    dsURI = dsURI.replace(/%PLATFORM_VERSION%/g, gApp.platformVersion);
-    dsURI = dsURI.replace(/%DISTRIBUTION%/g,
-                      getDistributionPrefValue(PREF_APP_DISTRIBUTION));
-    dsURI = dsURI.replace(/%DISTRIBUTION_VERSION%/g,
-                      getDistributionPrefValue(PREF_APP_DISTRIBUTION_VERSION));
-    dsURI = dsURI.replace(/%PING_COUNT%/g, pingCountVersion);
-    dsURI = dsURI.replace(/%TOTAL_PING_COUNT%/g, pingCountTotal);
-    dsURI = dsURI.replace(/%DAYS_SINCE_LAST_PING%/g, daysSinceLastPing);
-    dsURI = dsURI.replace(/\+/g, "%2B");
-
-    // Under normal operations it will take around 5,883,516 years before the
-    // preferences used to store pingCountVersion and pingCountTotal will rollover
-    // so this code doesn't bother trying to do the "right thing" here.
-    if (pingCountVersion != "invalid") {
-      pingCountVersion++;
-      if (pingCountVersion > 2147483647) {
-        // Rollover to -1 if the value is greater than what is support by an
-        // integer preference. The -1 indicates that the counter has been reset.
-        pingCountVersion = -1;
-      }
-      gPref.setIntPref(PREF_BLOCKLIST_PINGCOUNTVERSION, pingCountVersion);
-    }
-
-    if (pingCountTotal != "invalid") {
-      pingCountTotal++;
-      if (pingCountTotal > 2147483647) {
-        // Rollover to 1 if the value is greater than what is support by an
-        // integer preference.
-        pingCountTotal = -1;
-      }
-      gPref.setIntPref(PREF_BLOCKLIST_PINGCOUNTTOTAL, pingCountTotal);
-    }
-
-    // Verify that the URI is valid
-    try {
-      var uri = newURI(dsURI);
-    }
-    catch (e) {
-      LOG("Blocklist::notify: There was an error creating the blocklist URI\r\n" +
-          "for: " + dsURI + ", error: " + e);
-      return;
-    }
-
-    LOG("Blocklist::notify: Requesting " + uri.spec);
-    let request = new ServiceRequest();
-    request.open("GET", uri.spec, true);
-    request.channel.notificationCallbacks = new gCertUtils.BadCertHandler();
-    request.overrideMimeType("text/xml");
-    request.setRequestHeader("Cache-Control", "no-cache");
-    request.QueryInterface(Components.interfaces.nsIJSXMLHttpRequest);
-
-    request.addEventListener("error", event => this.onXMLError(event), false);
-    request.addEventListener("load", event => this.onXMLLoad(event), false);
-    request.send(null);
-
-    // When the blocklist loads we need to compare it to the current copy so
-    // make sure we have loaded it.
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-  },
-
-  onXMLLoad: Task.async(function*(aEvent) {
-    let request = aEvent.target;
-    try {
-      gCertUtils.checkCert(request.channel);
-    }
-    catch (e) {
-      LOG("Blocklist::onXMLLoad: " + e);
-      return;
-    }
-    let responseXML = request.responseXML;
-    if (!responseXML || responseXML.documentElement.namespaceURI == XMLURI_PARSE_ERROR ||
-        (request.status != 200 && request.status != 0)) {
-      LOG("Blocklist::onXMLLoad: there was an error during load");
-      return;
-    }
-
-    var oldAddonEntries = this._addonEntries;
-    var oldPluginEntries = this._pluginEntries;
-    this._addonEntries = [];
-    this._gfxEntries = [];
-    this._pluginEntries = [];
-
-    this._loadBlocklistFromString(request.responseText);
-    // We don't inform the users when the graphics blocklist changed at runtime.
-    // However addons and plugins blocking status is refreshed.
-    this._blocklistUpdated(oldAddonEntries, oldPluginEntries);
-
-    try {
-      let path = OS.Path.join(OS.Constants.Path.profileDir, FILE_BLOCKLIST);
-      yield OS.File.writeAtomic(path, request.responseText, {tmpPath: path + ".tmp"});
-    } catch (e) {
-      LOG("Blocklist::onXMLLoad: " + e);
-    }
-  }),
-
-  onXMLError: function(aEvent) {
-    try {
-      var request = aEvent.target;
-      // the following may throw (e.g. a local file or timeout)
-      var status = request.status;
-    }
-    catch (e) {
-      request = aEvent.target.channel.QueryInterface(Ci.nsIRequest);
-      status = request.status;
-    }
-    var statusText = "nsIXMLHttpRequest channel unavailable";
-    // When status is 0 we don't have a valid channel.
-    if (status != 0) {
-      try {
-        statusText = request.statusText;
-      } catch (e) {
-      }
-    }
-    LOG("Blocklist:onError: There was an error loading the blocklist file\r\n" +
-        statusText);
-  },
-
-  /**
-   * Finds the newest blocklist file from the application and the profile and
-   * load it or does nothing if neither exist.
-   */
-  _loadBlocklist: function() {
-    this._addonEntries = [];
-    this._gfxEntries = [];
-    this._pluginEntries = [];
-    var profFile = FileUtils.getFile(KEY_PROFILEDIR, [FILE_BLOCKLIST]);
-    if (profFile.exists()) {
-      this._loadBlocklistFromFile(profFile);
-      return;
-    }
-    var appFile = FileUtils.getFile(KEY_APPDIR, [FILE_BLOCKLIST]);
-    if (appFile.exists()) {
-      this._loadBlocklistFromFile(appFile);
-      return;
-    }
-    LOG("Blocklist::_loadBlocklist: no XML File found");
-  },
-
-  /**
-#    The blocklist XML file looks something like this:
-#
-#    <blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
-#      <emItems>
-#        <emItem id="item_1@domain" blockID="i1">
-#          <prefs>
-#            <pref>accessibility.accesskeycausesactivation</pref>
-#            <pref>accessibility.blockautorefresh</pref>
-#          </prefs>
-#          <versionRange minVersion="1.0" maxVersion="2.0.*">
-#            <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
-#              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
-#              <versionRange minVersion="1.7" maxVersion="1.7.*"/>
-#            </targetApplication>
-#            <targetApplication id="toolkit@mozilla.org">
-#              <versionRange minVersion="1.9" maxVersion="1.9.*"/>
-#            </targetApplication>
-#          </versionRange>
-#          <versionRange minVersion="3.0" maxVersion="3.0.*">
-#            <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
-#              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
-#            </targetApplication>
-#            <targetApplication id="toolkit@mozilla.org">
-#              <versionRange minVersion="1.9" maxVersion="1.9.*"/>
-#            </targetApplication>
-#          </versionRange>
-#        </emItem>
-#        <emItem id="item_2@domain" blockID="i2">
-#          <versionRange minVersion="3.1" maxVersion="4.*"/>
-#        </emItem>
-#        <emItem id="item_3@domain">
-#          <versionRange>
-#            <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
-#              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
-#            </targetApplication>
-#          </versionRange>
-#        </emItem>
-#        <emItem id="item_4@domain" blockID="i3">
-#          <versionRange>
-#            <targetApplication>
-#              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
-#            </targetApplication>
-#          </versionRange>
-#        <emItem id="/@badperson\.com$/"/>
-#      </emItems>
-#      <pluginItems>
-#        <pluginItem blockID="i4">
-#          <!-- All match tags must match a plugin to blocklist a plugin -->
-#          <match name="name" exp="some plugin"/>
-#          <match name="description" exp="1[.]2[.]3"/>
-#        </pluginItem>
-#      </pluginItems>
-#      <certItems>
-#        <!-- issuerName is the DER issuer name data base64 encoded... -->
-#        <certItem issuerName="MA0xCzAJBgNVBAMMAmNh">
-#          <!-- ... as is the serial number DER data -->
-#          <serialNumber>AkHVNA==</serialNumber>
-#        </certItem>
-#        <!-- subject is the DER subject name data base64 encoded... -->
-#        <certItem subject="MA0xCzAJBgNVBAMMAmNh" pubKeyHash="/xeHA5s+i9/z9d8qy6JEuE1xGoRYIwgJuTE/lmaGJ7M=">
-#        </certItem>
-#      </certItems>
-#    </blocklist>
-   */
-
-  _loadBlocklistFromFile: function(file) {
-    if (!gBlocklistEnabled) {
-      LOG("Blocklist::_loadBlocklistFromFile: blocklist is disabled");
-      return;
-    }
-
-    let telemetry = Services.telemetry;
-
-    if (this._isBlocklistPreloaded()) {
-      telemetry.getHistogramById("BLOCKLIST_SYNC_FILE_LOAD").add(false);
-      this._loadBlocklistFromString(this._preloadedBlocklistContent);
-      delete this._preloadedBlocklistContent;
-      return;
-    }
-
-    if (!file.exists()) {
-      LOG("Blocklist::_loadBlocklistFromFile: XML File does not exist " + file.path);
-      return;
-    }
-
-    telemetry.getHistogramById("BLOCKLIST_SYNC_FILE_LOAD").add(true);
-
-    let text = "";
-    let fstream = null;
-    let cstream = null;
-
-    try {
-      fstream = Components.classes["@mozilla.org/network/file-input-stream;1"]
-                          .createInstance(Components.interfaces.nsIFileInputStream);
-      cstream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
-                          .createInstance(Components.interfaces.nsIConverterInputStream);
-
-      fstream.init(file, FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE, 0);
-      cstream.init(fstream, "UTF-8", 0, 0);
-
-      let str = {};
-      let read = 0;
-
-      do {
-        read = cstream.readString(0xffffffff, str); // read as much as we can and put it in str.value
-        text += str.value;
-      } while (read != 0);
-    } catch (e) {
-      LOG("Blocklist::_loadBlocklistFromFile: Failed to load XML file " + e);
-    } finally {
-      if (cstream)
-        cstream.close();
-      if (fstream)
-        fstream.close();
-    }
-
-    if (text)
-        this._loadBlocklistFromString(text);
-  },
-
-  _isBlocklistLoaded: function() {
-    return this._addonEntries != null && this._gfxEntries != null && this._pluginEntries != null;
-  },
-
-  _isBlocklistPreloaded: function() {
-    return this._preloadedBlocklistContent != null;
-  },
-
-  /* Used for testing */
-  _clear: function() {
-    this._addonEntries = null;
-    this._gfxEntries = null;
-    this._pluginEntries = null;
-    this._preloadedBlocklistContent = null;
-  },
-
-  _preloadBlocklist: Task.async(function*() {
-    let profPath = OS.Path.join(OS.Constants.Path.profileDir, FILE_BLOCKLIST);
-    try {
-      yield this._preloadBlocklistFile(profPath);
-      return;
-    } catch (e) {
-      LOG("Blocklist::_preloadBlocklist: Failed to load XML file " + e)
-    }
-
-    var appFile = FileUtils.getFile(KEY_APPDIR, [FILE_BLOCKLIST]);
-    try {
-      yield this._preloadBlocklistFile(appFile.path);
-      return;
-    } catch (e) {
-      LOG("Blocklist::_preloadBlocklist: Failed to load XML file " + e)
-    }
-
-    LOG("Blocklist::_preloadBlocklist: no XML File found");
-  }),
-
-  _preloadBlocklistFile: Task.async(function*(path) {
-    if (this._addonEntries) {
-      // The file has been already loaded.
-      return;
-    }
-
-    if (!gBlocklistEnabled) {
-      LOG("Blocklist::_preloadBlocklistFile: blocklist is disabled");
-      return;
-    }
-
-    let text = yield OS.File.read(path, { encoding: "utf-8" });
-
-    if (!this._addonEntries) {
-      // Store the content only if a sync load has not been performed in the meantime.
-      this._preloadedBlocklistContent = text;
-    }
-  }),
-
-  _loadBlocklistFromString : function(text) {
-    try {
-      var parser = Cc["@mozilla.org/xmlextras/domparser;1"].
-                   createInstance(Ci.nsIDOMParser);
-      var doc = parser.parseFromString(text, "text/xml");
-      if (doc.documentElement.namespaceURI != XMLURI_BLOCKLIST) {
-        LOG("Blocklist::_loadBlocklistFromFile: aborting due to incorrect " +
-            "XML Namespace.\r\nExpected: " + XMLURI_BLOCKLIST + "\r\n" +
-            "Received: " + doc.documentElement.namespaceURI);
-        return;
-      }
-
-      var populateCertBlocklist = getPref("getBoolPref", PREF_ONECRL_VIA_AMO, true);
-
-      var childNodes = doc.documentElement.childNodes;
-      for (let element of childNodes) {
-        if (!(element instanceof Ci.nsIDOMElement))
-          continue;
-        switch (element.localName) {
-        case "emItems":
-          this._addonEntries = this._processItemNodes(element.childNodes, "emItem",
-                                                      this._handleEmItemNode);
-          break;
-        case "pluginItems":
-          this._pluginEntries = this._processItemNodes(element.childNodes, "pluginItem",
-                                                       this._handlePluginItemNode);
-          break;
-        case "certItems":
-          if (populateCertBlocklist) {
-            this._processItemNodes(element.childNodes, "certItem",
-                                   this._handleCertItemNode.bind(this));
-          }
-          break;
-        case "gfxItems":
-          // Parse as simple list of objects.
-          this._gfxEntries = this._processItemNodes(element.childNodes, "gfxBlacklistEntry",
-                                                    this._handleGfxBlacklistNode);
-          break;
-        default:
-          LOG("Blocklist::_loadBlocklistFromString: ignored entries " + element.localName);
-        }
-      }
-      if (populateCertBlocklist) {
-        gCertBlocklistService.saveEntries();
-      }
-      if (this._gfxEntries.length > 0) {
-        this._notifyObserversBlocklistGFX();
-      }
-    }
-    catch (e) {
-      LOG("Blocklist::_loadBlocklistFromFile: Error constructing blocklist " + e);
-      return;
-    }
-  },
-
-  _processItemNodes: function(itemNodes, itemName, handler) {
-    var result = [];
-    for (var i = 0; i < itemNodes.length; ++i) {
-      var blocklistElement = itemNodes.item(i);
-      if (!(blocklistElement instanceof Ci.nsIDOMElement) ||
-          blocklistElement.localName != itemName)
-        continue;
-
-      handler(blocklistElement, result);
-    }
-    return result;
-  },
-
-  _handleCertItemNode: function(blocklistElement, result) {
-    let issuer = blocklistElement.getAttribute("issuerName");
-    if (issuer) {
-      for (let snElement of blocklistElement.children) {
-        try {
-          gCertBlocklistService.revokeCertByIssuerAndSerial(issuer, snElement.textContent);
-        } catch (e) {
-          // we want to keep trying other elements since missing all items
-          // is worse than missing one
-          LOG("Blocklist::_handleCertItemNode: Error adding revoked cert by Issuer and Serial" + e);
-        }
-      }
-      return;
-    }
-
-    let pubKeyHash = blocklistElement.getAttribute("pubKeyHash");
-    let subject = blocklistElement.getAttribute("subject");
-
-    if (pubKeyHash && subject) {
-      try {
-        gCertBlocklistService.revokeCertBySubjectAndPubKey(subject, pubKeyHash);
-      } catch (e) {
-        LOG("Blocklist::_handleCertItemNode: Error adding revoked cert by Subject and PubKey" + e);
-      }
-    }
-  },
-
-  _handleEmItemNode: function(blocklistElement, result) {
-    if (!matchesOSABI(blocklistElement))
-      return;
-
-    let blockEntry = {
-      versions: [],
-      prefs: [],
-      blockID: null,
-      attributes: new Map()
-      // Atleast one of EXTENSION_BLOCK_FILTERS must get added to attributes
-    };
-
-    // Any filter starting with '/' is interpreted as a regex. So if an attribute
-    // starts with a '/' it must be checked via a regex.
-    function regExpCheck(attr) {
-      return attr.startsWith("/") ? parseRegExp(attr) : attr;
-    }
-
-    for (let filter of EXTENSION_BLOCK_FILTERS) {
-      let attr = blocklistElement.getAttribute(filter);
-      if (attr)
-        blockEntry.attributes.set(filter, regExpCheck(attr));
-    }
-
-    var childNodes = blocklistElement.childNodes;
-
-    for (let x = 0; x < childNodes.length; x++) {
-      var childElement = childNodes.item(x);
-      if (!(childElement instanceof Ci.nsIDOMElement))
-        continue;
-      if (childElement.localName === "prefs") {
-        let prefElements = childElement.childNodes;
-        for (let i = 0; i < prefElements.length; i++) {
-          let prefElement = prefElements.item(i);
-          if (!(prefElement instanceof Ci.nsIDOMElement) ||
-              prefElement.localName !== "pref")
-            continue;
-          blockEntry.prefs.push(prefElement.textContent);
-        }
-      }
-      else if (childElement.localName === "versionRange")
-        blockEntry.versions.push(new BlocklistItemData(childElement));
-    }
-    // if only the extension ID is specified block all versions of the
-    // extension for the current application.
-    if (blockEntry.versions.length == 0)
-      blockEntry.versions.push(new BlocklistItemData(null));
-
-    blockEntry.blockID = blocklistElement.getAttribute("blockID");
-
-    result.push(blockEntry);
-  },
-
-  _handlePluginItemNode: function(blocklistElement, result) {
-    if (!matchesOSABI(blocklistElement))
-      return;
-
-    var matchNodes = blocklistElement.childNodes;
-    var blockEntry = {
-      matches: {},
-      versions: [],
-      blockID: null,
-      infoURL: null,
-    };
-    var hasMatch = false;
-    for (var x = 0; x < matchNodes.length; ++x) {
-      var matchElement = matchNodes.item(x);
-      if (!(matchElement instanceof Ci.nsIDOMElement))
-        continue;
-      if (matchElement.localName == "match") {
-        var name = matchElement.getAttribute("name");
-        var exp = matchElement.getAttribute("exp");
-        try {
-          blockEntry.matches[name] = new RegExp(exp, "m");
-          hasMatch = true;
-        } catch (e) {
-          // Ignore invalid regular expressions
-        }
-      }
-      if (matchElement.localName == "versionRange") {
-        blockEntry.versions.push(new BlocklistItemData(matchElement));
-      }
-      else if (matchElement.localName == "infoURL") {
-        blockEntry.infoURL = matchElement.textContent;
-      }
-    }
-    // Plugin entries require *something* to match to an actual plugin
-    if (!hasMatch)
-      return;
-    // Add a default versionRange if there wasn't one specified
-    if (blockEntry.versions.length == 0)
-      blockEntry.versions.push(new BlocklistItemData(null));
-
-    blockEntry.blockID = blocklistElement.getAttribute("blockID");
-
-    result.push(blockEntry);
-  },
-
-  // <gfxBlacklistEntry blockID="g60">
-  //   <os>WINNT 6.0</os>
-  //   <osversion>14</osversion> currently only used for Android
-  //   <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-  //   <vendor>0x8086</vendor>
-  //   <devices>
-  //     <device>0x2582</device>
-  //     <device>0x2782</device>
-  //   </devices>
-  //   <feature> DIRECT3D_10_LAYERS </feature>
-  //   <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-  //   <driverVersion> 8.52.322.2202 </driverVersion>
-  //   <driverVersionMax> 8.52.322.2202 </driverVersionMax>
-  //   <driverVersionComparator> LESS_THAN_OR_EQUAL </driverVersionComparator>
-  //   <model>foo</model>
-  //   <product>foo</product>
-  //   <manufacturer>foo</manufacturer>
-  //   <hardware>foo</hardware>
-  // </gfxBlacklistEntry>
-  _handleGfxBlacklistNode: function (blocklistElement, result) {
-    const blockEntry = {};
-
-    // The blockID attribute is always present in the actual data produced on server
-    // (see https://github.com/mozilla/addons-server/blob/2016.05.05/src/olympia/blocklist/templates/blocklist/blocklist.xml#L74)
-    // But it is sometimes missing in test fixtures.
-    if (blocklistElement.hasAttribute("blockID")) {
-      blockEntry.blockID = blocklistElement.getAttribute("blockID");
-    }
-
-    // Trim helper (spaces, tabs, no-break spaces..)
-    const trim = (s) => (s || '').replace(/(^[\s\uFEFF\xA0]+)|([\s\uFEFF\xA0]+$)/g, "");
-
-    for (let i = 0; i < blocklistElement.childNodes.length; ++i) {
-      var matchElement = blocklistElement.childNodes.item(i);
-      if (!(matchElement instanceof Ci.nsIDOMElement))
-        continue;
-
-      let value;
-      if (matchElement.localName == "devices") {
-        value = [];
-        for (let j = 0; j < matchElement.childNodes.length; j++) {
-          const childElement = matchElement.childNodes.item(j);
-          const childValue = trim(childElement.textContent);
-          // Make sure no empty value is added.
-          if (childValue) {
-            if (/,/.test(childValue)) {
-              // Devices can't contain comma.
-              // (c.f serialization in _notifyObserversBlocklistGFX)
-              const e = new Error(`Unsupported device name ${childValue}`);
-              Components.utils.reportError(e);
-            }
-            else {
-              value.push(childValue);
-            }
-          }
-        }
-      } else if (matchElement.localName == "versionRange") {
-        value = {minVersion: trim(matchElement.getAttribute("minVersion")) || "0",
-                 maxVersion: trim(matchElement.getAttribute("maxVersion")) || "*"};
-      } else {
-        value = trim(matchElement.textContent);
-      }
-      if (value) {
-        blockEntry[matchElement.localName] = value;
-      }
-    }
-    result.push(blockEntry);
-  },
-
-  /* See nsIBlocklistService */
-  getPluginBlocklistState: function(plugin, appVersion, toolkitVersion) {
-    if (AppConstants.platform == "android") {
-      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-    }
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-    return this._getPluginBlocklistState(plugin, this._pluginEntries,
-                                         appVersion, toolkitVersion);
-  },
-
-  /**
-   * Private helper to get the blocklist entry for a plugin given a set of
-   * blocklist entries and versions.
-   *
-   * @param   plugin
-   *          The nsIPluginTag to get the blocklist state for.
-   * @param   pluginEntries
-   *          The plugin blocklist entries to compare against.
-   * @param   appVersion
-   *          The application version to compare to, will use the current
-   *          version if null.
-   * @param   toolkitVersion
-   *          The toolkit version to compare to, will use the current version if
-   *          null.
-   * @returns {entry: blocklistEntry, version: blocklistEntryVersion},
-   *          or null if there is no matching entry.
-   */
-  _getPluginBlocklistEntry: function(plugin, pluginEntries, appVersion, toolkitVersion) {
-    if (!gBlocklistEnabled)
-      return null;
-
-    // Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
-    if (!appVersion && !gApp.version)
-      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-
-    if (!appVersion)
-      appVersion = gApp.version;
-    if (!toolkitVersion)
-      toolkitVersion = gApp.platformVersion;
-
-    for (var blockEntry of pluginEntries) {
-      var matchFailed = false;
-      for (var name in blockEntry.matches) {
-        if (!(name in plugin) ||
-            typeof(plugin[name]) != "string" ||
-            !blockEntry.matches[name].test(plugin[name])) {
-          matchFailed = true;
-          break;
-        }
-      }
-
-      if (matchFailed)
-        continue;
-
-      for (let blockEntryVersion of blockEntry.versions) {
-        if (blockEntryVersion.includesItem(plugin.version, appVersion,
-                                           toolkitVersion)) {
-          return {entry: blockEntry, version: blockEntryVersion};
-        }
-      }
-    }
-
-    return null;
-  },
-
-  /**
-   * Private version of getPluginBlocklistState that allows the caller to pass in
-   * the plugin blocklist entries.
-   *
-   * @param   plugin
-   *          The nsIPluginTag to get the blocklist state for.
-   * @param   pluginEntries
-   *          The plugin blocklist entries to compare against.
-   * @param   appVersion
-   *          The application version to compare to, will use the current
-   *          version if null.
-   * @param   toolkitVersion
-   *          The toolkit version to compare to, will use the current version if
-   *          null.
-   * @returns The blocklist state for the item, one of the STATE constants as
-   *          defined in nsIBlocklistService.
-   */
-  _getPluginBlocklistState: function(plugin, pluginEntries, appVersion, toolkitVersion) {
-
-    let r = this._getPluginBlocklistEntry(plugin, pluginEntries,
-                                          appVersion, toolkitVersion);
-    if (!r) {
-      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
-    }
-
-    let {entry: blockEntry, version: blockEntryVersion} = r;
-
-    if (blockEntryVersion.severity >= gBlocklistLevel)
-      return Ci.nsIBlocklistService.STATE_BLOCKED;
-    if (blockEntryVersion.severity == SEVERITY_OUTDATED) {
-      let vulnerabilityStatus = blockEntryVersion.vulnerabilityStatus;
-      if (vulnerabilityStatus == VULNERABILITYSTATUS_UPDATE_AVAILABLE)
-        return Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE;
-      if (vulnerabilityStatus == VULNERABILITYSTATUS_NO_UPDATE)
-        return Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE;
-      return Ci.nsIBlocklistService.STATE_OUTDATED;
-    }
-    return Ci.nsIBlocklistService.STATE_SOFTBLOCKED;
-  },
-
-  /* See nsIBlocklistService */
-  getPluginBlocklistURL: function(plugin) {
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-
-    let r = this._getPluginBlocklistEntry(plugin, this._pluginEntries);
-    if (!r) {
-      return null;
-    }
-    let {entry: blockEntry, version: blockEntryVersion} = r;
-    if (!blockEntry.blockID) {
-      return null;
-    }
-
-    return this._createBlocklistURL(blockEntry.blockID);
-  },
-
-  /* See nsIBlocklistService */
-  getPluginInfoURL: function(plugin) {
-    if (!this._isBlocklistLoaded())
-      this._loadBlocklist();
-
-    let r = this._getPluginBlocklistEntry(plugin, this._pluginEntries);
-    if (!r) {
-      return null;
-    }
-    let {entry: blockEntry, version: blockEntryVersion} = r;
-    if (!blockEntry.blockID) {
-      return null;
-    }
-
-    return blockEntry.infoURL;
-  },
-
-  _notifyObserversBlocklistGFX: function () {
-    // Notify `GfxInfoBase`, by passing a string serialization.
-    // This way we avoid spreading XML structure logics there.
-    const payload = this._gfxEntries.map((r) => {
-      return Object.keys(r).sort().filter((k) => !/id|last_modified/.test(k)).map((key) => {
-        let value = r[key];
-        if (Array.isArray(value)) {
-          value = value.join(",");
-        } else if (value.hasOwnProperty("minVersion")) {
-          // When XML is parsed, both minVersion and maxVersion are set.
-          value = `${value.minVersion},${value.maxVersion}`;
-        }
-        return `${key}:${value}`;
-      }).join("\t");
-    }).join("\n");
-    Services.obs.notifyObservers(null, "blocklist-data-gfxItems", payload);
-  },
-
-  _notifyObserversBlocklistUpdated: function() {
-    Services.obs.notifyObservers(this, "blocklist-updated", "");
-    Services.ppmm.broadcastAsyncMessage("Blocklist:blocklistInvalidated", {});
-  },
-
-  _blocklistUpdated: function(oldAddonEntries, oldPluginEntries) {
-    var addonList = [];
-
-    // A helper function that reverts the prefs passed to default values.
-    function resetPrefs(prefs) {
-      for (let pref of prefs)
-        gPref.clearUserPref(pref);
-    }
-    const types = ["extension", "theme", "locale", "dictionary", "service"];
-    AddonManager.getAddonsByTypes(types, addons => {
-      for (let addon of addons) {
-        let oldState = Ci.nsIBlocklistService.STATE_NOTBLOCKED;
-        if (oldAddonEntries)
-          oldState = this._getAddonBlocklistState(addon, oldAddonEntries);
-        let state = this.getAddonBlocklistState(addon);
-
-        LOG("Blocklist state for " + addon.id + " changed from " +
-            oldState + " to " + state);
-
-        // We don't want to re-warn about add-ons
-        if (state == oldState)
-          continue;
-
-        if (state === Ci.nsIBlocklistService.STATE_BLOCKED) {
-          // It's a hard block. We must reset certain preferences.
-          let prefs = this._getAddonPrefs(addon);
-          resetPrefs(prefs);
-         }
-
-        // Ensure that softDisabled is false if the add-on is not soft blocked
-        if (state != Ci.nsIBlocklistService.STATE_SOFTBLOCKED)
-          addon.softDisabled = false;
-
-        // Don't warn about add-ons becoming unblocked.
-        if (state == Ci.nsIBlocklistService.STATE_NOT_BLOCKED)
-          continue;
-
-        // If an add-on has dropped from hard to soft blocked just mark it as
-        // soft disabled and don't warn about it.
-        if (state == Ci.nsIBlocklistService.STATE_SOFTBLOCKED &&
-            oldState == Ci.nsIBlocklistService.STATE_BLOCKED) {
-          addon.softDisabled = true;
-          continue;
-        }
-
-        // If the add-on is already disabled for some reason then don't warn
-        // about it
-        if (!addon.isActive) {
-          // But mark it as softblocked if necessary. Note that we avoid setting
-          // softDisabled at the same time as userDisabled to make it clear
-          // which was the original cause of the add-on becoming disabled in a
-          // way that the user can change.
-          if (state == Ci.nsIBlocklistService.STATE_SOFTBLOCKED && !addon.userDisabled)
-            addon.softDisabled = true;
-          continue;
-        }
-
-        addonList.push({
-          name: addon.name,
-          version: addon.version,
-          icon: addon.iconURL,
-          disable: false,
-          blocked: state == Ci.nsIBlocklistService.STATE_BLOCKED,
-          item: addon,
-          url: this.getAddonBlocklistURL(addon),
-        });
-      }
-
-      AddonManagerPrivate.updateAddonAppDisabledStates();
-
-      var phs = Cc["@mozilla.org/plugin/host;1"].
-                getService(Ci.nsIPluginHost);
-      var plugins = phs.getPluginTags();
-
-      for (let plugin of plugins) {
-        let oldState = -1;
-        if (oldPluginEntries)
-          oldState = this._getPluginBlocklistState(plugin, oldPluginEntries);
-        let state = this.getPluginBlocklistState(plugin);
-        LOG("Blocklist state for " + plugin.name + " changed from " +
-            oldState + " to " + state);
-        // We don't want to re-warn about items
-        if (state == oldState)
-          continue;
-
-        if (oldState == Ci.nsIBlocklistService.STATE_BLOCKED) {
-          if (state == Ci.nsIBlocklistService.STATE_SOFTBLOCKED)
-            plugin.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
-        }
-        else if (!plugin.disabled && state != Ci.nsIBlocklistService.STATE_NOT_BLOCKED) {
-          if (state != Ci.nsIBlocklistService.STATE_OUTDATED &&
-              state != Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE &&
-              state != Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE) {
-            addonList.push({
-              name: plugin.name,
-              version: plugin.version,
-              icon: "chrome://mozapps/skin/plugins/pluginGeneric.png",
-              disable: false,
-              blocked: state == Ci.nsIBlocklistService.STATE_BLOCKED,
-              item: plugin,
-              url: this.getPluginBlocklistURL(plugin),
-            });
-          }
-        }
-      }
-
-      if (addonList.length == 0) {
-        this._notifyObserversBlocklistUpdated();
-        return;
-      }
-
-      if ("@mozilla.org/addons/blocklist-prompt;1" in Cc) {
-        try {
-          let blockedPrompter = Cc["@mozilla.org/addons/blocklist-prompt;1"]
-                                 .getService(Ci.nsIBlocklistPrompt);
-          blockedPrompter.prompt(addonList);
-        } catch (e) {
-          LOG(e);
-        }
-        this._notifyObserversBlocklistUpdated();
-        return;
-      }
-
-      var args = {
-        restart: false,
-        list: addonList
-      };
-      // This lets the dialog get the raw js object
-      args.wrappedJSObject = args;
-
-      /*
-        Some tests run without UI, so the async code listens to a message
-        that can be sent programatically
-      */
-      let applyBlocklistChanges = () => {
-        for (let addon of addonList) {
-          if (!addon.disable)
-            continue;
-
-          if (addon.item instanceof Ci.nsIPluginTag)
-            addon.item.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
-          else {
-            // This add-on is softblocked.
-            addon.item.softDisabled = true;
-            // We must revert certain prefs.
-            let prefs = this._getAddonPrefs(addon.item);
-            resetPrefs(prefs);
-          }
-        }
-
-        if (args.restart)
-          restartApp();
-
-        this._notifyObserversBlocklistUpdated();
-        Services.obs.removeObserver(applyBlocklistChanges, "addon-blocklist-closed");
-      }
-
-      Services.obs.addObserver(applyBlocklistChanges, "addon-blocklist-closed", false);
-
-      if (getPref("getBoolPref", PREF_BLOCKLIST_SUPPRESSUI, false)) {
-        applyBlocklistChanges();
-        return;
-      }
-
-      function blocklistUnloadHandler(event) {
-        if (event.target.location == URI_BLOCKLIST_DIALOG) {
-          applyBlocklistChanges();
-          blocklistWindow.removeEventListener("unload", blocklistUnloadHandler);
-        }
-      }
-
-      let blocklistWindow = Services.ww.openWindow(null, URI_BLOCKLIST_DIALOG, "",
-                              "chrome,centerscreen,dialog,titlebar", args);
-      if (blocklistWindow)
-        blocklistWindow.addEventListener("unload", blocklistUnloadHandler, false);
-    });
-  },
-
-  classID: Components.ID("{66354bc9-7ed1-4692-ae1d-8da97d6b205e}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                         Ci.nsIBlocklistService,
-                                         Ci.nsITimerCallback]),
-};
-
-/**
- * Helper for constructing a blocklist.
- */
-function BlocklistItemData(versionRangeElement) {
-  var versionRange = this.getBlocklistVersionRange(versionRangeElement);
-  this.minVersion = versionRange.minVersion;
-  this.maxVersion = versionRange.maxVersion;
-  if (versionRangeElement && versionRangeElement.hasAttribute("severity"))
-    this.severity = versionRangeElement.getAttribute("severity");
-  else
-    this.severity = DEFAULT_SEVERITY;
-  if (versionRangeElement && versionRangeElement.hasAttribute("vulnerabilitystatus")) {
-    this.vulnerabilityStatus = versionRangeElement.getAttribute("vulnerabilitystatus");
-  } else {
-    this.vulnerabilityStatus = VULNERABILITYSTATUS_NONE;
-  }
-  this.targetApps = { };
-  var found = false;
-
-  if (versionRangeElement) {
-    for (var i = 0; i < versionRangeElement.childNodes.length; ++i) {
-      var targetAppElement = versionRangeElement.childNodes.item(i);
-      if (!(targetAppElement instanceof Ci.nsIDOMElement) ||
-          targetAppElement.localName != "targetApplication")
-        continue;
-      found = true;
-      // default to the current application if id is not provided.
-      var appID = targetAppElement.hasAttribute("id") ? targetAppElement.getAttribute("id") : gApp.ID;
-      this.targetApps[appID] = this.getBlocklistAppVersions(targetAppElement);
-    }
-  }
-  // Default to all versions of the current application when no targetApplication
-  // elements were found
-  if (!found)
-    this.targetApps[gApp.ID] = this.getBlocklistAppVersions(null);
-}
-
-BlocklistItemData.prototype = {
-  /**
-   * Tests if a version of an item is included in the version range and target
-   * application information represented by this BlocklistItemData using the
-   * provided application and toolkit versions.
-   * @param   version
-   *          The version of the item being tested.
-   * @param   appVersion
-   *          The application version to test with.
-   * @param   toolkitVersion
-   *          The toolkit version to test with.
-   * @returns True if the version range covers the item version and application
-   *          or toolkit version.
-   */
-  includesItem: function(version, appVersion, toolkitVersion) {
-    // Some platforms have no version for plugins, these don't match if there
-    // was a min/maxVersion provided
-    if (!version && (this.minVersion || this.maxVersion))
-      return false;
-
-    // Check if the item version matches
-    if (!this.matchesRange(version, this.minVersion, this.maxVersion))
-      return false;
-
-    // Check if the application version matches
-    if (this.matchesTargetRange(gApp.ID, appVersion))
-      return true;
-
-    // Check if the toolkit version matches
-    return this.matchesTargetRange(TOOLKIT_ID, toolkitVersion);
-  },
-
-  /**
-   * Checks if a version is higher than or equal to the minVersion (if provided)
-   * and lower than or equal to the maxVersion (if provided).
-   * @param   version
-   *          The version to test.
-   * @param   minVersion
-   *          The minimum version. If null it is assumed that version is always
-   *          larger.
-   * @param   maxVersion
-   *          The maximum version. If null it is assumed that version is always
-   *          smaller.
-   */
-  matchesRange: function(version, minVersion, maxVersion) {
-    if (minVersion && gVersionChecker.compare(version, minVersion) < 0)
-      return false;
-    if (maxVersion && gVersionChecker.compare(version, maxVersion) > 0)
-      return false;
-    return true;
-  },
-
-  /**
-   * Tests if there is a matching range for the given target application id and
-   * version.
-   * @param   appID
-   *          The application ID to test for, may be for an application or toolkit
-   * @param   appVersion
-   *          The version of the application to test for.
-   * @returns True if this version range covers the application version given.
-   */
-  matchesTargetRange: function(appID, appVersion) {
-    var blTargetApp = this.targetApps[appID];
-    if (!blTargetApp)
-      return false;
-
-    for (let app of blTargetApp) {
-      if (this.matchesRange(appVersion, app.minVersion, app.maxVersion))
-        return true;
-    }
-
-    return false;
-  },
-
-  /**
-   * Retrieves a version range (e.g. minVersion and maxVersion) for a
-   * blocklist item's targetApplication element.
-   * @param   targetAppElement
-   *          A targetApplication blocklist element.
-   * @returns An array of JS objects with the following properties:
-   *          "minVersion"  The minimum version in a version range (default = null).
-   *          "maxVersion"  The maximum version in a version range (default = null).
-   */
-  getBlocklistAppVersions: function(targetAppElement) {
-    var appVersions = [ ];
-
-    if (targetAppElement) {
-      for (var i = 0; i < targetAppElement.childNodes.length; ++i) {
-        var versionRangeElement = targetAppElement.childNodes.item(i);
-        if (!(versionRangeElement instanceof Ci.nsIDOMElement) ||
-            versionRangeElement.localName != "versionRange")
-          continue;
-        appVersions.push(this.getBlocklistVersionRange(versionRangeElement));
-      }
-    }
-    // return minVersion = null and maxVersion = null if no specific versionRange
-    // elements were found
-    if (appVersions.length == 0)
-      appVersions.push(this.getBlocklistVersionRange(null));
-    return appVersions;
-  },
-
-  /**
-   * Retrieves a version range (e.g. minVersion and maxVersion) for a blocklist
-   * versionRange element.
-   * @param   versionRangeElement
-   *          The versionRange blocklist element.
-   * @returns A JS object with the following properties:
-   *          "minVersion"  The minimum version in a version range (default = null).
-   *          "maxVersion"  The maximum version in a version range (default = null).
-   */
-  getBlocklistVersionRange: function(versionRangeElement) {
-    var minVersion = null;
-    var maxVersion = null;
-    if (!versionRangeElement)
-      return { minVersion: minVersion, maxVersion: maxVersion };
-
-    if (versionRangeElement.hasAttribute("minVersion"))
-      minVersion = versionRangeElement.getAttribute("minVersion");
-    if (versionRangeElement.hasAttribute("maxVersion"))
-      maxVersion = versionRangeElement.getAttribute("maxVersion");
-
-    return { minVersion: minVersion, maxVersion: maxVersion };
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([Blocklist]);
diff --git a/toolkit/mozapps/webextensions/nsBlocklistServiceContent.js b/toolkit/mozapps/webextensions/nsBlocklistServiceContent.js
deleted file mode 100644
index 1752924b5..000000000
--- a/toolkit/mozapps/webextensions/nsBlocklistServiceContent.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-const kMissingAPIMessage = "Unsupported blocklist call in the child process."
-
-/*
- * A lightweight blocklist proxy for the content process that traps plugin
- * related blocklist checks and forwards them to the parent. This interface is
- * primarily designed to insure overlays work.. it does not control plugin
- * or addon loading.
- */
-
-function Blocklist() {
-  this.init();
-}
-
-Blocklist.prototype = {
-  classID: Components.ID("{e0a106ed-6ad4-47a4-b6af-2f1c8aa4712d}"),
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                         Ci.nsIBlocklistService]),
-
-  init: function() {
-    Services.cpmm.addMessageListener("Blocklist:blocklistInvalidated", this);
-    Services.obs.addObserver(this, "xpcom-shutdown", false);
-  },
-
-  uninit: function() {
-    Services.cpmm.removeMessageListener("Blocklist:blocklistInvalidated", this);
-    Services.obs.removeObserver(this, "xpcom-shutdown", false);
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    switch (aTopic) {
-    case "xpcom-shutdown":
-      this.uninit();
-      break;
-    }
-  },
-
-  // Message manager message handlers
-  receiveMessage: function(aMsg) {
-    switch (aMsg.name) {
-      case "Blocklist:blocklistInvalidated":
-        Services.obs.notifyObservers(null, "blocklist-updated", null);
-        Services.cpmm.sendAsyncMessage("Blocklist:content-blocklist-updated");
-        break;
-      default:
-        throw new Error("Unknown blocklist message received from content: " + aMsg.name);
-    }
-  },
-
-  /*
-   * A helper that queries key data from a plugin or addon object
-   * and generates a simple data wrapper suitable for ipc. We hand
-   * these directly to the nsBlockListService in the parent which
-   * doesn't query for much.. allowing us to get away with this.
-   */
-  flattenObject: function(aTag) {
-    // Based on debugging the nsBlocklistService, these are the props the
-    // parent side will check on our objects.
-    let props = ["name", "description", "filename", "version"];
-    let dataWrapper = {};
-    for (let prop of props) {
-      dataWrapper[prop] = aTag[prop];
-    }
-    return dataWrapper;
-  },
-
-  // We support the addon methods here for completeness, but content currently
-  // only calls getPluginBlocklistState.
-
-  isAddonBlocklisted: function(aAddon, aAppVersion, aToolkitVersion) {
-    return true;
-  },
-
-  getAddonBlocklistState: function(aAddon, aAppVersion, aToolkitVersion) {
-    return Components.interfaces.nsIBlocklistService.STATE_BLOCKED;
-  },
-
-  // There are a few callers in layout that rely on this.
-  getPluginBlocklistState: function(aPluginTag, aAppVersion, aToolkitVersion) {
-    return Services.cpmm.sendSyncMessage("Blocklist:getPluginBlocklistState", {
-      addonData: this.flattenObject(aPluginTag),
-      appVersion: aAppVersion,
-      toolkitVersion: aToolkitVersion
-    })[0];
-  },
-
-  getAddonBlocklistURL: function(aAddon, aAppVersion, aToolkitVersion) {
-    throw new Error(kMissingAPIMessage);
-  },
-
-  getPluginBlocklistURL: function(aPluginTag) {
-    throw new Error(kMissingAPIMessage);
-  },
-
-  getPluginInfoURL: function(aPluginTag) {
-    throw new Error(kMissingAPIMessage);
-  }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([Blocklist]);