1 files changed, 19 insertions, 22 deletions

diff --git a/toolkit/mozapps/extensions/test/browser/browser_searching.js b/toolkit/mozapps/extensions/test/browser/browser_searching.js
index 907d9b105..9e03e8297 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_searching.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_searching.js
@@ -175,7 +175,7 @@ function get_actual_results() {
         continue;
       }
 
-      let result = sourceURI.match(/^http:\/\/example\.com\/(.+)\.xpi$/);
+      var result = sourceURI.match(/^http:\/\/example\.com\/(.+)\.xpi$/);
       if (result != null) {
         is(item.mInstall.name.indexOf("PASS"), 0, "Install name should start with PASS");
         results.push({name: result[1], item: item});
@@ -183,7 +183,7 @@ function get_actual_results() {
       }
     }
     else if (item.mAddon) {
-      let result = item.mAddon.id.match(/^(.+)@tests\.mozilla\.org$/);
+      var result = item.mAddon.id.match(/^(.+)@tests\.mozilla\.org$/);
       if (result != null) {
         is(item.mAddon.name.indexOf("PASS"), 0, "Addon name should start with PASS");
         results.push({name: result[1], item: item});
@@ -212,21 +212,21 @@ function get_expected_results(aSortBy, aLocalExpected) {
   var expectedOrder = null, unknownOrder = null;
   switch (aSortBy) {
     case "relevancescore":
-      expectedOrder = [ "addon2", "remote1", "install2", "addon1",
-                        "install1", "remote2", "remote3", "remote4" ];
+      expectedOrder = [ "addon2"  , "remote1", "install2", "addon1",
+                        "install1", "remote2", "remote3" , "remote4" ];
       unknownOrder = [];
       break;
     case "name":
       // Defaults to ascending order
-      expectedOrder = [ "install1", "remote1",  "addon2", "remote2",
-                        "remote3", "addon1", "install2", "remote4" ];
+      expectedOrder = [ "install1", "remote1",  "addon2" , "remote2",
+                        "remote3" , "addon1" , "install2", "remote4" ];
       unknownOrder = [];
       break;
     case "dateUpdated":
       expectedOrder = [ "addon1", "addon2" ];
       // Updated date not available for installs and remote add-ons
       unknownOrder = [ "install1", "install2", "remote1",
-                       "remote2", "remote3", "remote4" ];
+                       "remote2" , "remote3" , "remote4" ];
       break;
     default:
       ok(false, "Should recognize sortBy when checking the order of items");
@@ -269,9 +269,9 @@ function check_results(aQuery, aSortBy, aReverseOrder, aShowLocal) {
   try {
     xpinstall_enabled = Services.prefs.getBoolPref(PREF_XPI_ENABLED);
   }
-  catch (e) {}
+  catch (e) {};
 
-  // When XPI Instalation is disabled, those buttons are hidden and unused
+  // When XPI Instalation is disabled, those buttons are hidden and unused  
   if (xpinstall_enabled) {
     var localFilterSelected = gManagerWindow.document.getElementById("search-filter-local").selected;
     var remoteFilterSelected = gManagerWindow.document.getElementById("search-filter-remote").selected;
@@ -286,7 +286,7 @@ function check_results(aQuery, aSortBy, aReverseOrder, aShowLocal) {
 
   // Get actual order of results
   var actualResults = get_actual_results();
-  var actualOrder = actualResults.map(result => result.name);
+  var actualOrder = [result.name for each(result in actualResults)];
 
   // Reverse array of actual results if supposed to be in reverse order.
   // Reverse actualOrder instead of expectedOrder so can always check
@@ -617,7 +617,7 @@ add_test(function() {
 
 // Tests that compatible-by-default addons are shown if strict compatibility checking is disabled
 add_test(function() {
-  restart_manager(gManagerWindow, "addons://list/extension", function(aWindow) {
+  restart_manager(gManagerWindow, null, function(aWindow) {
     gManagerWindow = aWindow;
     gCategoryUtilities = new CategoryUtilities(gManagerWindow);
 
@@ -626,10 +626,10 @@ add_test(function() {
       var item = get_addon_item("remote5");
       is_element_visible(item, "Incompatible addon should be visible");
       isnot(item.getAttribute("notification"), "warning", "Compatibility warning should not be shown");
-
-      item = get_addon_item("remote6");
+  
+      var item = get_addon_item("remote6");
       is(item, null, "Addon incompatible with the product should not be visible");
-
+  
       Services.prefs.setBoolPref(PREF_STRICT_COMPAT, true);
       run_next_test();
     });
@@ -649,16 +649,13 @@ add_test(function() {
     // Installed add-on is considered local on new search
     gAddonInstalled = true;
 
-    // Switch over to extensions list so we can do a new search
-    gCategoryUtilities.openType("extension", function() {
-      search(QUERY, false, function() {
-        check_filtered_results(QUERY, "relevancescore", false);
+    search(QUERY, false, function() {
+      check_filtered_results(QUERY, "relevancescore", false);
 
-        var installBtn = get_install_button(get_addon_item(REMOTE_TO_INSTALL));
-        is(installBtn.hidden, true, "Install button should be hidden for installed item");
+      var installBtn = get_install_button(get_addon_item(REMOTE_TO_INSTALL));
+      is(installBtn.hidden, true, "Install button should be hidden for installed item");
 
-        run_next_test();
-      });
+      run_next_test();
     });
   });
 });