Bug 385028: Remove nsIExtensionManager_MOZILLA_1_8_BRANCH from trunk.

r=robstrong

toolkit/mozapps/extensions/content/extensions.js

@@ -544,8 +544,7 @@ function Startup()
   
   gExtensionsView = document.getElementById("extensionsView");
   gExtensionManager = Components.classes["@mozilla.org/extensions/manager;1"]
-                                .getService(Components.interfaces.nsIExtensionManager)
-                                .QueryInterface(Components.interfaces.nsIExtensionManager_MOZILLA_1_8_BRANCH);
+                                .getService(Components.interfaces.nsIExtensionManager);
   var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
                           .getService(Components.interfaces.nsIXULAppInfo)
                           .QueryInterface(Components.interfaces.nsIXULRuntime);

toolkit/mozapps/extensions/public/nsIExtensionManager.idl

@@ -166,7 +166,7 @@ interface nsIInstallLocation : nsISupports
  * XXXben - Some of this stuff should go into a management-ey interface, 
  *          some into an app-startup-ey interface.
  */
-[scriptable, uuid(a3f5396c-a6e8-414a-8fbc-c8d831746328)]
+[scriptable, uuid(585a8d98-ed73-41d3-a540-061b148f1683)]
 interface nsIExtensionManager : nsISupports
 {
   /**
@@ -365,16 +365,7 @@ interface nsIExtensionManager : nsISupports
    *          The ID of an item to move an item to.
    */
   void moveToIndexOf(in AString movingID, in AString destinationID);
-};
 
-/**
- * A temporary interface to allow adding new methods without changing existing
- * interfaces for Gecko 1.8.1. After the 1.8.1 release this interface should
- * not be used.
- */
-[scriptable, uuid(0fd5caa9-1ffc-42b1-aea1-3fbe73116070)]
-interface nsIExtensionManager_MOZILLA_1_8_BRANCH : nsIExtensionManager
-{
   /**
    * Cancels a pending uninstall of an item
    * @param   id

toolkit/mozapps/extensions/src/nsExtensionManager.js.in

@@ -2384,8 +2384,7 @@ var Blocklist = {
     this.entries = this._loadBlocklistFromFile(getFile(KEY_PROFILEDIR,
                                                        [FILE_BLOCKLIST]));
     var em = Components.classes["@mozilla.org/extensions/manager;1"]
-                       .getService(Components.interfaces.nsIExtensionManager)
-                       .QueryInterface(Components.interfaces.nsIExtensionManager_MOZILLA_1_8_BRANCH);
+                       .getService(Components.interfaces.nsIExtensionManager);
     em.checkForBlocklistChanges();
   },
 
@@ -5749,7 +5748,6 @@ ExtensionManager.prototype = {
    */
   QueryInterface: function(iid) {
     if (!iid.equals(Components.interfaces.nsIExtensionManager) &&
-        !iid.equals(Components.interfaces.nsIExtensionManager_MOZILLA_1_8_BRANCH) &&
         !iid.equals(Components.interfaces.nsITimerCallback) &&
         !iid.equals(Components.interfaces.nsIObserver) &&
         !iid.equals(Components.interfaces.nsISupports))