1 files changed, 7 insertions, 6 deletions
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug299716.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug299716.js
index 66656abe6..5de941f32 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug299716.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug299716.js
@@ -105,8 +105,9 @@ function do_check_item(aItem, aVersion, aAddonsEntry) {
       do_throw("Addon " + aAddonsEntry.id + " wasn't detected");
     if (aItem.version != aVersion)
       do_throw("Addon " + aAddonsEntry.id + " was version " + aItem.version + " instead of " + aVersion);
-  } else if (aItem != null) {
-    do_throw("Addon " + aAddonsEntry.id + " was detected");
+  } else {
+    if (aItem != null)
+      do_throw("Addon " + aAddonsEntry.id + " was detected");
   }
 }
 
@@ -148,7 +149,7 @@ function run_test() {
   startupManager();
   dump("\n\n*** INSTALLING NEW ITEMS\n\n");
 
-  installAllFiles(ADDONS.map(a => do_get_addon(a.addon)), run_test_pt2,
+  installAllFiles([do_get_addon(a.addon) for each (a in ADDONS)], run_test_pt2,
                   true);
 }
 
@@ -160,7 +161,7 @@ function run_test_pt2() {
   dump("\n\n*** RESTARTING EXTENSION MANAGER\n\n");
   restartManager();
 
-  AddonManager.getAddonsByIDs(ADDONS.map(a => a.id), function(items) {
+  AddonManager.getAddonsByIDs([a.id for each (a in ADDONS)], function(items) {
     dump("\n\n*** REQUESTING UPDATE\n\n");
     // checkListener will call run_test_pt3().
     next_test = run_test_pt3;
@@ -185,7 +186,7 @@ function run_test_pt2() {
 function run_test_pt3() {
   // Install the new items.
   dump("\n\n*** UPDATING ITEMS\n\n");
-  completeAllInstalls(ADDONS.filter(a => a.newInstall).map(a => a.newInstall),
+  completeAllInstalls([a.newInstall for each(a in ADDONS) if (a.newInstall)],
                       run_test_pt4);
 }
 
@@ -197,7 +198,7 @@ function run_test_pt4() {
   restartManager();
 
   dump("\n\n*** FINAL CHECKS\n\n");
-  AddonManager.getAddonsByIDs(ADDONS.map(a => a.id), function(items) {
+  AddonManager.getAddonsByIDs([a.id for each (a in ADDONS)], function(items) {
     for (var i = 0; i < ADDONS.length; i++) {
       var item = items[i];
       do_check_item(item, "0.2", ADDONS[i]);