Bug 593378. browser_bug559991.js needs to restore original functions before closing tab, and browser_autofocus_background.js shouldn't close all tabs which would close the test window. r=mounir rs=gavin a=blocking-beta6

browser/base/content/test/browser_bug559991.js

@@ -43,9 +43,9 @@ function test() {
   // -------------
   // Test clean-up
   function endTest() {
-    gBrowser.removeTab(tab);
     FullZoom._applyPrefToSetting = oldAPTS;
     FullZoom.onLocationChange = oldOLC;
+    gBrowser.removeTab(tab);
 
     oldAPTS = null;
     oldOLC = null;

dom/tests/browser/Makefile.in

@@ -46,7 +46,7 @@ include $(topsrcdir)/config/rules.mk
 
 _BROWSER_FILES = \
 		browser_focus_steal_from_chrome.js \
-		$(warning browser_autofocus_background.js temporarily disabled, see bug 593378) \
+		browser_autofocus_background.js \
 		$(NULL)
 
 libs::	$(_BROWSER_FILES)

dom/tests/browser/browser_autofocus_background.js

@@ -45,7 +45,7 @@ function test() {
     }
 
     // Cleaning up.
-    for (let i = 0; i < tabs.length; i++) {
+    for (let i = 1; i < tabs.length; i++) {
       gBrowser.removeTab(tabs[i]);
     }
     finish();