Bug 1416252 - Remove conditional catch consumers in modules/libjar/. r=mossop

modules/libjar/test/unit/test_bug453254.js

@@ -5,8 +5,11 @@ function run_test() {
   try {
     zipCache.getZip(null);
     do_throw("Shouldn't get here!");
-  } catch (e if ((e instanceof Components.interfaces.nsIException) &&
-                 (e.result == Components.results.NS_ERROR_INVALID_POINTER))) {
+  } catch (e) {
+    if (!(e instanceof Components.interfaces.nsIException &&
+          e.result == Components.results.NS_ERROR_INVALID_POINTER)) {
+      throw e;
+    }
     // do nothing, this test passes
   }
 }

modules/libjar/test/unit/test_bug458158.js

@@ -4,8 +4,11 @@ function run_test() {
   try {
     zReader.open(null);
     do_throw("Shouldn't get here!");
-  } catch (e if (e instanceof Components.interfaces.nsIException &&
-                 e.result == Components.results.NS_ERROR_NULL_POINTER)) {
+  } catch (e) {
+    if (!(e instanceof Components.interfaces.nsIException &&
+          e.result == Components.results.NS_ERROR_NULL_POINTER)) {
+      throw e;
+    }
     // do nothing, this test passes
   }
 }

modules/libjar/zipwriter/test/unit/test_bug467740.js

@@ -21,8 +21,11 @@ function run_test()
       zipW.open(invalidFile, PR_RDWR);
       do_throw("Should have thrown NS_ERROR_FILE_CORRUPTED on " +
                invalidArchive + " !");
-    } catch (e if (e instanceof Ci.nsIException &&
-                   e.result == Components.results.NS_ERROR_FILE_CORRUPTED)) {
+    } catch (e) {
+      if (!(e instanceof Ci.nsIException &&
+            e.result == Components.results.NS_ERROR_FILE_CORRUPTED)) {
+        throw e;
+      }
       // do nothing
     }
   });