Backed out changesets 312c68b16549,3ffdf460b44a (bug 1174977) to get us back to a less permafailing state a=testonly

--HG--
extra : histedit_source : d9b9b169b43cf9c74719418ee05f576c3382ef84%2C4cfbb23495a5e0419b60bc36fa914097ef960569

browser/components/privatebrowsing/test/browser/browser.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == "mulet" || (os == "win" && os_version == "6.2") # Win: bug 1173801, bug 1174977
+skip-if = buildapp == "mulet"
 support-files =
   browser_privatebrowsing_concurrent_page.html
   browser_privatebrowsing_cookieacceptdialog.html
@@ -16,6 +16,7 @@ support-files =
   title.sjs
 
 [browser_privatebrowsing_DownloadLastDirWithCPS.js]
+skip-if = (os == "win" && os_version == "6.2") # bug 1173801
 [browser_privatebrowsing_aboutHomeButtonAfterWindowClose.js]
 [browser_privatebrowsing_aboutSessionRestore.js]
 [browser_privatebrowsing_cache.js]

browser/components/search/test/browser.ini

@@ -39,7 +39,7 @@ skip-if = e10s # Bug ?????? - some issue with progress listeners [JavaScript Err
 [browser_oneOffHeader.js]
 skip-if = e10s # bug ?????? - Test alters the searchbar textbox value which causes issues with other tests in e10s.
 [browser_private_search_perwindowpb.js]
-skip-if = e10s || (os == "win" && os_version == "6.2") # Bug ?????? - Test uses load event and checks event.target. Win: bug 1173801, bug 1174977
+skip-if = e10s # Bug ?????? - Test uses load event and checks event.target.
 [browser_yahoo.js]
 [browser_yahoo_behavior.js]
 skip-if = e10s # Bug ?????? - some issue with progress listeners [JavaScript Error: "req.originalURI is null" {file: "chrome://mochitests/content/browser/browser/components/search/test/browser_bing_behavior.js" line: 127}]