Issue 2232 - Got rid of non-standard conditional catch clauses

lib/contentPolicy.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 326 matching lines @@
   /**
    * Registers the content policy on startup.
    */
   init: function()
   {
     let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
     try
     {
       registrar.registerFactory(this.classID, this.classDescription, this.contractID, this);
     }
-    catch (e if e.result == Cr.NS_ERROR_FACTORY_EXISTS)
+    catch (e)
     {
       // See bug 924340 - it might be too early to init now, the old version
       // we are replacing didn't finish removing itself yet.
-      Utils.runAsync(this.init.bind(this));
-      return;
+      if (e.result == Cr.NS_ERROR_FACTORY_EXISTS)
+      {
+        Utils.runAsync(this.init.bind(this));
+        return;
+      }
+
+      Cu.reportError(e);
     }
 
     let catMan = Utils.categoryManager;
     for (let category of this.xpcom_categories)
       catMan.addCategoryEntry(category, this.contractID, this.contractID, false, true);
 
     // http-on-opening-request is new in Gecko 18, http-on-modify-request can
     // be used in earlier releases.
     let httpTopic = "http-on-opening-request";
     if (Services.vc.compare(Utils.platformVersion, "18.0") < 0)
@@ skipping 418 matching lines @@
   if (!wnd || wnd.closed)
     return;
 
   if (entry.type == Policy.type.OBJECT)
   {
     node.removeEventListener("mouseover", objectMouseEventHander, true);
     node.removeEventListener("mouseout", objectMouseEventHander, true);
   }
   Policy.processNode(wnd, node, entry.type, Utils.makeURI(entry.location), true);
 }