Another attempt at fixing bug 822284; r=ehsan

browser/components/privatebrowsing/test/browser/perwindow/Makefile.in

@@ -15,6 +15,9 @@ MOCHITEST_BROWSER_FILES =  \
 		browser_privatebrowsing_certexceptionsui.js \
 		browser_privatebrowsing_concurrent.js \
 		browser_privatebrowsing_concurrent_page.html \
+		browser_privatebrowsing_cookieacceptdialog.js \
+		browser_privatebrowsing_cookieacceptdialog.html \
+		browser_privatebrowsing_crh.js \
 		browser_privatebrowsing_downloadLastDir.js \
 		browser_privatebrowsing_downloadLastDir_c.js \
 		browser_privatebrowsing_downloadLastDir_toggle.js \
@@ -49,13 +52,4 @@ MOCHITEST_BROWSER_FILES =  \
 		title.sjs \
 		$(NULL)
 
-# Temporarily disabled on OS X for bug 822284
-ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-MOCHITEST_BROWSER_FILES += \
-		browser_privatebrowsing_cookieacceptdialog.js \
-		browser_privatebrowsing_cookieacceptdialog.html \
-		browser_privatebrowsing_crh.js \
-		$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk

browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_cookieacceptdialog.js

@@ -117,7 +117,7 @@ function test() {
           return;
         }
         selectedBrowser.removeEventListener("load", onLoad, true);
-        aCallback(aWin);
+        executeSoon(function() aCallback(aWin));
       }, true);
       selectedBrowser.loadURI(BLANK_URL);
     });
@@ -125,22 +125,22 @@ function test() {
 
   registerCleanupFunction(function() {
     Services.prefs.clearUserPref("network.cookie.lifetimePolicy");
-    windowsToClose.forEach(function(win) {
-      win.close();
+    windowsToClose.forEach(function(aWin) {
+      aWin.close();
     });
   });
 
   // Ask all cookies
   Services.prefs.setIntPref("network.cookie.lifetimePolicy", 1);
 
-  testOnWindow(true, function(aPrivWin) {
-    info("Test on private window");
-    checkRememberOption(true, aPrivWin, function() {
-      checkSettingDialog(true, aPrivWin, function() {
-        testOnWindow(false, function(aWin) {
-          info("Test on public window");
-          checkRememberOption(false, aWin, function() {
-            checkSettingDialog(false, aWin, finish);
+  testOnWindow(false, function(aWin) {
+    info("Test on public window");
+    checkRememberOption(false, aWin, function() {
+      checkSettingDialog(false, aWin, function() {
+        testOnWindow(true, function(aPrivWin) {
+          info("Test on private window");
+          checkRememberOption(true, aPrivWin, function() {
+            checkSettingDialog(true, aPrivWin, finish);
           });
         });
       });

browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_crh.js

@@ -42,17 +42,17 @@ function test() {
   };
 
   registerCleanupFunction(function() {
-    windowsToClose.forEach(function(win) {
-      win.close();
+    windowsToClose.forEach(function(aWin) {
+      aWin.close();
     });
   });
 
-  testOnWindow(true, function(win) {
+  testOnWindow(true, function(aWin) {
     info("Test on private window");
-    checkDisableOption(true, win, function() {
-      testOnWindow(false, function(win) {
+    checkDisableOption(true, aWin, function() {
+      testOnWindow(false, function(aPrivWin) {
         info("Test on public window");
-        checkDisableOption(false, win, finish);
+        checkDisableOption(false, aPrivWin, finish);
       });
     });
   });