From 767ecf0f2e125358946990d98224cd85d02b2939 Mon Sep 17 00:00:00 2001
From: harthur <fayearthur@gmail.com>
Date: Thu, 28 Oct 2010 11:39:19 -0700
Subject: [PATCH] remove extension compatiblity fixing

---
 chrome.manifest                              |   1 -
 chrome/content/configwarning.js              | 101 ----
 chrome/content/configwarning.xul             |  67 ---
 chrome/content/extensions/addons.xul         |  64 ---
 chrome/content/extensions/extensions.js      | 143 -----
 chrome/content/extensions/incompatible.css   |  40 --
 chrome/content/extensions/incompatible.js    |  64 ---
 chrome/content/extensions/incompatible.xml   |  65 ---
 chrome/content/extensions/incompatible.xul   |  65 ---
 chrome/locale/en-US/configwarning.dtd        |   8 -
 chrome/locale/en-US/incompatible.dtd         |  11 -
 chrome/skin/configwarning.css                |  46 --
 chrome/skin/extensions/extensions.css        |  40 --
 chrome/skin/extensions/incompatible.css      |  57 --
 components/nttAddonCompatibilityService.js   | 545 -------------------
 components/nttIAddonCompatibilityService.idl |  62 ---
 16 files changed, 1379 deletions(-)
 delete mode 100644 chrome/content/configwarning.js
 delete mode 100644 chrome/content/configwarning.xul
 delete mode 100644 chrome/content/extensions/addons.xul
 delete mode 100644 chrome/content/extensions/extensions.js
 delete mode 100644 chrome/content/extensions/incompatible.css
 delete mode 100644 chrome/content/extensions/incompatible.js
 delete mode 100644 chrome/content/extensions/incompatible.xml
 delete mode 100644 chrome/content/extensions/incompatible.xul
 delete mode 100644 chrome/locale/en-US/configwarning.dtd
 delete mode 100644 chrome/locale/en-US/incompatible.dtd
 delete mode 100644 chrome/skin/configwarning.css
 delete mode 100644 chrome/skin/extensions/extensions.css
 delete mode 100644 chrome/skin/extensions/incompatible.css
 delete mode 100644 components/nttAddonCompatibilityService.js
 delete mode 100644 components/nttIAddonCompatibilityService.idl

diff --git a/chrome.manifest b/chrome.manifest
index 5147454..a5bd765 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -6,7 +6,6 @@ locale       nightly          en-US                                   chrome/loc
 resource     nightly          modules/
 
 # Shared chrome
-overlay      chrome://mozapps/content/extensions/extensions.xul       chrome://nightly/content/extensions/addons.xul
 override     chrome://nightly/content/platform.js                     chrome://nightly/content/winPlatform.js                  os=winnt
 
 style       chrome://browser/content/browser.xul                      chrome://nightly/skin/browser.css
diff --git a/chrome/content/configwarning.js b/chrome/content/configwarning.js
deleted file mode 100644
index 127287d..0000000
--- a/chrome/content/configwarning.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Nightly Tester Tools.
- *
- * The Initial Developer of the Original Code is
- *     Dave Townsend <dtownsend@oxymoronical.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-var gOS = null;
-
-var observer = {
-  observe: function(subject, topic, data) {
-    window.focus();
-  }
-}
-
-function init() {
-  var bundle = document.getElementById("bundle");
-  setLabelForButton(document.documentElement.getButton("accept"), bundle.getString("Yes"));
-  setLabelForButton(document.documentElement.getButton("cancel"), bundle.getString("No"));
-
-  gOS = Cc["@mozilla.org/observer-service;1"].
-        getService(Ci.nsIObserverService);
-  gOS.addObserver(observer, "xul-window-visible", false);
-}
-
-function unload() {
-  gOS.removeObserver(observer, "xul-window-visible");
-  gOS = null;
-}
-
-function setLabelForButton(button, label)
-{
-  var accessKey = null;
-  if (/ *\(\&([^&])\)(:)?$/.test(label)) {
-    label = RegExp.leftContext + RegExp.$2;
-    accessKey = RegExp.$1;
-  } else if (/^(.*[^&])?\&(([^&]).*$)/.test(label)) {
-    label = RegExp.$1 + RegExp.$2;
-    accessKey = RegExp.$3;
-  }
-  // && is the magic sequence to embed an & in your label.
-  label = label.replace(/\&\&/g, "&");
-  button.label = label;
-  if (accessKey)
-    button.accessKey = accessKey;
-}
-
-function accept() {
-  var cs = Cc["@oxymoronical.com/nightly/addoncompatibility;1"].
-           createInstance(Ci.nttIAddonCompatibilityService);
-  var em = Cc["@mozilla.org/extensions/manager;1"].
-           getService(Ci.nsIExtensionManager);
-  var items = em.getItemList(Ci.nsIUpdateItem.TYPE_ADDON, {});
-  for (var i = 0; i < items.length; i++) {
-    var addon = cs.getAddonForID(items[i].id);
-    if (!addon.isValid())
-      continue;
-    if (!addon.needsOverride(false) && addon.needsOverride(true))
-      addon.overrideCompatibility(true);
-  }
-
-  var prefs = Cc["@mozilla.org/preferences-service;1"].
-              getService(Ci.nsIPrefBranch);
-  if (prefs.prefHasUserValue("extensions.checkCompatibility"))
-    prefs.clearUserPref("extensions.checkCompatibility");
-  if (prefs.prefHasUserValue("extensions.checkUpdateSecurity"))
-    prefs.clearUserPref("extensions.checkUpdateSecurity");
-}
diff --git a/chrome/content/configwarning.xul b/chrome/content/configwarning.xul
deleted file mode 100644
index b34b6c0..0000000
--- a/chrome/content/configwarning.xul
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-  -   Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  -
-  - The contents of this file are subject to the Mozilla Public License Version
-  - 1.1 (the "License"); you may not use this file except in compliance with
-  - the License. You may obtain a copy of the License at
-  - http://www.mozilla.org/MPL/
-  - 
-  - Software distributed under the License is distributed on an "AS IS" basis,
-  - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-  - for the specific language governing rights and limitations under the
-  - License.
-  -
-  - The Original Code is Nightly Tester Tools.
-  -
-  - The Initial Developer of the Original Code is
-  -      Dave Townsend <dtownsend@oxymoronical.com>.
-  -
-  - Portions created by the Initial Developer are Copyright (C) 2008
-  - the Initial Developer. All Rights Reserved.
-  -
-  - Contributor(s):
-  -
-  - Alternatively, the contents of this file may be used under the terms of
-  - either the GNU General Public License Version 2 or later (the "GPL"), or
-  - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-  - in which case the provisions of the GPL or the LGPL are applicable instead
-  - of those above. If you wish to allow use of your version of this file only
-  - under the terms of either the GPL or the LGPL, and not to allow others to
-  - use your version of this file under the terms of the MPL, indicate your
-  - decision by deleting the provisions above and replace them with the notice
-  - and other provisions required by the GPL or the LGPL. If you do not delete
-  - the provisions above, a recipient may use your version of this file under
-  - the terms of any one of the MPL, the GPL or the LGPL.
-  - 
-  - ***** END LICENSE BLOCK ***** -->
-
-<!DOCTYPE dialog [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % firstrunDTD SYSTEM "chrome://nightly/locale/configwarning.dtd">
-%firstrunDTD;
-]>
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://nightly/skin/configwarning.css" type="text/css"?>
-
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&dialog.title;" style="&dialog.style;" buttons="accept,cancel"
-        windowtype="NightlyTester:ConfigWarning"
-        onload="init()" onunload="unload()" ondialogaccept="accept()">
-
-  <script src="configwarning.js"/>
-
-  <stringbundle id="bundle" src="chrome://global/locale/commonDialogs.properties"/>
-
-  <hbox id="banner" align="start">
-    <image class="alert-icon"/>
-    <vbox flex="1">
-      <label id="title">&title;</label>
-      <description>&subtitle;</description>
-      <description>&question;</description>
-    </vbox>
-  </hbox>
-
-</dialog>
diff --git a/chrome/content/extensions/addons.xul b/chrome/content/extensions/addons.xul
deleted file mode 100644
index fe1faac..0000000
--- a/chrome/content/extensions/addons.xul
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-  -   Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  -
-  - The contents of this file are subject to the Mozilla Public License Version
-  - 1.1 (the "License"); you may not use this file except in compliance with
-  - the License. You may obtain a copy of the License at
-  - http://www.mozilla.org/MPL/
-  - 
-  - Software distributed under the License is distributed on an "AS IS" basis,
-  - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-  - for the specific language governing rights and limitations under the
-  - License.
-  -
-  - The Original Code is Nightly Tester Tools.
-  -
-  - The Initial Developer of the Original Code is
-  -      Dave Townsend <dtownsend@oxymoronical.com>.
-  -
-  - Portions created by the Initial Developer are Copyright (C) 2007
-  - the Initial Developer. All Rights Reserved.
-  -
-  - Contributor(s):
-  -
-  - Alternatively, the contents of this file may be used under the terms of
-  - either the GNU General Public License Version 2 or later (the "GPL"), or
-  - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-  - in which case the provisions of the GPL or the LGPL are applicable instead
-  - of those above. If you wish to allow use of your version of this file only
-  - under the terms of either the GPL or the LGPL, and not to allow others to
-  - use your version of this file under the terms of the MPL, indicate your
-  - decision by deleting the provisions above and replace them with the notice
-  - and other provisions required by the GPL or the LGPL. If you do not delete
-  - the provisions above, a recipient may use your version of this file under
-  - the terms of any one of the MPL, the GPL or the LGPL.
-  - 
-  - ***** END LICENSE BLOCK ***** -->
-
-<!DOCTYPE window SYSTEM "chrome://nightly/locale/nightly.dtd">
-
-<?xml-stylesheet href="chrome://nightly/skin/extensions/extensions.css" type="text/css"?>
-
-<overlay id="NightlyExtensionsOverlay"
-                        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/x-javascript" src="extensions.js" />
-  
-  <stringbundleset id="extensionsSet">
-    <stringbundle id="nightlylocale" src="chrome://nightly/locale/nightly.properties"/>
-  </stringbundleset>
-
-  <vbox id="addonContextMenuPalette">
-    <menuitem id="menuitem_appenable" insertafter="menuitem_disable"
-        oncommand="extensionAppEnabler.appEnable();" label="&nightly.appenable.label;"/>
-  </vbox>
-  
-  <hbox id="commandBarBottom">
-    <button id="enableallButton" hidden="true" label="&nightly.enableall.label;"
-            oncommand="extensionAppEnabler.enableAll()"
-            tooltiptext="&nightly.enableall.tooltip;" insertbefore="restartAppButton"/>
-    <separator class="commandBarSeparator" insertbefore="restartAppButton"/>
-  </hbox>
-  
-</overlay>
diff --git a/chrome/content/extensions/extensions.js b/chrome/content/extensions/extensions.js
deleted file mode 100644
index 62c56b5..0000000
--- a/chrome/content/extensions/extensions.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Nightly Tester Tools.
- *
- * The Initial Developer of the Original Code is
- *     Dave Townsend <dtownsend@oxymoronical.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-var extensionAppEnabler = {
-
-prefs: null,
-cs: null,
-
-init: function() {
-  var pos = gAddonContextMenus.indexOf("menuitem_enable");
-  gAddonContextMenus.splice(pos, 0, "menuitem_appenable");
-  this.cs = Components.classes["@oxymoronical.com/nightly/addoncompatibility;1"]
-                      .createInstance().wrappedJSObject;
-},
-
-initView: function() {
-  var enableb = document.getElementById("enableallButton");
-  
-  if (!this.prefs.getBoolPref("showEnableAll")) {
-    enableb.hidden = true;
-    return;
-  }
-
-  var parent = document.getElementById("viewGroup");
-  var node = parent.firstChild;
-  while (node != null) {
-    if (node.selected) {
-      switch (node.id) {
-        case "extensions-view":
-        case "themes-view":
-        case "locales-view":
-          enableb.hidden = false;
-          break;
-        default:
-          enableb.hidden = true;
-      }
-      return;
-    }
-    node = node.nextSibling;
-  }
-
-  enableb.hidden = true;
-},
-
-load: function() {
-  var prefservice = Components.classes['@mozilla.org/preferences-service;1']
-                              .getService(Components.interfaces.nsIPrefService);
-  this.prefs = prefservice.getBranch("nightly.")
-                          .QueryInterface(Components.interfaces.nsIPrefBranchInternal);
-
-  var context = document.getElementById("addonContextMenu");
-  context.addEventListener("popupshowing", function() { extensionAppEnabler.popupShowing(); }, false);
-  
-  var radios = document.getElementById("viewGroup");
-  radios.addEventListener("select", function() { extensionAppEnabler.initView(); }, false);
-  this.initView();
-},
-
-popupShowing: function() {
-  var item = gExtensionsView.selectedItem;
-  var menu = document.getElementById("menuitem_appenable");
-  var menuclone = document.getElementById("menuitem_appenable_clone");
-  var addon = this.cs.getAddonForID(item.getAttribute("addonID"));
-  menu.hidden = !(addon.isValid() && addon.needsOverride(false));
-  if (menuclone)
-    menuclone.hidden = menu.hidden;    
-},
-
-appEnable: function() {
-  var ev = gExtensionsView;
-  var item = ev.selectedItem;
-  this.cs.confirmOverride([this.cs.getAddonForID(item.getAttribute("addonID"))], 1);
-  this.syncCompatibility();
-},
-
-enableAll: function() {
-  var addons = [];
-  var items = gExtensionsView.children;
-  for (var i = 0; i < items.length; i++) {
-    var addon = this.cs.getAddonForID(items[i].getAttribute("addonID"));
-    if (addon.isValid() && addon.needsOverride(false))
-      addons.push(addon);
-  }
-  if (addons.length > 0) {
-    this.cs.confirmOverride(addons, addons.length);
-    this.syncCompatibility();
-  }
-},
-
-syncCompatibility: function() {
-  var prefService = Components.classes['@mozilla.org/preferences-service;1']
-                              .getService(Components.interfaces.nsIPrefBranch);
-  try {
-    var checkCompatibility = prefService.getBoolPref("extensions.checkCompatibility");
-    prefService.setBoolPref("extensions.checkCompatibility", !checkCompatibility);
-    prefService.setBoolPref("extensions.checkCompatibility", checkCompatibility);
- 	}
- 	catch (e) {
-    prefService.setBoolPref("extensions.checkCompatibility", false);
-    prefService.setBoolPref("extensions.checkCompatibility", true);
-  }
-  updateOptionalViews();
-  updateGlobalCommands();
-}
-}
-
-extensionAppEnabler.init();
-
-window.addEventListener("load", function() { extensionAppEnabler.load(); }, false);
diff --git a/chrome/content/extensions/incompatible.css b/chrome/content/extensions/incompatible.css
deleted file mode 100644
index fd7608a..0000000
--- a/chrome/content/extensions/incompatible.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Nightly Tester Tools.
- *
- * The Initial Developer of the Original Code is
- *     Dave Townsend <dtownsend@oxymoronical.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-richlistitem {
-  -moz-binding: url(chrome://nightly/content/extensions/incompatible.xml#incompatible);
-}
diff --git a/chrome/content/extensions/incompatible.js b/chrome/content/extensions/incompatible.js
deleted file mode 100644
index 719191c..0000000
--- a/chrome/content/extensions/incompatible.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Nightly Tester Tools.
- *
- * The Initial Developer of the Original Code is
- *     Dave Townsend <dtownsend@oxymoronical.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-var gItems;
-
-function Startup() {
-  gItems = window.arguments;
-  var list = document.getElementById("addonlist");
-  for (var i = 0; i < gItems.length; i++) {
-    gItems[i].QueryInterface(Ci.nsIUpdateItem);
-    var addon = gItems[i].wrappedJSObject;
-    var ri = document.createElement("richlistitem");
-    ri.setAttribute("name", addon.name);
-    ri.setAttribute("version", addon.version);
-    ri.setAttribute("icon", addon.iconURL);
-    ri.setAttribute("secure", addon.isUpdateSecure(false) ? "true" : "false");
-    ri.setAttribute("compatible", addon.isCompatible(false) ? "true" : "false");
-    
-    list.appendChild(ri);
-  }
-}
-
-function Accept() {
-  for (var i = 0; i < gItems.length; i++) {
-    gItems[i].wrappedJSObject.overrideCompatibility(false);
-  }
-}
diff --git a/chrome/content/extensions/incompatible.xml b/chrome/content/extensions/incompatible.xml
deleted file mode 100644
index e69708d..0000000
--- a/chrome/content/extensions/incompatible.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-  -   Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  -
-  - The contents of this file are subject to the Mozilla Public License Version
-  - 1.1 (the "License"); you may not use this file except in compliance with
-  - the License. You may obtain a copy of the License at
-  - http://www.mozilla.org/MPL/
-  - 
-  - Software distributed under the License is distributed on an "AS IS" basis,
-  - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-  - for the specific language governing rights and limitations under the
-  - License.
-  -
-  - The Original Code is Nightly Tester Tools.
-  -
-  - The Initial Developer of the Original Code is
-  -      Dave Townsend <dtownsend@oxymoronical.com>.
-  -
-  - Portions created by the Initial Developer are Copyright (C) 2007
-  - the Initial Developer. All Rights Reserved.
-  -
-  - Contributor(s):
-  -
-  - Alternatively, the contents of this file may be used under the terms of
-  - either the GNU General Public License Version 2 or later (the "GPL"), or
-  - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-  - in which case the provisions of the GPL or the LGPL are applicable instead
-  - of those above. If you wish to allow use of your version of this file only
-  - under the terms of either the GPL or the LGPL, and not to allow others to
-  - use your version of this file under the terms of the MPL, indicate your
-  - decision by deleting the provisions above and replace them with the notice
-  - and other provisions required by the GPL or the LGPL. If you do not delete
-  - the provisions above, a recipient may use your version of this file under
-  - the terms of any one of the MPL, the GPL or the LGPL.
-  - 
-  - ***** END LICENSE BLOCK ***** -->
-
-<!DOCTYPE bindings [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % incompatibleDTD SYSTEM "chrome://nightly/locale/incompatible.dtd">
-%incompatibleDTD;
-]>
-
-<bindings xmlns="http://www.mozilla.org/xbl" xmlns:xbl="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="incompatible" name="incompatible">
-    <content>
-      <xul:hbox align="center">
-        <xul:image xbl:inherits="src=icon"/>
-        <xul:vbox flex="1">
-          <xul:hbox class="name-version">
-            <xul:label xbl:inherits="value=name"/>
-            <xul:label xbl:inherits="value=version"/>
-          </xul:hbox>
-          <xul:label class="warning incompatible" value="&incompatible.label;"/>
-          <xul:label class="warning insecure" value="&insecure.label;"/>
-        </xul:vbox>
-      </xul:hbox>
-    </content>
-  </binding>
-
-</bindings>
diff --git a/chrome/content/extensions/incompatible.xul b/chrome/content/extensions/incompatible.xul
deleted file mode 100644
index ea62348..0000000
--- a/chrome/content/extensions/incompatible.xul
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-  -   Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  -
-  - The contents of this file are subject to the Mozilla Public License Version
-  - 1.1 (the "License"); you may not use this file except in compliance with
-  - the License. You may obtain a copy of the License at
-  - http://www.mozilla.org/MPL/
-  - 
-  - Software distributed under the License is distributed on an "AS IS" basis,
-  - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-  - for the specific language governing rights and limitations under the
-  - License.
-  -
-  - The Original Code is Nightly Tester Tools.
-  -
-  - The Initial Developer of the Original Code is
-  -      Dave Townsend <dtownsend@oxymoronical.com>.
-  -
-  - Portions created by the Initial Developer are Copyright (C) 2007
-  - the Initial Developer. All Rights Reserved.
-  -
-  - Contributor(s):
-  -
-  - Alternatively, the contents of this file may be used under the terms of
-  - either the GNU General Public License Version 2 or later (the "GPL"), or
-  - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-  - in which case the provisions of the GPL or the LGPL are applicable instead
-  - of those above. If you wish to allow use of your version of this file only
-  - under the terms of either the GPL or the LGPL, and not to allow others to
-  - use your version of this file under the terms of the MPL, indicate your
-  - decision by deleting the provisions above and replace them with the notice
-  - and other provisions required by the GPL or the LGPL. If you do not delete
-  - the provisions above, a recipient may use your version of this file under
-  - the terms of any one of the MPL, the GPL or the LGPL.
-  - 
-  - ***** END LICENSE BLOCK ***** -->
-
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % incompatibleDTD SYSTEM "chrome://nightly/locale/incompatible.dtd">
-%incompatibleDTD;
-]>
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://nightly/content/extensions/incompatible.css" type="text/css"?>
-<?xml-stylesheet href="chrome://nightly/skin/extensions/incompatible.css" type="text/css"?>
-
-<dialog title="&window.title;" onload="Startup()" style="&window.style;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        buttonlabelcancel="&window.cancel;" buttonlabelaccept="&window.accept;"
-        ondialogaccept="Accept()">
-
-  <script src="incompatible.js" type="application/x-javascript"/>
-
-  <hbox align="center">
-    <image class="alert-icon"/>
-    <description flex="1" id="warning">&warning.label;</description>
-  </hbox>
-
-  <richlistbox id="addonlist" flex="1">
-  </richlistbox>
-
-</dialog>
diff --git a/chrome/locale/en-US/configwarning.dtd b/chrome/locale/en-US/configwarning.dtd
deleted file mode 100644
index 21016e7..0000000
--- a/chrome/locale/en-US/configwarning.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ENTITY dialog.title  "Nightly Tester Tools">
-<!ENTITY dialog.style  "width: 45em">
-
-<!ENTITY title         "Nightly Tester Tools is ignoring add-on compatibility">
-<!ENTITY subtitle      "Nightly Tester Tools can manage add-on compatibility
-                        using a safer method that works on an individual basis.">
-<!ENTITY question      "Do you want to switch to use Nightly Tester Tools to
-                        control compatibility?">
diff --git a/chrome/locale/en-US/incompatible.dtd b/chrome/locale/en-US/incompatible.dtd
deleted file mode 100644
index 45f5c86..0000000
--- a/chrome/locale/en-US/incompatible.dtd
+++ /dev/null
@@ -1,11 +0,0 @@
-<!ENTITY window.title        "Make Compatible">
-<!ENTITY window.style        "width: 40em; height: 25em">
-<!ENTITY window.accept       "Force Install">
-<!ENTITY window.cancel       "Skip">
-
-<!ENTITY warning.label       "Forcing incompatible add-ons to run could cause
-                              hangs, crashes, memory leaks, data corruption or
-                              other problems.">
-
-<!ENTITY incompatible.label  "This add-on is incompatible with this version of &brandShortName;.">
-<!ENTITY insecure.label      "This add-on cannot update securely. Updates must be disabled.">
diff --git a/chrome/skin/configwarning.css b/chrome/skin/configwarning.css
deleted file mode 100644
index 1d96748..0000000
--- a/chrome/skin/configwarning.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Nightly Tester Tools.
- *
- * The Initial Developer of the Original Code is
- *     Dave Townsend <dtownsend@oxymoronical.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-dialog {
-  padding: 1em;
-}
-
-#title {
-  font-weight: bold;
-  font-size: 110%;
-  margin-bottom: 1em;
-}
diff --git a/chrome/skin/extensions/extensions.css b/chrome/skin/extensions/extensions.css
deleted file mode 100644
index e1b7c7c..0000000
--- a/chrome/skin/extensions/extensions.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Nightly Tester Tools.
- *
- * The Initial Developer of the Original Code is
- *     Dave Townsend <dtownsend@oxymoronical.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#enableallButton {
-  list-style-image: none !important;
-}
diff --git a/chrome/skin/extensions/incompatible.css b/chrome/skin/extensions/incompatible.css
deleted file mode 100644
index ef35728..0000000
--- a/chrome/skin/extensions/incompatible.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Nightly Tester Tools.
- *
- * The Initial Developer of the Original Code is
- *     Dave Townsend <dtownsend@oxymoronical.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#warning {
-  font-weight: bold;
-}
-
-richlistitem {
-  padding: 2px;
-  border-bottom: 1px dotted;
-}
-
-.name-version label {
-  font-weight: bold;
-}
-
-[secure="true"] .insecure {
-  display: none;
-}
-
-[compatible="true"] .incompatible {
-  display: none;
-}
diff --git a/components/nttAddonCompatibilityService.js b/components/nttAddonCompatibilityService.js
deleted file mode 100644
index 2ebdcfa..0000000
--- a/components/nttAddonCompatibilityService.js
+++ /dev/null
@@ -1,545 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Nightly Tester Tools.
- *
- * The Initial Developer of the Original Code is
- *     Dave Townsend <dtownsend@oxymoronical.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-const PREFIX_NS_EM                    = "http://www.mozilla.org/2004/em-rdf#";
-const PREFIX_ITEM_URI                 = "urn:mozilla:item:";
-const RDFURI_INSTALL_MANIFEST_ROOT    = "urn:mozilla:install-manifest";
-const FILE_INSTALL_MANIFEST           = "install.rdf";
-const TOOLKIT_ID                      = "toolkit@mozilla.org"
-
-var gEM = null;
-var gRDF = null;
-var gApp = null;
-var gVC = null;
-var gCheckCompatibility = true;
-var gCheckUpdateSecurity = true;
-var gPrefs = null;
-
-function EM_NS(property) {
-  return PREFIX_NS_EM + property;
-}
-
-function EM_R(property) {
-  return gRDF.GetResource(EM_NS(property));
-}
-
-function getRDFProperty(ds, source, property) {
-  var value = ds.GetTarget(source, EM_R(property), true);
-  if (value && value instanceof Ci.nsIRDFLiteral)
-    return value.Value;
-  return null;
-}
-
-function removeRDFProperty(ds, source, property) {
-  var arc = EM_R(property);
-  var targets = ds.GetTargets(source, arc, true);
-  while (targets.hasMoreElements())
-    ds.Unassert(source, arc, targets.getNext());
-}
-
-function extractXPI(xpi) {
-  // XXX For 1.9 final we can switch to just extracting/compressing install.rdf
-  var zipReader = Cc["@mozilla.org/libjar/zip-reader;1"].
-                  createInstance(Ci.nsIZipReader);
-  zipReader.open(xpi);
-  if (!zipReader.hasEntry(FILE_INSTALL_MANIFEST)) {
-    zipReader.close();
-    return null;
-  }
-  var dirs = Cc["@mozilla.org/file/directory_service;1"].
-             getService(Ci.nsIProperties);
-  var file = dirs.get("TmpD", Ci.nsILocalFile);
-  file.append("tmpxpi");
-  file.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0755);
-  var entries = zipReader.findEntries("*");
-  while (entries.hasMore()) {
-    var path = entries.getNext();
-    var entry = zipReader.getEntry(path);
-    if (path.substring(path.length - 1) == "/")
-      path = path.substring(0, entry.length - 1);
-    var parts = path.split("/");
-    var target = file.clone();
-    for (var i = 0; i < parts.length; i++)
-      target.append(parts[i]);
-    if (entry.isDirectory) {
-      if (!target.exists())
-        target.create(Ci.nsIFile.DIRECTORY_TYPE, 0755);
-    }
-    else {
-      var parent = target.parent;
-      if (!parent.exists())
-        parent.create(Ci.nsIFile.DIRECTORY_TYPE, 0755);
-      zipReader.extract(path, target);
-    }
-  }
-  zipReader.close();
-  return file;
-}
-
-function loadManifest(file) {
-  var ioServ = Cc["@mozilla.org/network/io-service;1"].
-               getService(Ci.nsIIOService);
-  var fph = ioServ.getProtocolHandler("file")
-                  .QueryInterface(Ci.nsIFileProtocolHandler);
-  return gRDF.GetDataSourceBlocking(fph.getURLSpecFromFile(file));
-}
-
-function recursiveUpdate(zipWriter, path, dir) {
-  var entries = dir.directoryEntries;
-  while (entries.hasMoreElements()) {
-    var entry = entries.getNext().QueryInterface(Ci.nsIFile);
-    if (entry.isDirectory()) {
-      var newPath = path + entry.leafName + "/";
-      zipWriter.addEntryDirectory(newPath, entry.lastModifiedTime, false);
-      recursiveUpdate(zipWriter, newPath, entry);
-    }
-    else {
-      zipWriter.addEntryFile(path + entry.leafName, Ci.nsIZipWriter.COMPRESSION_NONE,
-                             entry, false);
-    }
-  }
-}
-
-function updateXPI(xpi, file) {
-  // XXX For 1.9 final we can switch to just extracting/compressing install.rdf
-  var zipWriter = Cc["@mozilla.org/zipwriter;1"].
-                  createInstance(Ci.nsIZipWriter);
-  zipWriter.open(xpi, 0x04 | 0x08 | 0x20);
-  recursiveUpdate(zipWriter, "", file);
-  zipWriter.close();
-}
-
-function nttAddonUpdateChecker(addon) {
-  this.addon = addon;
-}
-
-nttAddonUpdateChecker.prototype = {
-  addon: null,
-  busy: null,
-
-  checkForUpdates: function() {
-    this.busy = true;
-    LOG("Searching for compatibility information for " + this.addon.id);
-    gEM.update([this.addon], 1,
-               Ci.nsIExtensionManager.UPDATE_SYNC_COMPATIBILITY, this);
-
-    // Spin an event loop to wait for the update check to complete.
-    var tm = Cc["@mozilla.org/thread-manager;1"].
-             getService(Ci.nsIThreadManager);
-    var thread = tm.currentThread;
-    while (this.busy)
-      thread.processNextEvent(true);
-  },
-
-  // nsIAddonUpdateCheckListener implementation
-  onUpdateStarted: function() {
-  },
-
-  onUpdateEnded: function() {
-    this.busy = false;
-  },
-
-  onAddonUpdateStarted: function(addon) {
-  },
-
-  onAddonUpdateEnded: function(addon, status) {
-    if (status & Ci.nsIAddonUpdateCheckListener.STATUS_DATA_FOUND) {
-      LOG("Found new compatibility information for " + addon.id + ": " + addon.minAppVersion + " " + addon.maxAppVersion);
-      this.addon.minAppVersion = addon.minAppVersion;
-      this.addon.maxAppVersion = addon.maxAppVersion;
-      this.addon.targetAppID = addon.targetAppID;
-      this.addon.overrideVersions();
-    }
-  }
-};
-
-function nttAddonDetail() {
-  this.wrappedJSObject = this;
-}
-
-nttAddonDetail.prototype = {
-  datasource: null,
-  root: null,
-
-  xpi: null,
-  file: null,
-
-  id: null,
-  name: null,
-  version: null,
-  type: Ci.nsIUpdateItem.TYPE_EXTENSION,
-  updateRDF: null,
-  updateKey: null,
-  iconURL: "chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png",
-
-  installLocationKey: null,
-  xpiURL: null,
-  xpiHash: null,
-
-  appResource: null,
-  targetAppID: null,
-  minAppVersion: null,
-  maxAppVersion: null,
-
-  init: function() {
-    if (!this.id)
-      this.id = getRDFProperty(this.datasource, this.root, "id");
-    this.name = getRDFProperty(this.datasource, this.root, "name");
-    this.version = getRDFProperty(this.datasource, this.root, "version");
-    this.updateRDF = getRDFProperty(this.datasource, this.root, "updateURL");
-    this.updateKey = getRDFProperty(this.datasource, this.root, "updateKey");
-
-    var apps = this.datasource.GetTargets(this.root, EM_R("targetApplication"), true);
-    while (apps.hasMoreElements()) {
-      var app = apps.getNext().QueryInterface(Ci.nsIRDFResource);
-      var id = getRDFProperty(this.datasource, app, "id");
-      if (id == gApp.ID || id == TOOLKIT_ID) {
-        this.minAppVersion = getRDFProperty(this.datasource, app, "minVersion");
-        this.maxAppVersion = getRDFProperty(this.datasource, app, "maxVersion");
-        if (this.minAppVersion && this.maxAppVersion) {
-          this.appResource = app;
-          this.targetAppID = id;
-          if (id == gApp.ID)
-            break;
-        }
-      }
-    }
-  },
-
-  initWithXPI: function(xpi) {
-    this.xpi = xpi;
-    this.file = extractXPI(xpi);
-    var rdf = this.file.clone();
-    rdf.append(FILE_INSTALL_MANIFEST);
-    this.datasource = loadManifest(rdf);
-    this.root = gRDF.GetResource(RDFURI_INSTALL_MANIFEST_ROOT);
-    this.init();
-  },
-
-  initWithDataSource: function(ds, root, id) {
-    this.datasource = ds;
-    this.root = root;
-    this.id = id;
-    this.init();
-  },
-
-  cleanup: function() {
-    if (this.file && this.file.exists)
-      this.file.remove(true);
-  },
-
-  overrideVersions: function() {
-    removeRDFProperty(this.datasource, this.appResource, "minVersion");
-    this.datasource.Assert(this.appResource, EM_R("minVersion"), gRDF.GetLiteral(this.minAppVersion), true);
-    removeRDFProperty(this.datasource, this.appResource, "maxVersion");
-    this.datasource.Assert(this.appResource, EM_R("maxVersion"), gRDF.GetLiteral(this.maxAppVersion), true);
-    this.datasource.QueryInterface(Ci.nsIRDFRemoteDataSource).Flush();
-    if (this.xpi && this.file)
-      updateXPI(this.xpi, this.file);
-  },
-
-  overrideCompatibility: function(ignorePrefs) {
-    if (!this.isValid())
-      return;
-
-    var changed = false;
-
-    if (gCheckCompatibility || ignorePrefs) {
-      var version = (gApp.ID == this.targetAppID) ? gApp.version : gApp.platformVersion;
-      if (gVC.compare(version, this.minAppVersion) < 0) {
-        LOG("minVersion " + this.minAppVersion + " is too high, reducing to " + version);
-        if (!this.datasource.GetTarget(this.appResource, EM_R("oldMinVersion"), true))
-          this.datasource.Assert(this.appResource, EM_R("oldMinVersion"), gRDF.GetLiteral(this.minAppVersion), true);
-        removeRDFProperty(this.datasource, this.appResource, "minVersion");
-        this.datasource.Assert(this.appResource, EM_R("minVersion"), gRDF.GetLiteral(version), true);
-        this.minAppVersion = version;
-        changed = true;
-      }
-      else if (gVC.compare(version, this.maxAppVersion) > 0) {
-        LOG("maxVersion " + this.maxAppVersion + " is too low, increasing to " + version);
-        if (!this.datasource.GetTarget(this.appResource, EM_R("oldMaxVersion"), true))
-          this.datasource.Assert(this.appResource, EM_R("oldMaxVersion"), gRDF.GetLiteral(this.maxAppVersion), true);
-        removeRDFProperty(this.datasource, this.appResource, "maxVersion");
-        this.datasource.Assert(this.appResource, EM_R("maxVersion"), gRDF.GetLiteral(version), true);
-        this.maxAppVersion = version;
-        changed = true;
-      }
-
-      if (changed && !this.xpi) {
-        // This updates any UI bound to the datasource
-        var compatprop = EM_R("compatible");
-        var truth = gRDF.GetLiteral("true");
-        this.datasource.Assert(this.root, compatprop, truth, true);
-        this.datasource.Unassert(this.root, compatprop, truth);
-      }
-    }
-
-    if (!this.isUpdateSecure(ignorePrefs)) {
-      LOG("Addon is insecure, removing update URL");
-      removeRDFProperty(this.datasource, this.root, "updateURL");
-      this.updateRDF = null;
-      changed = true;
-
-      // This updates any UI bound to the datasource
-      compatprop = EM_R("providesUpdatesSecurely");
-      truth = gRDF.GetLiteral("true");
-      this.datasource.Assert(this.root, compatprop, truth, true);
-      this.datasource.Unassert(this.root, compatprop, truth);
-    }
-
-    if (changed) {
-      this.datasource.QueryInterface(Ci.nsIRDFRemoteDataSource).Flush();
-      if (this.xpi && this.file)
-        updateXPI(this.xpi, this.file);
-    }
-  },
-
-  isValid: function() {
-    return !!this.appResource;
-  },
-
-  isCompatible: function(ignorePrefs) {
-    if (!gCheckCompatibility && !ignorePrefs)
-      return true;
-
-    var version = (gApp.ID == this.targetAppID) ? gApp.version : gApp.platformVersion;
-    if (gVC.compare(version, this.minAppVersion) < 0)
-      return false;
-    if (gVC.compare(version, this.maxAppVersion) > 0)
-      return false;
-    return true;
-  },
-
-  isUpdateSecure: function(ignorePrefs) {
-    if (!gCheckUpdateSecurity && !ignorePrefs)
-      return true;
-
-    if (!this.updateRDF)
-      return true;
-    if (this.updateKey)
-      return true;
-    return (this.updateRDF.substring(0, 6) == "https:");
-  },
-
-  needsOverride: function(ignorePrefs) {
-    return (!this.isCompatible(ignorePrefs) || !this.isUpdateSecure(ignorePrefs));
-  },
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nttIAddon, Ci.nsIUpdateItem]),
-};
-
-function nttAddonCompatibilityService() {
-  this.wrappedJSObject = this;
-}
-
-nttAddonCompatibilityService.prototype = {
-  id: null,
-
-  init: function() {
-    Components.utils.import("resource://nightly/Logging.jsm");
-
-    gEM = Cc["@mozilla.org/extensions/manager;1"].
-          getService(Ci.nsIExtensionManager);
-    gRDF = Cc["@mozilla.org/rdf/rdf-service;1"].
-           getService(Ci.nsIRDFService);
-    gApp = Cc["@mozilla.org/xre/app-info;1"].
-           getService(Ci.nsIXULAppInfo).QueryInterface(Ci.nsIXULRuntime);
-    gVC = Cc["@mozilla.org/xpcom/version-comparator;1"].
-          getService(Ci.nsIVersionComparator);
-    if (gVC.compare(gApp.platformVersion, "1.9b5") >= 0)
-      this.id = gEM.addInstallListener(this);
-    gPrefs = Components.classes["@mozilla.org/preferences-service;1"]
-                       .getService(Components.interfaces.nsIPrefService)
-                       .getBranch("extensions.")
-                       .QueryInterface(Components.interfaces.nsIPrefBranch2);
-    try {
-      gCheckCompatibility = gPrefs.getBoolPref("checkCompatibility");
-    }
-    catch (e) { }
-    try {
-      gCheckUpdateSecurity = gPrefs.getBoolPref("checkUpdateSecurity");
-    }
-    catch (e) { }
-    gPrefs.addObserver("", this, false);
-  },
-
-  // nsIAddonCompatibilityService implementation
-  getAddonForID: function(id) {
-    var addon = new nttAddonDetail();
-    addon.initWithDataSource(gEM.datasource, gRDF.GetResource(PREFIX_ITEM_URI + id), id);
-    return addon;
-  },
-
-  confirmOverride: function(addons, count) {
-    var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
-             getService(Ci.nsIWindowMediator);
-    win = wm.getMostRecentWindow("Extension:Manager");
-    if (win && win.top)
-      win = win.top;
-
-    var params = Cc["@mozilla.org/array;1"].
-                 createInstance(Ci.nsIMutableArray);
-    for (var i = 0; i < addons.length; i++)
-      params.appendElement(addons[i], false);
-    var ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
-             getService(Ci.nsIWindowWatcher);
-    ww.openWindow(win, "chrome://nightly/content/extensions/incompatible.xul", "",
-                  "chrome,centerscreen,modal,dialog,titlebar", params);
-    return true;
-  },
-
-  // nsIAddonInstallListener implementation
-  onDownloadStarted: function(addon) {
-  },
-
-  onDownloadProgress: function(addon, value, maxValue) {
-  },
-
-  onDownloadEnded: function(addon) {
-  },
-
-  onInstallStarted: function(addon) {
-    LOG("Install Started for " + addon.xpiURL);
-    var ioServ = Cc["@mozilla.org/network/io-service;1"].
-                 getService(Ci.nsIIOService);
-    var fph = ioServ.getProtocolHandler("file")
-                    .QueryInterface(Ci.nsIFileProtocolHandler);
-    var file = fph.getFileFromURLSpec(addon.xpiURL);
-    if (file.exists()) {
-      try {
-        var addon = new nttAddonDetail();
-        addon.initWithXPI(file);
-        if (addon.isValid()) {
-          if (!addon.isCompatible(false)) {
-            // Check if there are remote updates available
-            var checker = new nttAddonUpdateChecker(addon);
-            checker.checkForUpdates();
-          }
-
-          if (addon.needsOverride(false))
-            this.confirmOverride([addon], 1);
-          else
-            LOG("Add-on is already compatible: '" + addon.updateRDF + "' " + addon.minAppVersion + "-" + addon.maxAppVersion);
-        }
-        else {
-          WARN("Add-on seems to be invalid");
-        }
-        addon.cleanup();
-      }
-      catch (e) {
-        ERROR("Exception during compatibility check " + e);
-      }
-    }
-  },
-
-  onCompatibilityCheckStarted: function(addon) {
-  },
-
-  onCompatibilityCheckEnded: function(addon, status) {
-  },
-
-  onInstallEnded: function(addon, status) {
-  },
-
-  onInstallsCompleted: function() {
-  },
-
-  // nsIObserver implementation
-  observe: function(subject, topic, data) {
-    switch (topic) {
-      case "app-startup":
-        var os = Cc["@mozilla.org/observer-service;1"].
-                 getService(Ci.nsIObserverService);
-        os.addObserver(this, "profile-after-change", false);
-        os.addObserver(this, "quit-application", false);
-        break;
-      case "profile-after-change":
-        this.init();
-        break;
-      case "quit-application":
-        if (this.id)
-          gEM.removeInstallListenerAt(this.id);
-        gEM = null;
-        gRDF = null;
-        gApp = null;
-        gVC = null;
-        gPrefs.removeObserver("", this);
-        gPrefs = null;
-        break;
-      case "nsPref:changed":
-        switch (data) {
-          case "checkCompatibility":
-            try {
-              gCheckCompatibility = gPrefs.getBoolPref(data);
-            }
-            catch (e) {
-              gCheckCompatibility = true;
-            }
-            break;
-          case "checkUpdateSecurity":
-            try {
-              gCheckUpdateSecurity = gPrefs.getBoolPref(data);
-            }
-            catch (e) {
-              gCheckUpdateSecurity = true;
-            }
-            break;
-        }
-        break;
-      default:
-        WARN("Unknown event " + topic);
-    }
-  },
-
-  classDescription: "Nightly Tester Install Monitor",
-  contractID: "@oxymoronical.com/nightly/addoncompatibility;1",
-  classID: Components.ID("{801207d5-037c-4565-80ed-ede8f7a7c100}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIAddonInstallListener, Ci.nsIObserver]),
-  _xpcom_categories: [{
-    category: "app-startup",
-    service: true
-  }]
-}
-
-function NSGetModule(compMgr, fileSpec)
-  XPCOMUtils.generateModule([nttAddonCompatibilityService]);
diff --git a/components/nttIAddonCompatibilityService.idl b/components/nttIAddonCompatibilityService.idl
deleted file mode 100644
index 422482e..0000000
--- a/components/nttIAddonCompatibilityService.idl
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Nightly Tester Tools.
- *
- * The Initial Developer of the Original Code is
- *      Dave Townsend <dtownsend@oxymoronical.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK *****
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(8d634ad7-7126-49e4-8853-5ad93356b985)]
-interface nttIAddon : nsISupports
-{
-  boolean isValid();
-
-  boolean overrideCompatibility(in boolean ignorePrefs);
-
-  boolean isCompatible(in boolean ignorePrefs);
-
-  boolean isUpdateSecure(in boolean ignorePrefs);
-
-  boolean needsOverride(in boolean ignorePrefs);
-};
-
-[scriptable, uuid(ba015a71-b148-4391-aa81-1a2f0c727db3)]
-interface nttIAddonCompatibilityService : nsISupports
-{
-  nttIAddon getAddonForID(in wstring id);
-
-  boolean confirmOverride([array, size_is(count)] in nttIAddon addons,
-                        in unsigned long count);
-};