Removed backwards compatibility code

chrome/content/watcher.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 function abprequire(module)
 {
   let result = {};
   result.wrappedJSObject = result;
   Services.obs.notifyObservers(result, "adblockplus-require", module);
-  if ("exports" in result)
-    return result.exports;
-  else
-    return Cu.import("chrome://adblockplus-modules/content/" + module[0].toUpperCase() + module.substr(1) + ".jsm", null);
+  return result.exports;
 }
 
 let {Policy} = abprequire("contentPolicy");
 let {RequestNotifier} = abprequire("requestNotifier");
 let {Filter} = abprequire("filterClasses");
 
 let policyGlobal = Cu.getGlobalForObject(Policy);
 let PolicyPrivate = null;
-if (policyGlobal == window)
-{
-  // Work-around for bug 736316 - getGlobalForObject gave us our own window
-  let {XPIProvider} = Cu.import("resource://gre/modules/XPIProvider.jsm", null);
-  let addonID = "{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}"
-  if (addonID in XPIProvider.bootstrapScopes)
-    policyGlobal = XPIProvider.bootstrapScopes[addonID];
-}
 
-if ("PolicyPrivate" in policyGlobal)              // ABP 2.0.x
-  PolicyPrivate = policyGlobal.PolicyPrivate;
-else if ("PolicyImplementation" in policyGlobal)  // ABP 2.1+ with scope separation
+if ("PolicyImplementation" in policyGlobal)  // ABP 2.1+ with scope separation
   PolicyPrivate = policyGlobal.PolicyImplementation;
 else if ("require" in policyGlobal)               // ABP 2.1+ without scope separation
   PolicyPrivate = policyGlobal.require.scopes.contentPolicy.PolicyImplementation;
 else
   window.close();

[Thomas Greiner, 2012/09/26 13:55:04]

Could also be written as:

let PolicyPrivate = policyGlobal.PolicyImplementation || policyGlobal.require &&
policyGlobal.require.scopes.contentPolicy.PolicyImplementation ||
window.close();

Maybe just a personal preference. :)

[Wladimir Palant, 2012/09/27 14:39:29]

But the way it is understanding the code is much easier IMHO ;)
Plus - the comments are essential, nobody will understand why we need to test
two locations otherwise. Oh, and I still don't like working with undefined
values that trigger a warning.

 
 let origShouldLoad = PolicyPrivate.shouldLoad;
 let origProcessNode = Policy.processNode;
 
 let currentData = null;
 let processingQueue = [];
 let notifier = null;
 
 // Randomize URI to work around bug 719376
 let stringBundle = Services.strings.createBundle("chrome://abpwatcher/locale/global.properties?" + Math.random());
@@ skipping 608 matching lines @@
     for (let i = 0; i < this.observers.length; i++)
       if (this.observers[i] == observer)
         this.observers.splice(i--, 1);
   },
   notifyObservers: function(operation, entry)
   {
     for each (let observer in this.observers)
       observer(this, operation, entry);
   }
 };