Back out 43663582cfdb (bug 987404) because it looks like it disabled things even without e10s being defined
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 30 Mar 2014 23:18:57 -0700
changeset 194667 9be5c94051be3f218a2f28ada12af658f216a396
parent 194666 0eb6ed1dc691db9949955f00197224d6ab1c3ef9
child 194668 9cb3d128459d11deb022a50d955a8f9213b320b1
child 194780 2f1a2afdd23c9ba0f973f1e1b8b6d8cfb34f4f29
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs987404
milestone31.0a1
backs out43663582cfdb29e408adf621a52661d55d5fe9fb
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out 43663582cfdb (bug 987404) because it looks like it disabled things even without e10s being defined
addon-sdk/test/browser.ini
browser/base/content/test/general/browser.ini
browser/base/content/test/newtab/browser.ini
browser/base/content/test/plugins/browser.ini
browser/base/content/test/social/browser.ini
browser/components/certerror/test/browser.ini
browser/components/customizableui/test/browser.ini
browser/components/places/tests/browser/browser.ini
browser/components/preferences/in-content/sync.js
browser/components/preferences/in-content/sync.xul
browser/components/preferences/in-content/tests/browser.ini
browser/components/preferences/tests/browser.ini
browser/components/privatebrowsing/test/browser/browser.ini
browser/components/search/test/browser.ini
browser/components/sessionstore/test/browser.ini
browser/components/tabview/test/browser.ini
browser/components/test/browser.ini
browser/devtools/app-manager/test/browser.ini
browser/devtools/commandline/test/browser.ini
browser/devtools/debugger/test/browser.ini
browser/devtools/fontinspector/test/browser.ini
browser/devtools/framework/test/browser.ini
browser/devtools/inspector/test/browser.ini
browser/devtools/markupview/test/browser.ini
browser/devtools/netmonitor/test/browser.ini
browser/devtools/responsivedesign/test/browser.ini
browser/devtools/scratchpad/test/browser.ini
browser/devtools/shadereditor/test/browser.ini
browser/devtools/shared/test/browser.ini
browser/devtools/sourceeditor/test/browser.ini
browser/devtools/styleeditor/test/browser.ini
browser/devtools/styleinspector/test/browser.ini
browser/devtools/tilt/test/browser.ini
browser/devtools/webconsole/test/browser.ini
browser/extensions/pdfjs/test/browser.ini
browser/fuel/test/browser.ini
browser/modules/test/browser.ini
content/base/test/browser.ini
content/html/content/test/browser.ini
docshell/test/browser/browser.ini
docshell/test/navigation/browser.ini
dom/indexedDB/test/browser.ini
dom/power/test/browser.ini
dom/tests/browser/browser.ini
image/test/browser/browser.ini
js/xpconnect/tests/browser/browser.ini
layout/base/tests/browser.ini
layout/style/test/browser.ini
layout/xul/test/browser.ini
toolkit/components/places/tests/browser/browser.ini
toolkit/components/startup/tests/browser/browser.ini
toolkit/components/thumbnails/test/browser.ini
toolkit/components/viewsource/test/browser/browser.ini
toolkit/content/tests/browser/browser.ini
toolkit/crashreporter/test/browser/browser.ini
toolkit/devtools/server/tests/browser/browser.ini
toolkit/forgetaboutsite/test/browser/browser.ini
toolkit/modules/tests/browser/browser.ini
toolkit/mozapps/extensions/test/browser/browser-common.ini
toolkit/mozapps/extensions/test/xpinstall/browser.ini
--- a/addon-sdk/test/browser.ini
+++ b/addon-sdk/test/browser.ini
@@ -2,14 +2,13 @@
 support-files =
   head.js
   Math.jsm
   math.js
   data.json
   invalid.json
 [browser_sdk_loader_sdk_modules.js]
 [browser_sdk_loader_sdk_gui_modules.js]
-skip-if = e10s # Bug ?????? - test times out.
 [browser_sdk_loader_jsm_modules.js]
 [browser_sdk_loader_js_modules.js]
 [browser_sdk_loader_json.js]
 [browser_sdk_loader_chrome.js]
 [browser_sdk_loader_chrome_in_sdk.js]
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -84,336 +84,223 @@ support-files =
 skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
 [browser_aboutAccounts.js]
 skip-if = os == "linux" # Bug 958026
 support-files =
   content_aboutAccounts.js
 [browser_aboutHealthReport.js]
 skip-if = os == "linux" # Bug 924307
 [browser_aboutHome.js]
-skip-if = e10s # Bug ?????? - no about:home support yet
 [browser_aboutSyncProgress.js]
 [browser_addKeywordSearch.js]
 [browser_alltabslistener.js]
-skip-if = os == "linux" || e10s # Linux: Intermittent failures, bug 951680; e10s: Bug ?????? - notifications don't work correctly.
+skip-if = os == "linux" # Intermittent failures, bug 951680
 [browser_backButtonFitts.js]
-skip-if = os != "win" || e10s # The Fitts Law back button is only supported on Windows (bug 571454) / e10s - Bug ?????? test touches content (attempts to add an event listener directly to the contentWindow)
+skip-if = os != "win" # The Fitts Law back button is only supported on Windows (bug 571454)
 [browser_blob-channelname.js]
 [browser_bookmark_titles.js]
-skip-if = toolkit == "windows" || e10s # Disabled on Windows due to frequent failures (bugs 825739, 841341) / e10s - Bug ?????? test checks event.target on load event, which our e10s utils don't support
+skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (bugs 825739, 841341)
 [browser_bug304198.js]
 [browser_bug321000.js]
 skip-if = true # browser_bug321000.js is disabled because newline handling is shaky (bug 592528)
 [browser_bug329212.js]
 [browser_bug331772_xul_tooltiptext_in_html.js]
 [browser_bug356571.js]
 [browser_bug380960.js]
 [browser_bug386835.js]
-skip-if = e10s # Bug 691614 - no e10s zoom support yet
 [browser_bug405137.js]
 [browser_bug406216.js]
 [browser_bug409481.js]
-skip-if = e10s # Bug 921952 - Content:Click event issues (test simulated middle-click on a link and checks the value pastes - it doesn't)
 [browser_bug409624.js]
 [browser_bug413915.js]
 [browser_bug416661.js]
-skip-if = e10s # Bug 691614 - no e10s zoom support yet
 [browser_bug417483.js]
-skip-if = e10s # Bug ?????? - no about:home support yet
 [browser_bug419612.js]
-skip-if = e10s # Bug 691614 - no e10s zoom support yet
 [browser_bug422590.js]
 [browser_bug423833.js]
 skip-if = true # bug 428712
 [browser_bug424101.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content
 [browser_bug427559.js]
-skip-if = e10s # Bug ?????? - "content window is focused - Got [object ChromeWindow], expected [object XrayWrapper [object Window]]"
 [browser_bug432599.js]
 [browser_bug435035.js]
 [browser_bug435325.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content
 [browser_bug441778.js]
-skip-if = e10s # Bug 691614 - no e10s zoom support yet
 [browser_bug455852.js]
 [browser_bug460146.js]
-skip-if = e10s # Bug 866413 - PageInfo doesn't work in e10s
 [browser_bug462289.js]
-skip-if = toolkit == "cocoa" || e10s # Bug ?????? - not sure why this is timing out and crashing!!
+skip-if = toolkit == "cocoa"
 [browser_bug462673.js]
-skip-if = e10s # Bug 924260 - "Window is closed"
 [browser_bug477014.js]
-skip-if = e10s # Bug 918634 - swapFrameLoaders not implemented for e10s
 [browser_bug479408.js]
-skip-if = e10s # Bug 918663 - DOMLinkAdded events don't make their way to chrome
 [browser_bug481560.js]
-skip-if = e10s # Bug ????? - This bug attached an event listener directly to the content
 [browser_bug484315.js]
 [browser_bug491431.js]
-skip-if = e10s # Bug 918634 - swapFrameLoaders (and thus replaceTabWithWindow) not implemented for e10s
 [browser_bug495058.js]
-skip-if = e10s # Bug 918634 - swapFrameLoaders (and thus replaceTabWithWindow) not implemented for e10s
 [browser_bug517902.js]
-skip-if = e10s # Bug 866413 - PageInfo doesn't work in e10s
 [browser_bug519216.js]
-skip-if = e10s # Bug ?????? - some weird timing issue with progress listeners that fails intermittently
 [browser_bug520538.js]
 [browser_bug521216.js]
-skip-if = e10s # Bug 918663 - DOMLinkAdded events don't make their way to chrome
 [browser_bug533232.js]
 [browser_bug537013.js]
-skip-if = e10s # Bug 918634 - swapFrameLoaders not implemented for e10s (test calls replaceTabWithWindow)
 [browser_bug537474.js]
-skip-if = e10s # Bug ?????? - test doesn't wait for document to be created before it checks it
 [browser_bug550565.js]
-skip-if = e10s # Bug 918663 - DOMLinkAdded events don't make their way to chrome (which is how gBrowser.getIcon works)
 [browser_bug553455.js]
-skip-if = e10s # Bug ????? - I don't think either popup notifications nor addon install stuff works?
 [browser_bug555224.js]
-skip-if = e10s # Bug 691614 - no e10s zoom support yet
 [browser_bug555767.js]
-skip-if = e10s # Bug 916974 - Session history doesn't work in e10s
 [browser_bug556061.js]
-skip-if = e10s # Bug 932651 - getClipboardData in specialpowersAPI.js not e10s friendly
 [browser_bug559991.js]
-skip-if = e10s # Bug 691614 - no e10s zoom support yet
 [browser_bug561623.js]
 [browser_bug561636.js]
-skip-if = e10s # Bug 691601 - no form submit observers
 [browser_bug562649.js]
-skip-if = e10s # Bug 940195 - XULBrowserWindow.isBusy is false as a remote tab starts loading
 [browser_bug563588.js]
 [browser_bug565575.js]
 [browser_bug565667.js]
 run-if = toolkit == "cocoa"
 [browser_bug567306.js]
 [browser_bug575561.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_bug575830.js]
-skip-if = e10s # Bug 691614 - no e10s zoom support yet
 [browser_bug577121.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_bug578534.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content
 [browser_bug579872.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_bug580638.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_bug580956.js]
-skip-if = e10s # Bug 516755 - SessionStore disabled for e10s
 [browser_bug581242.js]
-skip-if = e10s # Bug 930863 - pageshow issues ("TypeError: charset is undefined" in pageshow listener, as document is null)
 [browser_bug581253.js]
-skip-if = e10s # Bug 930863 - pageshow issues ("TypeError: charset is undefined" in pageshow listener, as document is null)
 [browser_bug581947.js]
 [browser_bug585558.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_bug585785.js]
 [browser_bug585830.js]
 [browser_bug590206.js]
 [browser_bug592338.js]
-skip-if = e10s # Bug 653065 - Make the lightweight theme web installer ready for e10s
 [browser_bug594131.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_bug595507.js]
-skip-if = e10s # Bug 691601 - no form submit observers
 [browser_bug596687.js]
 [browser_bug597218.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_bug609700.js]
-skip-if = e10s # Bug 516755 - SessionStore disabled for e10s (calls duplicateTabIn, which uses SessionStore)
 [browser_bug623155.js]
-skip-if = e10s # Bug ?????? - URLBar issues (apparently issues with redirection)
 [browser_bug623893.js]
-skip-if = e10s # Bug 916974 - Session history doesn't work in e10s
 [browser_bug624734.js]
 [browser_bug647886.js]
-skip-if = e10s # Bug 916974 - Session history doesn't work in e10s
 [browser_bug655584.js]
 [browser_bug664672.js]
 [browser_bug676619.js]
-skip-if = os == "mac" || e10s # mac: Intermittent failures, bug 925225; e10s: Bug ?????? - test directly manipulates content (event.target.location)
+skip-if = os == "mac" # Intermittent failures, bug 925225
 [browser_bug678392.js]
-skip-if = e10s # Bug ?????? - Obscure non-windows failures ("Snapshot array has correct length of 1 after loading one page. - Got 0, expected 1" and more)
 [browser_bug710878.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (doc.querySelector)
 [browser_bug719271.js]
-skip-if = e10s # Bug 691614 - no e10s zoom support yet
 [browser_bug724239.js]
 [browser_bug734076.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content
 [browser_bug735471.js]
 [browser_bug749738.js]
-skip-if = e10s # Bug 921935 - focusmanager issues with e10s
 [browser_bug763468_perwindowpb.js]
 [browser_bug767836_perwindowpb.js]
-skip-if = e10s # Bug ?????? - test reports a leaked nsGlobalWindow with e10s enabled.
 [browser_bug771331.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content
 [browser_bug783614.js]
 [browser_bug816527.js]
-skip-if = e10s # Bug 916974 - Session history doesn't work in e10s
 [browser_bug817947.js]
-skip-if = e10s # Bug 916974 - Session history doesn't work in e10s
 [browser_bug822367.js]
-skip-if = e10s # Bug 921959 - reload with LOAD_FLAGS_ALLOW_MIXED_CONTENT fails in e10s
 [browser_bug832435.js]
 [browser_bug839103.js]
 [browser_bug880101.js]
 [browser_bug882977.js]
 [browser_bug902156.js]
-skip-if = e10s # Bug 921959 - reload with LOAD_FLAGS_ALLOW_MIXED_CONTENT fails in e10s
 [browser_bug906190.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (strange - gets an element from a child which it tries to treat as a string, but that fails)
 [browser_bug970746.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (directly gets elements from the content)
 [browser_canonizeURL.js]
-skip-if = e10s # Bug ?????? - [JavaScript Error: "Error in AboutHome.sendAboutHomeData TypeError: target.messageManager is undefined" {file: "resource:///modules/AboutHome.jsm" line: 208}]
 [browser_contentAreaClick.js]
 [browser_contextSearchTabPosition.js]
 skip-if = os == "mac" # bug 967013, bug 926729
 [browser_ctrlTab.js]
-skip-if = e10s # Bug ????? - thumbnail captures need e10s love (tabPreviews_capture fails with Argument 1 of CanvasRenderingContext2D.drawWindow does not implement interface Window.)
 [browser_customize_popupNotification.js]
 [browser_datareporting_notification.js]
 run-if = datareporting
 [browser_devices_get_user_media.js]
-skip-if = (os == "linux" && debug) || e10s # linux: bug 976544; e10s: Bug ?????? - appears user media notifications only happen in the child and don't make their way to the parent?
+skip-if = os == "linux" && debug # bug 976544
 [browser_discovery.js]
-skip-if = e10s # Bug 918663 - DOMLinkAdded events don't make their way to chrome
 [browser_duplicateIDs.js]
 [browser_drag.js]
 skip-if = true # browser_drag.js is disabled, as it needs to be updated for the new behavior from bug 320638.
 [browser_findbarClose.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (tries to grab an iframe directly from content)
 [browser_fullscreen-window-open.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_gestureSupport.js]
-skip-if = e10s # Bug 863514 - no gesture support.
 [browser_getshortcutoruri.js]
 [browser_hide_removing.js]
 [browser_homeDrop.js]
 [browser_identity_UI.js]
-skip-if = e10s # Bug ?????? - this test fails for obscure reasons on non-windows builds only.
 [browser_keywordBookmarklets.js]
-skip-if = e10s # Bug ?????? - this test fails for obscure reasons on non-windows builds only.
 [browser_keywordSearch.js]
-skip-if = e10s # Bug 921957 - remote webprogress doesn't supply originalURI attribute on the request object
 [browser_keywordSearch_postData.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (gBrowser.contentDocument.body.textContent)
 [browser_lastAccessedTab.js]
 [browser_locationBarCommand.js]
-skip-if = os == "linux" || e10s # Linux: Intermittent failures, bug 917535; e10s: Bug ?????? - Focus issues (There should be no focused element - Got [object XULElement], expected null)
+skip-if = os == "linux" # Intermittent failures, bug 917535
 [browser_locationBarExternalLoad.js]
-skip-if = e10s # Bug ?????? - URL bar issues ("There should be no focused element - Got [object XULElement], expected null")
 [browser_menuButtonFitts.js]
-skip-if = os != "win" || e10s # The Fitts Law menu button is only supported on Windows (bug 969376); # Bug ?????? - URL bar issues ("There should be no focused element - Got [object XULElement], expected null")
+skip-if = os != "win" # The Fitts Law menu button is only supported on Windows (bug 969376)
 [browser_middleMouse_inherit.js]
-skip-if = e10s # Bug 921952 - Content:Click event issues
 [browser_minimize.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (TypeError: gBrowser.docShell is null)
 [browser_mixedcontent_securityflags.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content ("cannot ipc non-cpow object")
 [browser_notification_tab_switching.js]
-skip-if = e10s # Bug ?????? - uncaught exception - Error: cannot ipc non-cpow object at chrome://mochitests/content/browser/browser/base/content/test/general/browser_notification_tab_switching.js:32
 [browser_offlineQuotaNotification.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (gBrowser.selectedBrowser.contentWindow.applicationCache.oncached = function() {...})
 [browser_overflowScroll.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_pageInfo.js]
-skip-if = e10s # Bug 866413 - PageInfo doesn't work in e10s
 [browser_page_style_menu.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content
 [browser_pinnedTabs.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_plainTextLinks.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (creates and fetches elements directly from content document)
 [browser_popupNotification.js]
-skip-if = toolkit == "windows" || e10s # Disabled on Windows due to frequent failures (bugs 825739, 841341) / e10s - Bug ?????? - popup notification test probably confused re content process notifications etc
+skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (bugs 825739, 841341)
 [browser_popupUI.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (tries to get a popup element directly from content)
 [browser_printpreview.js]
-skip-if = e10s # Bug ?????? - timeout after logging "Error: Channel closing: too late to send/recv, messages will be lost"
 [browser_private_browsing_window.js]
 [browser_private_no_prompt.js]
 [browser_relatedTabs.js]
 [browser_removeTabsToTheEnd.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_sanitize-download-history.js]
 skip-if = true # bug 432425
 [browser_sanitize-passwordDisabledHosts.js]
 [browser_sanitize-sitepermissions.js]
 [browser_sanitize-timespans.js]
 [browser_sanitizeDialog.js]
 [browser_sanitizeDialog_treeView.js]
 skip-if = true  # disabled until the tree view is added
                 # back to the clear recent history dialog (sanitize.xul), if
                 # it ever is (bug 480169)
 [browser_save_link-perwindowpb.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (event.target)
 [browser_save_private_link_perwindowpb.js]
-skip-if = os == "linux" || e10s # Linux: bug 857427; e10s: Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_save_video.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (event.target)
 [browser_scope.js]
 [browser_selectTabAtIndex.js]
-skip-if = e10s # Bug ?????? - no idea! "Accel+9 selects expected tab - Got 0, expected 9"
 [browser_star_hsts.js]
-skip-if = e10s # Bug ?????? - timeout after logging "Error: Channel closing: too late to send/recv, messages will be lost"
 [browser_subframe_favicons_not_used.js]
 [browser_tabDrop.js]
 [browser_tabMatchesInAwesomebar_perwindowpb.js]
-skip-if = e10s # Bug 918634 - swapFrameLoaders not implemented for e10s (test uses gBrowser.swapBrowsersAndCloseOther)
 [browser_tab_drag_drop_perwindow.js]
 [browser_tab_dragdrop.js]
-skip-if = e10s # Bug 918634 - swapFrameLoaders not implemented for e10s (test uses gBrowser.swapBrowsersAndCloseOther)
 [browser_tab_dragdrop2.js]
 [browser_tabbar_big_widgets.js]
 skip-if = os == "linux" || os == "mac" # No tabs in titlebar on linux
                                        # Disabled on OS X because of bug 967917
 [browser_tabfocus.js]
-skip-if = e10s # Bug 921935 - focusmanager issues with e10s (test calls getFocusedElementForWindow with a content window)
 [browser_tabopen_reflows.js]
-skip-if = e10s # Bug ?????? - test needs to be updated for e10s (captures a stack that isn't correct in e10s)
 [browser_tabs_isActive.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (tries to get/set attributes directly on content docshell)
 [browser_tabs_owner.js]
 [browser_typeAheadFind.js]
-skip-if = e10s # Bug 921935 - focusmanager issues with e10s (test calls waitForFocus)
 [browser_unloaddialogs.js]
-skip-if = e10s # Bug ?????? - test uses chrome windowMediator to try and see alert() from content
 [browser_urlHighlight.js]
 [browser_urlbarAutoFillTrimURLs.js]
 [browser_urlbarCopying.js]
-skip-if = e10s # Bug 932651 - getClipboardData in specialpowersAPI.js not e10s friendly
 [browser_urlbarEnter.js]
-skip-if = e10s # Bug ?????? - obscure non-windows child process crashes on try
 [browser_urlbarRevert.js]
-skip-if = e10s # Bug ?????? - ESC reverted the location bar value - Got foobar, expected example.com
 [browser_urlbarStop.js]
-skip-if = e10s # Bug ????? - test calls gBrowser.contentWindow.stop
 [browser_urlbarTrimURLs.js]
 [browser_urlbar_search_healthreport.js]
-skip-if = e10s # Bug ?????? - FHR tests failing (either with "no data for today" or "2 records for today")
 [browser_utilityOverlay.js]
-skip-if = e10s # Bug 921947 - openNewTabWith failed with window.content.document being null
 [browser_visibleFindSelection.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content
 [browser_visibleLabel.js]
 [browser_visibleTabs.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_visibleTabs_bookmarkAllPages.js]
-skip-if = e10s # Bug ?????? - bizarre problem with hidden tab having _mouseenter called, via _setPositionalAttributes, and tab not being found resulting in 'candidate is undefined'
 [browser_visibleTabs_bookmarkAllTabs.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_visibleTabs_contextMenu.js]
-skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s
 [browser_visibleTabs_tabPreview.js]
-skip-if = e10s # Bug ????? - thumbnail captures need e10s love (tabPreviews_capture fails with Argument 1 of CanvasRenderingContext2D.drawWindow does not implement interface Window.)
 [browser_windowopen_reflows.js]
 [browser_wyciwyg_urlbarCopying.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (content.document.getElementById)
 [browser_zbug569342.js]
-skip-if = e10s # Bug 516755 - SessionStore disabled for e10s
 [browser_registerProtocolHandler_notification.js]
-skip-if = e10s # Bug 940206 - nsIWebContentHandlerRegistrar::registerProtocolHandler doesn't work in e10s
 [browser_no_mcb_on_http_site.js]
-skip-if = e10s # Bug 516755 - SessionStore disabled for e10s
--- a/browser/base/content/test/newtab/browser.ini
+++ b/browser/base/content/test/newtab/browser.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 support-files = head.js
-skip-if = e10s # Bug ?????? - about:newtab tests don't work in e10s
 
 [browser_newtab_background_captures.js]
 [browser_newtab_block.js]
 [browser_newtab_bug721442.js]
 [browser_newtab_bug722273.js]
 [browser_newtab_bug723102.js]
 [browser_newtab_bug723121.js]
 [browser_newtab_bug725996.js]
--- a/browser/base/content/test/plugins/browser.ini
+++ b/browser/base/content/test/plugins/browser.ini
@@ -1,16 +1,9 @@
 [DEFAULT]
-# These tests all fail with e10s enabled.
-# * Bug 899347 - no e10s click-to-play support
-# * Bug 921916 - no plugin events
-# * Bug XXXXX - no plugins in content processes ("Error: You cannot use the AddonManager in child processes!")
-# * Bug 866413 - PageInfo doesn't work in e10s [browser_pageInfo_plugins.js]
-# * Bug 921957 - remote webprogress doesn't supply originalURI attribute on the request object [browser_clearplugindata.js]
-skip-if = e10s
 support-files =
   blockNoPlugins.xml
   blockPluginHard.xml
   blockPluginVulnerableNoUpdate.xml
   blockPluginVulnerableUpdatable.xml
   browser_clearplugindata.html
   browser_clearplugindata_noage.html
   head.js
--- a/browser/base/content/test/social/browser.ini
+++ b/browser/base/content/test/social/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug 915547 (social providers don't install)
 support-files =
   blocklist.xml
   checked.jpg
   head.js
   opengraph/og_invalid_url.html
   opengraph/opengraph.html
   opengraph/shortlink_linkrel.html
   opengraph/shorturl_link.html
--- a/browser/components/certerror/test/browser.ini
+++ b/browser/components/certerror/test/browser.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - tests directly manipulate content (eg, var expertDiv = gBrowser.contentDocument.getElementById("expertContent");)
 
 [browser_bug431826.js]
 [browser_bug633691.js]
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -48,17 +48,16 @@ skip-if = os == "linux"
 [browser_934113_menubar_removable.js]
 # Because this test is about the menubar, it can't be run on mac
 skip-if = os == "mac"
 
 [browser_946320_tabs_from_other_computers.js]
 skip-if = os == "linux"
 
 [browser_934951_zoom_in_toolbar.js]
-skip-if = e10s # Bug ?????? - test uses promiseTabLoadEvent() which isn't e10s friendly.
 [browser_938980_navbar_collapsed.js]
 [browser_938995_indefaultstate_nonremovable.js]
 [browser_940013_registerToolbarNode_calls_registerArea.js]
 [browser_940107_home_button_in_bookmarks_toolbar.js]
 [browser_940307_panel_click_closure_handling.js]
 [browser_940946_removable_from_navbar_customizemode.js]
 [browser_941083_invalidate_wrapper_cache_createWidget.js]
 [browser_942581_unregisterArea_keeps_placements.js]
@@ -67,21 +66,18 @@ skip-if = e10s # Bug ?????? - test uses 
 [browser_945739_showInPrivateBrowsing_customize_mode.js]
 [browser_947987_removable_default.js]
 [browser_948985_non_removable_defaultArea.js]
 [browser_952963_areaType_getter_no_area.js]
 [browser_956602_remove_special_widget.js]
 [browser_962884_opt_in_disable_hyphens.js]
 [browser_963639_customizing_attribute_non_customizable_toolbar.js]
 [browser_967000_button_charEncoding.js]
-skip-if = e10s # Bug ?????? - test uses promiseTabLoadEvent() which isn't e10s friendly.
 [browser_967000_button_feeds.js]
-skip-if = e10s # Bug ?????? - test uses promiseTabLoadEvent() which isn't e10s friendly.
 [browser_967000_button_sync.js]
-skip-if = e10s # Bug ?????? - test uses promiseTabLoadEvent() which isn't e10s friendly.
 [browser_967000_button_tabView.js]
 [browser_968447_bookmarks_toolbar_items_in_panel.js]
 [browser_968565_insert_before_hidden_items.js]
 [browser_969427_recreate_destroyed_widget_after_reset.js]
 [browser_969661_character_encoding_navbar_disabled.js]
 [browser_970511_undo_restore_default.js]
 [browser_972267_customizationchange_events.js]
 [browser_973932_addonbar_currentset.js]
--- a/browser/components/places/tests/browser/browser.ini
+++ b/browser/components/places/tests/browser/browser.ini
@@ -11,44 +11,40 @@ support-files =
   sidebarpanels_click_test_page.html
 
 [browser_0_library_left_pane_migration.js]
 [browser_library_left_pane_fixnames.js]
 [browser_425884.js]
 [browser_475045.js]
 [browser_423515.js]
 [browser_410196_paste_into_tags.js]
-skip-if = e10s # Bug ?????? - clipboard operations don't seem to work in this test?
 [browser_sort_in_library.js]
 [browser_library_open_leak.js]
 [browser_library_panel_leak.js]
 [browser_library_search.js]
 [browser_history_sidebar_search.js]
 [browser_bookmarksProperties.js]
 
 [browser_forgetthissite_single.js]
 # disabled for very frequent oranges - bug 551540
 skip-if = true
 
 [browser_library_left_pane_commands.js]
 [browser_drag_bookmarks_on_toolbar.js]
-skip-if = e10s # Bug ?????? - test fails - "Number of dragged items should be the same. - Got 0, expected 1"
 [browser_library_middleclick.js]
 [browser_library_views_liveupdate.js]
 [browser_views_liveupdate.js]
 
 [browser_sidebarpanels_click.js]
 # temporarily disabled for breaking the treeview - bug 658744
 skip-if = true
 
 [browser_library_infoBox.js]
 [browser_markPageAsFollowedLink.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly (test does EventUtils.sendMouseEvent...)
 [browser_toolbar_migration.js]
 [browser_library_batch_delete.js]
 [browser_555547.js]
 [browser_416459_cut.js]
-skip-if = e10s # Bug ?????? - clipboard operations don't seem to work in this test?
 [browser_library_downloads.js]
 [browser_library_left_pane_select_hierarchy.js]
 [browser_435851_copy_query.js]
 [browser_toolbarbutton_menu_context.js]
 [browser_library_openFlatContainer.js]
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@@ -1,33 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://services-sync/main.js");
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function () {
-  return Components.utils.import("resource://gre/modules/FxAccountsCommon.js", {});
-});
 
 const PAGE_NO_ACCOUNT = 0;
 const PAGE_HAS_ACCOUNT = 1;
 const PAGE_NEEDS_UPDATE = 2;
-const PAGE_PLEASE_WAIT = 3;
-const FXA_PAGE_LOGGED_OUT = 4;
-const FXA_PAGE_LOGGED_IN = 5;
-
-// Indexes into the "login status" deck.
-// We are in a successful verified state - everything should work!
-const FXA_LOGIN_VERIFIED = 0;
-// We have logged in to an unverified account.
-const FXA_LOGIN_UNVERIFIED = 1;
-// We are logged in locally, but the server rejected our credentials.
-const FXA_LOGIN_FAILED = 2;
 
 let gSyncPane = {
   _stringBundle: null,
   prefArray: ["engine.bookmarks", "engine.passwords", "engine.prefs",
               "engine.tabs", "engine.history"],
 
   get page() {
     return document.getElementById("weavePrefsDeck").selectedIndex;
@@ -54,46 +38,42 @@ let gSyncPane = {
                                 .getService(Components.interfaces.nsISupports)
                                 .wrappedJSObject;
 
     if (xps.ready) {
       this._init();
       return;
     }
 
-    // it may take some time before we can determine what provider to use
-    // and the state of that provider, so show the "please wait" page.
-    this.page = PAGE_PLEASE_WAIT;
-
     let onUnload = function () {
       window.removeEventListener("unload", onUnload, false);
       try {
         Services.obs.removeObserver(onReady, "weave:service:ready");
       } catch (e) {}
     };
 
     let onReady = function () {
       Services.obs.removeObserver(onReady, "weave:service:ready");
       window.removeEventListener("unload", onUnload, false);
       this._init();
     }.bind(this);
 
+
     Services.obs.addObserver(onReady, "weave:service:ready", false);
     window.addEventListener("unload", onUnload, false);
 
     xps.ensureLoaded();
   },
 
   _init: function () {
     let topics = ["weave:service:login:error",
                   "weave:service:login:finish",
-                  "weave:service:start-over:finish",
+                  "weave:service:start-over",
                   "weave:service:setup-complete",
-                  "weave:service:logout:finish",
-                  FxAccountsCommon.ONVERIFIED_NOTIFICATION];
+                  "weave:service:logout:finish"];
 
     // Add the observers now and remove them on unload
     //XXXzpao This should use Services.obs.* but Weave's Obs does nice handling
     //        of `this`. Fix in a followup. (bug 583347)
     topics.forEach(function (topic) {
       Weave.Svc.Obs.add(topic, this.updateWeavePrefs, this);
     }, this);
     window.addEventListener("unload", function() {
@@ -103,83 +83,26 @@ let gSyncPane = {
     }, false);
 
     this._stringBundle =
       Services.strings.createBundle("chrome://browser/locale/preferences/preferences.properties");
     this.updateWeavePrefs();
   },
 
   updateWeavePrefs: function () {
-    let service = Components.classes["@mozilla.org/weave/service;1"]
-                  .getService(Components.interfaces.nsISupports)
-                  .wrappedJSObject;
-    // service.fxAccountsEnabled is false iff sync is already configured for
-    // the legacy provider.
-    if (service.fxAccountsEnabled) {
-      // determine the fxa status...
-      this.page = PAGE_PLEASE_WAIT;
-      Components.utils.import("resource://gre/modules/FxAccounts.jsm");
-      fxAccounts.getSignedInUser().then(data => {
-        if (!data) {
-          this.page = FXA_PAGE_LOGGED_OUT;
-          return;
-        }
-        this.page = FXA_PAGE_LOGGED_IN;
-        // We are logged in locally, but maybe we are in a state where the
-        // server rejected our credentials (eg, password changed on the server)
-        let fxaLoginStatus = document.getElementById("fxaLoginStatus");
-        let enginesListDisabled;
-        // Not Verfied implies login error state, so check that first.
-        if (!data.verified) {
-          fxaLoginStatus.selectedIndex = FXA_LOGIN_UNVERIFIED;
-          enginesListDisabled = true;
-        // So we think we are logged in, so login problems are next.
-        // (Although if the Sync identity manager is still initializing, we
-        // ignore login errors and assume all will eventually be good.)
-        // LOGIN_FAILED_LOGIN_REJECTED explicitly means "you must log back in".
-        // All other login failures are assumed to be transient and should go
-        // away by themselves, so aren't reflected here.
-        } else if (Weave.Status.login == Weave.LOGIN_FAILED_LOGIN_REJECTED) {
-          fxaLoginStatus.selectedIndex = FXA_LOGIN_FAILED;
-          enginesListDisabled = true;
-        // Else we must be golden (or in an error state we expect to magically
-        // resolve itself)
-        } else {
-          fxaLoginStatus.selectedIndex = FXA_LOGIN_VERIFIED;
-          enginesListDisabled = false;
-        }
-        document.getElementById("fxaEmailAddress1").textContent = data.email;
-        document.getElementById("fxaEmailAddress2").textContent = data.email;
-        document.getElementById("fxaEmailAddress3").textContent = data.email;
-        document.getElementById("fxaSyncComputerName").value = Weave.Service.clientsEngine.localName;
-        let engines = document.getElementById("fxaSyncEngines")
-        for (let checkbox of engines.querySelectorAll("checkbox")) {
-          checkbox.disabled = enginesListDisabled;
-        }
-
-        let checkbox = document.getElementById("fxa-pweng-chk");
-        let help = document.getElementById("fxa-pweng-help");
-        let allowPasswordsEngine = service.allowPasswordsEngine;
-
-        if (!allowPasswordsEngine) {
-          checkbox.checked = false;
-        }
-
-        checkbox.disabled = !allowPasswordsEngine;
-        help.hidden = allowPasswordsEngine;
-      });
-    // If fxAccountEnabled is false and we are in a "not configured" state,
-    // then fxAccounts is probably fully disabled rather than just unconfigured,
-    // so handle this case.  This block can be removed once we remove support
-    // for fxAccounts being disabled.
-    } else if (Weave.Status.service == Weave.CLIENT_NOT_CONFIGURED ||
-               Weave.Svc.Prefs.get("firstSync", "") == "notReady") {
+    if (Weave.Status.service == Weave.CLIENT_NOT_CONFIGURED ||
+        Weave.Svc.Prefs.get("firstSync", "") == "notReady") {
       this.page = PAGE_NO_ACCOUNT;
-    // else: sync was previously configured for the legacy provider, so we
-    // make the "old" panels available.
+      let service = Components.classes["@mozilla.org/weave/service;1"]
+                    .getService(Components.interfaces.nsISupports)
+                    .wrappedJSObject;
+      // no concept of "pair" in an fxAccounts world.
+      if (service.fxAccountsEnabled) {
+        document.getElementById("pairDevice").hidden = true;
+      }
     } else if (Weave.Status.login == Weave.LOGIN_FAILED_INVALID_PASSPHRASE ||
                Weave.Status.login == Weave.LOGIN_FAILED_LOGIN_REJECTED) {
       this.needsUpdate();
     } else {
       this.page = PAGE_HAS_ACCOUNT;
       document.getElementById("accountName").value = Weave.Service.identity.account;
       document.getElementById("syncComputerName").value = Weave.Service.clientsEngine.localName;
       document.getElementById("tosPP").hidden = this._usingCustomServer;
@@ -219,121 +142,43 @@ let gSyncPane = {
     if (Weave.Status.login == Weave.LOGIN_FAILED_LOGIN_REJECTED)
       gSyncUtils.resetPassword();
     else
       gSyncUtils.resetPassphrase();
   },
 
   /**
    * Invoke the Sync setup wizard.
-   *
+   * 
    * @param wizardType
    *        Indicates type of wizard to launch:
    *          null    -- regular set up wizard
    *          "pair"  -- pair a device first
    *          "reset" -- reset sync
    */
   openSetup: function (wizardType) {
     let service = Components.classes["@mozilla.org/weave/service;1"]
                   .getService(Components.interfaces.nsISupports)
                   .wrappedJSObject;
 
     if (service.fxAccountsEnabled) {
-      this.openContentInBrowser("about:accounts");
+      let win = Services.wm.getMostRecentWindow("navigator:browser");
+      win.switchToTabHavingURI("about:accounts", true);
     } else {
       let win = Services.wm.getMostRecentWindow("Weave:AccountSetup");
       if (win)
         win.focus();
       else {
         window.openDialog("chrome://browser/content/sync/setup.xul",
                           "weaveSetup", "centerscreen,chrome,resizable=no",
                           wizardType);
       }
     }
   },
 
-  openContentInBrowser: function(url) {
-    let win = Services.wm.getMostRecentWindow("navigator:browser");
-    if (!win) {
-      // no window to use, so use _openLink to create a new one.  We don't
-      // always use that as it prefers to open a new window rather than use
-      // an existing one.
-      gSyncUtils._openLink(url);
-      return;
-    }
-    win.switchToTabHavingURI(url, true);
-    // seeing as we are doing this in a tab we close the prefs dialog.
-    window.close();
-  },
-
-  signUp: function() {
-    this.openContentInBrowser("about:accounts?action=signup");
-  },
-
-  signIn: function() {
-    this.openContentInBrowser("about:accounts?action=signin");
-  },
-
-  reSignIn: function() {
-    this.openContentInBrowser("about:accounts?action=reauth");
-  },
-
-  manageFirefoxAccount: function() {
-    let url = Services.prefs.getCharPref("identity.fxaccounts.settings.uri");
-    this.openContentInBrowser(url);
-  },
-
-  verifyFirefoxAccount: function() {
-    Components.utils.import("resource://gre/modules/FxAccounts.jsm");
-    fxAccounts.resendVerificationEmail().then(() => {
-      fxAccounts.getSignedInUser().then(data => {
-        let sb = this._stringBundle;
-        let title = sb.GetStringFromName("firefoxAccountsVerificationSentTitle");
-        let heading = sb.formatStringFromName("firefoxAccountsVerificationSentHeading",
-                                              [data.email], 1);
-        let description = sb.GetStringFromName("firefoxAccountVerificationSentDescription");
-
-        Services.prompt.alert(window, title, heading + "\n\n" + description);
-      });
-    });
-  },
-
-  openOldSyncSupportPage: function() {
-    let url = Services.urlFormatter.formatURLPref('app.support.baseURL') + "old-sync"
-    this.openContentInBrowser(url);
-  },
-
-  unlinkFirefoxAccount: function(confirm) {
-    if (confirm) {
-      // We use a string bundle shared with aboutAccounts.
-      let sb = Services.strings.createBundle("chrome://browser/locale/syncSetup.properties");
-      let continueLabel = sb.GetStringFromName("continue.label");
-      let title = sb.GetStringFromName("disconnect.verify.title");
-      let brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
-      let brandShortName = brandBundle.GetStringFromName("brandShortName");
-      let body = sb.GetStringFromName("disconnect.verify.heading") +
-                 "\n\n" +
-                 sb.formatStringFromName("disconnect.verify.description",
-                                         [brandShortName], 1);
-      let ps = Services.prompt;
-      let buttonFlags = (ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING) +
-                        (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL) +
-                        ps.BUTTON_POS_1_DEFAULT;
-      let pressed = Services.prompt.confirmEx(window, title, body, buttonFlags,
-                                              continueLabel, null, null, null, {});
-      if (pressed != 0) { // 0 is the "continue" button
-        return;
-      }
-    }
-    Components.utils.import('resource://gre/modules/FxAccounts.jsm');
-    fxAccounts.signOut().then(() => {
-      this.updateWeavePrefs();
-    });
-  },
-
   openQuotaDialog: function () {
     let win = Services.wm.getMostRecentWindow("Sync:ViewQuota");
     if (win)
       win.focus();
     else 
       window.openDialog("chrome://browser/content/sync/quota.xul", "",
                         "centerscreen,chrome,dialog,modal");
   },
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -33,17 +33,16 @@
       hidden="true"
       data-category="paneSync">
   <image class="header-icon"/>
   <label class="header-name"
          value="&paneSync.title;"/>
 </hbox>
 
 <deck id="weavePrefsDeck" data-category="paneSync" hidden="true">
-  <!-- These panels are for the "legacy" sync provider -->
   <vbox id="noAccount" align="center">
     <spacer flex="1"/>
     <description id="syncDesc">
       &weaveDesc.label;
     </description>
     <separator/>
     <label class="text-link"
            onclick="event.stopPropagation(); gSyncPane.openSetup(null);"
@@ -172,146 +171,9 @@
              onclick="gSyncPane.resetPass(); return false;"
              value="&resetPass.label;"/>
     </hbox>
     <label class="text-link"
            onclick="gSyncPane.startOver(true); return false;"
            value="&unlinkDevice.label;"/>
   </vbox>
 
-  <!-- These panels are for the Firefox Accounts identity provider -->
-  <vbox id="fxaDeterminingStatus" align="center">
-    <spacer flex="1"/>
-    <label value="&determiningAcctStatus.label;"/>
-    <spacer flex="1"/>
-  </vbox>
-
-  <vbox id="noFxaAccount">
-    <label>&welcome.description;</label>
-    <label class="text-link"
-            onclick="gSyncPane.signUp(); return false;"
-            value="&welcome.createAccount.label;"/>
-    <label class="text-link"
-            onclick="gSyncPane.signIn(); return false;"
-            value="&welcome.signIn.label;"/>
-    <separator/>
-    <label class="text-link"
-            onclick="gSyncPane.openOldSyncSupportPage(); return false;"
-            value="&welcome.useOldSync.label;"/>
-  </vbox>
-
-  <vbox id="hasFxaAccount">
-    <groupbox id="fxaGroup">
-      <caption label="&syncBrand.fxAccount.label;"/>
-
-      <deck id="fxaLoginStatus">
-
-        <!-- logged in and verified and all is good -->
-        <hbox>
-          <label id="fxaEmailAddress1"/>
-          <vbox>
-            <label class="text-link"
-                    onclick="gSyncPane.manageFirefoxAccount();"
-                    value="&manage.label;"/>
-          </vbox>
-          <spacer flex="1"/>
-          <vbox>
-            <button id="fxaUnlinkButton"
-                    oncommand="gSyncPane.unlinkFirefoxAccount(true);"
-                    label="&disconnect.label;"/>
-          </vbox>
-        </hbox>
-
-        <!-- logged in to an unverified account -->
-        <hbox flex="1">
-          <description>
-            &signedInUnverified.beforename.label;
-            <label id="fxaEmailAddress2"/>
-            &signedInUnverified.aftername.label;
-          </description>
-          <spacer flex="1"/>
-          <vbox align="end">
-            <button oncommand="gSyncPane.verifyFirefoxAccount();"
-                    label="&verify.label;"/>
-            <label class="text-link"
-                    onclick="/* no warning as account can't have previously synced */ gSyncPane.unlinkFirefoxAccount(false);"
-                    value="&forget.label;"/>
-          </vbox>
-        </hbox>
-
-        <!-- logged in locally but server rejected credentials -->
-        <hbox flex="1">
-          <description>
-            &signedInLoginFailure.beforename.label;
-            <label id="fxaEmailAddress3"/>
-            &signedInLoginFailure.aftername.label;
-          </description>
-          <spacer flex="1"/>
-          <vbox align="end">
-            <button oncommand="gSyncPane.reSignIn();"
-                    label="&signIn.label;"/>
-            <label class="text-link"
-                    onclick="gSyncPane.unlinkFirefoxAccount(true);"
-                    value="&forget.label;"/>
-          </vbox>
-        </hbox>
-      </deck>
-    </groupbox>
-
-    <groupbox id="syncOptions">
-      <caption label="&syncBrand.shortName.label;"/>
-      <hbox id="fxaSyncEngines">
-        <vbox>
-          <checkbox label="&engine.tabs.label;"
-                    accesskey="&engine.tabs.accesskey;"
-                    preference="engine.tabs"/>
-          <checkbox label="&engine.bookmarks.label;"
-                    accesskey="&engine.bookmarks.accesskey;"
-                    preference="engine.bookmarks"/>
-          <hbox>
-            <checkbox id="fxa-pweng-chk"
-                      label="&engine.passwords.label;"
-                      accesskey="&engine.passwords.accesskey;"
-                      preference="engine.passwords"/>
-
-            <vbox id="fxa-pweng-help">
-              <spacer flex="1"/>
-              <hbox id="fxa-pweng-help-link">
-                <label value=" ["/>
-                <label class="text-link" value="?"
-                        onclick="gSyncUtils.openMPInfoPage(event);"/>
-                <label value="]"/>
-              </hbox>
-              <spacer flex="1"/>
-            </vbox>
-          </hbox>
-          <checkbox label="&engine.history.label;"
-                    accesskey="&engine.history.accesskey;"
-                    preference="engine.history"/>
-          <checkbox label="&engine.addons.label;"
-                    accesskey="&engine.addons.accesskey;"
-                    preference="engine.addons"/>
-          <checkbox label="&engine.prefs.label;"
-                    accesskey="&engine.prefs.accesskey;"
-                    preference="engine.prefs"/>
-        </vbox>
-        <spacer/>
-      </hbox>
-    </groupbox>
-    <hbox align="center">
-      <label value="&syncDeviceName.label;"
-              accesskey="&syncDeviceName.accesskey;"
-              control="syncComputerName"/>
-      <textbox id="fxaSyncComputerName"
-                flex="1"
-                onchange="gSyncUtils.changeName(this)"/>
-    </hbox>
-    <spacer flex="1"/>
-    <hbox id="tosPP" pack="center">
-      <label class="text-link small"
-              onclick="event.stopPropagation();gSyncUtils.openToS();"
-              value="&prefs.tosLink.label;"/>
-      <label class="text-link small"
-              onclick="event.stopPropagation();gSyncUtils.openPrivacyPolicy();"
-              value="&fxaPrivacyNotice.link.label;"/>
-    </hbox>
-  </vbox>
 </deck>
--- a/browser/components/preferences/in-content/tests/browser.ini
+++ b/browser/components/preferences/in-content/tests/browser.ini
@@ -11,9 +11,8 @@ support-files =
 [browser_healthreport.js]
 skip-if = !healthreport || (os == 'linux' && debug)
 [browser_proxy_backup.js]
 [browser_privacypane_1.js]
 [browser_privacypane_3.js]
 [browser_privacypane_4.js]
 [browser_privacypane_5.js]
 [browser_privacypane_8.js]
-skip-if = e10s # Bug ?????? -  "leaked until shutdown [nsGlobalWindow #99 about:preferences]"
--- a/browser/components/preferences/tests/browser.ini
+++ b/browser/components/preferences/tests/browser.ini
@@ -1,17 +1,16 @@
 [DEFAULT]
 support-files =
   head.js
   privacypane_tests_perwindow.js
 
 [browser_advanced_update.js]
 [browser_bug410900.js]
 [browser_bug705422.js]
-skip-if = e10s # Bug 941459 - pushPrefEnv, popPrefEnv in specialPowersAPI.js not e10s friendly
 [browser_chunk_permissions.js]
 [browser_connection_bug388287.js]
 [browser_healthreport.js]
 skip-if = !healthreport || (os == 'linux' && debug)
 [browser_permissions.js]
 [browser_privacypane_1.js]
 [browser_privacypane_3.js]
 [browser_privacypane_4.js]
--- a/browser/components/privatebrowsing/test/browser/browser.ini
+++ b/browser/components/privatebrowsing/test/browser/browser.ini
@@ -11,29 +11,24 @@ support-files =
   browser_privatebrowsing_protocolhandler_page.html
   browser_privatebrowsing_windowtitle_page.html
   head.js
   popup.html
   title.sjs
 
 [browser_privatebrowsing_DownloadLastDirWithCPS.js]
 [browser_privatebrowsing_aboutHomeButtonAfterWindowClose.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (win.getComputedStyle(win.gBrowser.contentDocument.getElementById("restorePreviousSession")))
 [browser_privatebrowsing_aboutSessionRestore.js]
-skip-if = e10s # Bug ?????? -  "leaked until shutdown [nsGlobalWindow...]"
 [browser_privatebrowsing_cache.js]
 [browser_privatebrowsing_certexceptionsui.js]
 [browser_privatebrowsing_concurrent.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (private_tab.docShell.QueryInterface...)
 [browser_privatebrowsing_cookieacceptdialog.js]
 [browser_privatebrowsing_crh.js]
 [browser_privatebrowsing_downloadLastDir.js]
-skip-if = e10s # Bug ?????? MockFilePicker cleanup failing ( nsresult: "0x80040154 (NS_ERROR_FACTORY_NOT_REGISTERED)" location: "JS frame :: resource://specialpowers/MockFilePicker.jsm :: this.MockFilePicker.cleanup :: line 84")
 [browser_privatebrowsing_downloadLastDir_c.js]
-skip-if = e10s # Bug ?????? MockFilePicker cleanup failing ( nsresult: "0x80040154 (NS_ERROR_FACTORY_NOT_REGISTERED)" location: "JS frame :: resource://specialpowers/MockFilePicker.jsm :: this.MockFilePicker.cleanup :: line 84")
 [browser_privatebrowsing_downloadLastDir_toggle.js]
 [browser_privatebrowsing_geoprompt.js]
 [browser_privatebrowsing_lastpbcontextexited.js]
 [browser_privatebrowsing_localStorage.js]
 [browser_privatebrowsing_localStorage_before_after.js]
 [browser_privatebrowsing_noSessionRestoreMenuOption.js]
 [browser_privatebrowsing_nonbrowser.js]
 [browser_privatebrowsing_opendir.js]
@@ -41,13 +36,10 @@ skip-if = e10s # Bug ?????? MockFilePick
 [browser_privatebrowsing_placestitle.js]
 [browser_privatebrowsing_popupblocker.js]
 [browser_privatebrowsing_protocolhandler.js]
 [browser_privatebrowsing_sidebar.js]
 [browser_privatebrowsing_theming.js]
 [browser_privatebrowsing_ui.js]
 [browser_privatebrowsing_urlbarfocus.js]
 [browser_privatebrowsing_windowtitle.js]
-skip-if = e10s # Bug 918634 - swapFrameLoaders
 [browser_privatebrowsing_zoom.js]
-skip-if = e10s # Bug 691614 - e10s support for content zooming
 [browser_privatebrowsing_zoomrestore.js]
-skip-if = e10s # Bug 691614 - e10s support for content zooming
--- a/browser/components/search/test/browser.ini
+++ b/browser/components/search/test/browser.ini
@@ -6,22 +6,17 @@ support-files =
   head.js
   test.html
   testEngine.src
   testEngine.xml
   testEngine_mozsearch.xml
 
 [browser_405664.js]
 [browser_426329.js]
-skip-if = e10s # Bug ?????? - Test uses load event and checks event.target.
 [browser_483086.js]
 [browser_addEngine.js]
 [browser_bing.js]
 [browser_bing_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}]
 [browser_contextmenu.js]
-skip-if = e10s # Bug ?????? - Test touches content (content.window.getSelection().QueryInterface(Ci.nsISelectionPrivate)....)
 [browser_google.js]
 [browser_google_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}]
 [browser_healthreport.js]
 [browser_private_search_perwindowpb.js]
-skip-if = e10s # Bug ?????? - Test uses load event and checks event.target.
--- a/browser/components/sessionstore/test/browser.ini
+++ b/browser/components/sessionstore/test/browser.ini
@@ -3,17 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # browser_506482.js is disabled because of frequent failures (bug 538672)
 # browser_526613.js is disabled because of frequent failures (bug 534489)
 # browser_589246.js is disabled for leaking browser windows (bug 752467)
 # browser_580512.js is disabled for leaking browser windows (bug 752467)
 
 [DEFAULT]
-skip-if = e10s # Bug ?????? - SessionStore is disabled in e10s
 support-files =
   head.js
   content.js
   content-forms.js
   browser_formdata_sample.html
   browser_formdata_xpath_sample.html
   browser_frametree_sample.html
   browser_frametree_sample_frameset.html
@@ -180,13 +179,13 @@ skip-if = os == "linux" # Intermittent f
 # Disabled for frequent intermittent failures
 [browser_464620_a.js]
 skip-if = true
 [browser_464620_b.js]
 skip-if = true
 
 # Disabled on OS X:
 [browser_597071.js]
-skip-if = os == "mac" || e10s
+skip-if = os == "mac"
 [browser_625016.js]
-skip-if = os == "mac" || e10s
+skip-if = os == "mac"
 
 [browser_911547.js]
--- a/browser/components/tabview/test/browser.ini
+++ b/browser/components/tabview/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Most of these tests fail due to Bug ?????? - SessionStore is disabled in e10s
 support-files =
   dummy_page.html
   head.js
   search1.html
   search2.html
   test_bug600645.html
   test_bug644097.html
   test_bug678374.html
@@ -39,17 +38,17 @@ support-files =
 [browser_tabview_bug597360.js]
 [browser_tabview_bug597399.js]
 [browser_tabview_bug597980.js]
 skip-if = true # Bug 711907
 [browser_tabview_bug598375.js]
 [browser_tabview_bug598600.js]
 [browser_tabview_bug599048.js]
 [browser_tabview_bug599626.js]
-skip-if = os == 'linux' || e10s # Disabled on Linux:  Bug 939620, much fail, so amaze; Disabled for e10s: Bug ??????
+skip-if = os == 'linux' # Bug 939620
 [browser_tabview_bug600645.js]
 [browser_tabview_bug600812.js]
 [browser_tabview_bug602432.js]
 skip-if = true # Bug 704417
 [browser_tabview_bug604098.js]
 [browser_tabview_bug606657.js]
 [browser_tabview_bug606905.js]
 [browser_tabview_bug607108.js]
@@ -127,17 +126,17 @@ skip-if = os == 'linux'&&debug # bug 989
 [browser_tabview_bug654721.js]
 [browser_tabview_bug654941.js]
 skip-if = true # Bug 754222
 [browser_tabview_bug655269.js]
 [browser_tabview_bug656778.js]
 skip-if = os == "mac" # Bug 946918
 [browser_tabview_bug656913.js]
 [browser_tabview_bug659594.js]
-skip-if = os == "mac" || e10s # mac: Bug 939617; e10s - Bug ?????? - "leaked until shutdown [nsGlobalWindow #82 about:blank]"
+skip-if = os == "mac" # Bug 939617
 [browser_tabview_bug662266.js]
 [browser_tabview_bug663421.js]
 [browser_tabview_bug665502.js]
 [browser_tabview_bug669694.js]
 [browser_tabview_bug673196.js]
 [browser_tabview_bug673729.js]
 skip-if = true # Bug 749980
 [browser_tabview_bug678374.js]
@@ -166,14 +165,14 @@ skip-if = true # Bug 736425
 [browser_tabview_expander.js]
 [browser_tabview_firstrun_pref.js]
 [browser_tabview_group.js]
 skip-if = os == "mac" || os == "win" # Bug 945687
 [browser_tabview_launch.js]
 [browser_tabview_multiwindow_search.js]
 [browser_tabview_pending_tabs.js]
 [browser_tabview_privatebrowsing_perwindowpb.js]
-skip-if = os == 'linux' || e10s # linux: Bug 944300; e10s: bug ?????? - "leaked until shutdown [nsGlobalWindow #82 about:blank]"
+skip-if = os == 'linux' # Bug 944300
 [browser_tabview_rtl.js]
 [browser_tabview_search.js]
 [browser_tabview_snapping.js]
 [browser_tabview_startup_transitions.js]
 [browser_tabview_undo_group.js]
--- a/browser/components/test/browser.ini
+++ b/browser/components/test/browser.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
 
 [browser_bug538331.js]
-skip-if = e10s # Bug ?????? - child process crash, but only when run as part of the suite (ie, probably not actually this tests fault!?)
--- a/browser/devtools/app-manager/test/browser.ini
+++ b/browser/devtools/app-manager/test/browser.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   head.js
   hosted_app.manifest
   manifest.webapp
 
 [browser_manifest_editor.js]
 skip-if = os == "linux"
--- a/browser/devtools/commandline/test/browser.ini
+++ b/browser/devtools/commandline/test/browser.ini
@@ -1,20 +1,19 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   head.js
   helpers.js
   mockCommands.js
 
 [browser_cmd_addon.js]
 [browser_cmd_calllog.js]
-skip-if = true || e10s # Bug 845831
+skip-if = true # Bug 845831
 [browser_cmd_calllog_chrome.js]
-skip-if = true || e10s # Bug 845831
+skip-if = true # Bug 845831
 [browser_cmd_appcache_invalid.js]
 support-files =
   browser_cmd_appcache_invalid_appcache.appcache
   browser_cmd_appcache_invalid_appcache.appcache^headers^
   browser_cmd_appcache_invalid_index.html
   browser_cmd_appcache_invalid_page1.html
   browser_cmd_appcache_invalid_page2.html
   browser_cmd_appcache_invalid_page3.html
@@ -50,17 +49,17 @@ support-files =
 [browser_cmd_settings.js]
 [browser_gcli_async.js]
 [browser_gcli_canon.js]
 [browser_gcli_cli1.js]
 [browser_gcli_cli2.js]
 [browser_gcli_completion1.js]
 [browser_gcli_completion2.js]
 [browser_gcli_date.js]
-skip-if = true || e10s # Disabled until TZ bug is fixed
+skip-if = true # Disabled until TZ bug is fixed
 [browser_gcli_exec.js]
 [browser_gcli_fail.js]
 [browser_gcli_file.js]
 [browser_gcli_focus.js]
 [browser_gcli_history.js]
 [browser_gcli_incomplete.js]
 [browser_gcli_inputter.js]
 [browser_gcli_intro.js]
--- a/browser/devtools/debugger/test/browser.ini
+++ b/browser/devtools/debugger/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   addon1.xpi
   addon2.xpi
   addon3.xpi
   addon4.xpi
   code_binary_search.coffee
   code_binary_search.js
   code_binary_search.map
@@ -275,11 +274,11 @@ support-files =
 [browser_dbg_variables-view-reexpand-01.js]
 [browser_dbg_variables-view-reexpand-02.js]
 [browser_dbg_variables-view-webidl.js]
 [browser_dbg_watch-expressions-01.js]
 [browser_dbg_watch-expressions-02.js]
 [browser_dbg_chrome-create.js]
 skip-if = true # Test doesn't clean up after itself (bug 918507), but also bug 847558 on Linux
 [browser_dbg_on-pause-raise.js]
-skip-if = os == "linux" || e10s # Bug 888811 & bug 891176
+skip-if = os == "linux" # Bug 888811 & bug 891176
 [browser_dbg_break-on-dom-event.js]
-skip-if = os == "mac" || e10s # Bug 895426
+skip-if = os == "mac" # Bug 895426
--- a/browser/devtools/fontinspector/test/browser.ini
+++ b/browser/devtools/fontinspector/test/browser.ini
@@ -1,8 +1,6 @@
 [DEFAULT]
 support-files =
   browser_font.woff
   browser_fontinspector.html
 
 [browser_fontinspector.js]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
-
--- a/browser/devtools/framework/test/browser.ini
+++ b/browser/devtools/framework/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   browser_toolbox_options_disable_js.html
   browser_toolbox_options_disable_js_iframe.html
   browser_toolbox_options_disable_cache.sjs
   head.js
 
 [browser_devtools_api.js]
 [browser_dynamic_tool_enabling.js]
--- a/browser/devtools/inspector/test/browser.ini
+++ b/browser/devtools/inspector/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   browser_inspector_breadcrumbs.html
   browser_inspector_bug_650804_search.html
   browser_inspector_bug_831693_search_suggestions.html
   browser_inspector_cmd_inspect.html
   browser_inspector_dead_node_exception.html
   browser_inspector_destroyselection.html
   browser_inspector_menu.html
--- a/browser/devtools/markupview/test/browser.ini
+++ b/browser/devtools/markupview/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   doc_markup_edit.html
   doc_markup_flashing.html
   doc_markup_mutation.html
   doc_markup_navigation.html
   doc_markup_pagesize_01.html
   doc_markup_pagesize_02.html
   doc_markup_search.html
--- a/browser/devtools/netmonitor/test/browser.ini
+++ b/browser/devtools/netmonitor/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   head.js
   html_content-type-test-page.html
   html_content-type-without-cache-test-page.html
   html_custom-get-page.html
   html_cyrillic-test-page.html
   html_filter-test-page.html
   html_infinite-get-page.html
--- a/browser/devtools/responsivedesign/test/browser.ini
+++ b/browser/devtools/responsivedesign/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   head.js
   touch.html
 
 [browser_responsive_cmd.js]
 [browser_responsivecomputedview.js]
 [browser_responsiveruleview.js]
 [browser_responsiveui.js]
--- a/browser/devtools/scratchpad/test/browser.ini
+++ b/browser/devtools/scratchpad/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files = head.js
 
 [browser_scratchpad_browser_last_window_closing.js]
 [browser_scratchpad_reset_undo.js]
 [browser_scratchpad_display_outputs_errors.js]
 [browser_scratchpad_eval_func.js]
 [browser_scratchpad_goto_line_ui.js]
 [browser_scratchpad_reload_and_run.js]
--- a/browser/devtools/shadereditor/test/browser.ini
+++ b/browser/devtools/shadereditor/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   doc_blended-geometry.html
   doc_multiple-contexts.html
   doc_overlapping-geometry.html
   doc_shader-order.html
   doc_simple-canvas.html
   head.js
 
--- a/browser/devtools/shared/test/browser.ini
+++ b/browser/devtools/shared/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   browser_layoutHelpers.html
   browser_layoutHelpers_iframe.html
   browser_templater_basic.html
   browser_toolbar_basic.html
   browser_toolbar_webconsole_errors_count.html
   head.js
   leakhunt.js
--- a/browser/devtools/sourceeditor/test/browser.ini
+++ b/browser/devtools/sourceeditor/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   cm_comment_test.js
   cm_driver.js
   cm_mode_javascript_test.js
   cm_mode_test.css
   cm_mode_test.js
   cm_test.js
   cm_emacs_test.js
--- a/browser/devtools/styleeditor/test/browser.ini
+++ b/browser/devtools/styleeditor/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   autocomplete.html
   browser_styleeditor_cmd_edit.html
   four.html
   head.js
   import.css
   import.html
   import2.css
--- a/browser/devtools/styleinspector/test/browser.ini
+++ b/browser/devtools/styleinspector/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   head.js
   browser_bug722196_identify_media_queries.html
   browser_styleinspector_bug_677930_urls_clickable/browser_styleinspector_bug_677930_urls_clickable.css
 
 [browser_bug683672.js]
 support-files = browser_bug683672.html
 [browser_styleinspector_bug_672746_default_styles.js]
--- a/browser/devtools/tilt/test/browser.ini
+++ b/browser/devtools/tilt/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files = head.js
 
 [browser_tilt_01_lazy_getter.js]
 [browser_tilt_02_notifications-seq.js]
 [browser_tilt_02_notifications-tabs.js]
 [browser_tilt_02_notifications.js]
 [browser_tilt_03_tab_switch.js]
 [browser_tilt_04_initialization.js]
--- a/browser/devtools/webconsole/test/browser.ini
+++ b/browser/devtools/webconsole/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   head.js
   test-bug-585956-console-trace.html
   test-bug-593003-iframe-wrong-hud-iframe.html
   test-bug-593003-iframe-wrong-hud.html
   test-bug-595934-canvas-css.html
   test-bug-595934-canvas-css.js
   test-bug-595934-css-loader.css
--- a/browser/extensions/pdfjs/test/browser.ini
+++ b/browser/extensions/pdfjs/test/browser.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-skip-if = e10s # Bug 942707 - PDF viewer doesn't work with e10s.
 support-files = file_pdfjs_test.pdf
 
 [browser_pdfjs_main.js]
 [browser_pdfjs_savedialog.js]
 [browser_pdfjs_views.js]
--- a/browser/fuel/test/browser.ini
+++ b/browser/fuel/test/browser.ini
@@ -5,9 +5,8 @@ support-files =
   ContentWithFrames.html
 
 [browser_Application.js]
 [browser_ApplicationPrefs.js]
 [browser_ApplicationQuitting.js]
 [browser_ApplicationStorage.js]
 [browser_Bookmarks.js]
 [browser_Browser.js]
-skip-if = e10s # Bug ?????? - uses tabview which doesn't work well in e10s
--- a/browser/modules/test/browser.ini
+++ b/browser/modules/test/browser.ini
@@ -1,31 +1,21 @@
 [DEFAULT]
 support-files =
   head.js
   uitour.*
   image.png
 
 [browser_BrowserUITelemetry_buckets.js]
 [browser_NetworkPrioritizer.js]
-skip-if = e10s # Bug 666804 - Support NetworkPrioritizer in e10s
 [browser_SignInToWebsite.js]
-skip-if = e10s # Bug 941426 - SignIntoWebsite.jsm not e10s friendly
 [browser_UITour.js]
-skip-if = os == "linux" || e10s # Intermittent failures, bug 951965
+skip-if = os == "linux" # Intermittent failures, bug 951965
 [browser_UITour2.js]
-skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_UITour3.js]
-skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_UITour_availableTargets.js]
-skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_UITour_detach_tab.js]
-skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_UITour_annotation_size_attributes.js]
-skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_UITour_panel_close_annotation.js]
-skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_UITour_registerPageID.js]
-skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_UITour_sync.js]
-skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_taskbar_preview.js]
-run-if = os == "win" && e10s == false # Bug 666808 - AeroPeek support for e10s
+run-if = os == "win"
--- a/content/base/test/browser.ini
+++ b/content/base/test/browser.ini
@@ -1,8 +1,5 @@
 [DEFAULT]
 
 [browser_bug593387.js]
-skip-if = e10s # Bug ?????? - test directly touches content (contentWindow.iframe.addEventListener)
 [browser_bug902350.js]
-skip-if = e10s # Bug ?????? - test e10s utils don't support load events from iframe etc, which this test relies on.
 [browser_state_notifications.js]
-skip-if = e10s # Bug ?????? - content-document-* notifications come while document's URI is still about:blank, but test expects real URL.
--- a/content/html/content/test/browser.ini
+++ b/content/html/content/test/browser.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 support-files =
   file_bug649778.html
   file_bug649778.html^headers^
 
 [browser_bug649778.js]
-skip-if = e10s # Bug ?????? - leaked until shutdown [nsGlobalWindow #16 about:blank]
--- a/docshell/test/browser/browser.ini
+++ b/docshell/test/browser/browser.ini
@@ -33,62 +33,37 @@ support-files =
   file_bug852909.pdf
   file_bug852909.png
   file_bug941562-child.html
   file_bug941562.html
   print_postdata.sjs
   test-form_sjis.html
 
 [browser_bug134911.js]
-skip-if = e10s # Bug ?????? - BrowserSetForcedCharacterSet() in browser.js references docShell
 [browser_bug234628-1.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug234628-10.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug234628-11.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug234628-2.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug234628-3.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug234628-4.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug234628-5.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug234628-6.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug234628-7.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug234628-8.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug234628-9.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug349769.js]
-skip-if = e10s # Bug ?????? - test touches content (newBrowser.contentDocument.nodePrincipal)
 [browser_bug388121-1.js]
-skip-if = e10s # Bug ?????? - test touches content (newBrowser.contentDocument.nodePrincipal)
 [browser_bug388121-2.js]
-skip-if = e10s # Bug ?????? - test touches content (newBrowser.contentDocument.nodePrincipal)
 [browser_bug420605.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_bug422543.js]
-skip-if = e10s # Bug ?????? - obscure test failures (shistory has a new entry - Got initial, expected newentry)
 [browser_bug441169.js]
 [browser_bug503832.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_bug554155.js]
 [browser_bug655270.js]
-skip-if = e10s # Bug ?????? - PlacesUtils.history.addObserver notifications don't seem to fire
 [browser_bug655273.js]
 [browser_bug670318.js]
-skip-if = e10s # Bug 916974 - browser.sessionHistory is null
 [browser_bug673467.js]
-skip-if = e10s # Bug ?????? - test touches content (adds event listener to content document's iframe)
 [browser_bug852909.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_bug92473.js]
-skip-if = e10s # Bug ?????? - BrowserSetForcedCharacterSet() in browser.js references docShell
 [browser_bug941562.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_loadDisallowInherit.js]
 [browser_loadURI.js]
-skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that.
 [browser_search_notification.js]
--- a/docshell/test/navigation/browser.ini
+++ b/docshell/test/navigation/browser.ini
@@ -3,9 +3,8 @@ support-files =
   bug343515_pg1.html
   bug343515_pg2.html
   bug343515_pg3.html
   bug343515_pg3_1.html
   bug343515_pg3_1_1.html
   bug343515_pg3_2.html
 
 [browser_bug343515.js]
-skip-if = e10s # Bug ?????? - test directly touches content (tries to QI the content window)
--- a/dom/indexedDB/test/browser.ini
+++ b/dom/indexedDB/test/browser.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-run-if = buildapp == "browser" && e10s == false
+run-if = buildapp == "browser"
 support-files =
   head.js
   browser_forgetThisSiteAdd.html
   browser_forgetThisSiteGet.html
   browserHelpers.js
   browser_permissionsPrompt.html
   browser_quotaPrompt.html
   browser_quotaPromptDatabases.html
--- a/dom/power/test/browser.ini
+++ b/dom/power/test/browser.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
 
 [browser_wakelocks.js]
-skip-if = e10s # Bug ?????? - SpecialPowers issues ({file: "chrome://mochikit/content/tests/SimpleTest/specialpowersAPI.js" line: 759}]'[JavaScript Error: "content.window is undefined" {file: "chrome://mochikit/content/tests/SimpleTest/specialpowersAPI.js" line: 759}]' when calling method: [nsIObserver::observe]")
--- a/dom/tests/browser/browser.ini
+++ b/dom/tests/browser/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - most of these tests fail for currently unknown reasons.
 support-files =
   browser_frame_elements.html
   browser_geolocation_privatebrowsing_page.html
   network_geolocation.sjs
   page_privatestorageevent.html
   test-console-api.html
 
 [browser_test__content.js]
--- a/image/test/browser/browser.ini
+++ b/image/test/browser/browser.ini
@@ -3,10 +3,9 @@ support-files =
   animated.gif
   animated2.gif
   big.png
   head.js
   image.html
   imageX2.html
 
 [browser_bug666317.js]
-skip-if = e10s # Bug 948194 - Decoded Images seem to not be discarded on memory-pressure notification with e10s enabled
 [browser_image.js]
--- a/js/xpconnect/tests/browser/browser.ini
+++ b/js/xpconnect/tests/browser/browser.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
 
 [browser_dead_object.js]
-skip-if = e10s # Bug ?????? - test touches content (Components.utils.isDeadWrapper(contentWindow) - or maybe isDeadWrapper should take CPOWs into account?)
--- a/layout/base/tests/browser.ini
+++ b/layout/base/tests/browser.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
 
 [browser_bug617076.js]
-skip-if = e10s # Bug ?????? - test touches content (TypeError: doc.documentElement is null)
--- a/layout/style/test/browser.ini
+++ b/layout/style/test/browser.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 support-files =
   bug453896_iframe.html
   media_queries_iframe.html
 
 [browser_bug453896.js]
-skip-if = e10s # Bug ?????? - test touches content (TypeError: doc.documentElement is null)
--- a/layout/xul/test/browser.ini
+++ b/layout/xul/test/browser.ini
@@ -1,8 +1,5 @@
 [DEFAULT]
 
 [browser_bug685470.js]
-skip-if = e10s # Bug ?????? - test touches content (TypeError: doc.documentElement is null)
 [browser_bug703210.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_bug706743.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
--- a/toolkit/components/places/tests/browser/browser.ini
+++ b/toolkit/components/places/tests/browser/browser.ini
@@ -3,31 +3,21 @@ support-files =
   colorAnalyzer/category-discover.png
   colorAnalyzer/dictionaryGeneric-16.png
   colorAnalyzer/extensionGeneric-16.png
   colorAnalyzer/localeGeneric.png
   head.js
 
 [browser_bug248970.js]
 [browser_bug399606.js]
-skip-if = e10s # Bug ?????? - test uses history observer which doesn't seem to make its way to the parent.
 [browser_bug646422.js]
-skip-if = e10s # Bug ?????? - test times out on try on all platforms, but works locally for markh!
 [browser_bug680727.js]
-skip-if = e10s # Bug ?????? - test times out on try on all platforms, but works locally for markh!
 [browser_colorAnalyzer.js]
 [browser_favicon_privatebrowsing_perwindowpb.js]
 [browser_favicon_setAndFetchFaviconForPage.js]
 [browser_favicon_setAndFetchFaviconForPage_failures.js]
 [browser_notfound.js]
-skip-if = e10s # Bug ?????? - test times out on try on all platforms, but works locally for markh!
 [browser_redirect.js]
-skip-if = e10s # Bug ?????? - test times out on try on all platforms, but works locally for markh!
 [browser_settitle.js]
-skip-if = e10s # Bug ?????? - test times out on try on all platforms, but works locally for markh!
 [browser_visited_notfound.js]
-skip-if = e10s # Bug ?????? - test times out on try on all platforms, but works locally for markh!
 [browser_visituri.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_visituri_nohistory.js]
-skip-if = e10s # Bug ?????? - test times out on try on all platforms, but works locally for markh!
 [browser_visituri_privatebrowsing_perwindowpb.js]
-skip-if = e10s # Bug ?????? - test times out on try on all platforms, but works locally for markh!
--- a/toolkit/components/startup/tests/browser/browser.ini
+++ b/toolkit/components/startup/tests/browser/browser.ini
@@ -1,8 +1,6 @@
 [DEFAULT]
 support-files = beforeunload.html
 
 [browser_bug511456.js]
-skip-if = e10s # Bug ?????? - test touches content (uses a WindowWatcher in the parent process to try and observe content created alerts etc)
 [browser_bug537449.js]
-skip-if = e10s # Bug ?????? - test touches content (uses a WindowWatcher in the parent process to try and observe content created alerts etc)
 [browser_crash_detection.js]
--- a/toolkit/components/thumbnails/test/browser.ini
+++ b/toolkit/components/thumbnails/test/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug 863512 - thumbnails are disabled with e10s enabled.
 support-files =
   background_red.html
   background_red_redirect.sjs
   background_red_scroll.html
   head.js
   privacy_cache_control.sjs
   thumbnails_background.sjs
   thumbnails_crash_content_helper.js
--- a/toolkit/components/viewsource/test/browser/browser.ini
+++ b/toolkit/components/viewsource/test/browser/browser.ini
@@ -3,10 +3,9 @@ support-files = head.js
   file_bug464222.html
 
 [browser_bug464222.js]
 [browser_bug699356.js]
 [browser_bug713810.js]
 [browser_contextmenu.js]
 [browser_gotoline.js]
 [browser_viewsourceprefs.js]
-skip-if = e10s # Bug ?????? - obscure failure (Syntax highlighting off - Got true, expected false)
 [browser_viewsourceprefs_nonhtml.js]
--- a/toolkit/content/tests/browser/browser.ini
+++ b/toolkit/content/tests/browser/browser.ini
@@ -1,24 +1,16 @@
 [DEFAULT]
 
 [browser_autoscroll_disabled.js]
-skip-if = e10s # Bug ?????? - test touches content (getElementById on the content document)
 [browser_browserDrop.js]
 [browser_bug295977_autoscroll_overflow.js]
-skip-if = e10s # Bug 921935 - focusmanager issues with e10s
 [browser_bug594509.js]
-skip-if = e10s # Bug ?????? - intermittent crash of child process reported when run under e10s
 [browser_bug982298.js]
 [browser_default_image_filename.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_findbar.js]
-skip-if = os == "linux" || e10s # Disabled on Linux: Bug 945667; Disabled for e10s: Bug ?????? - seems to be a timing issue with RemoteFinder.jsm messages coming later than the tests expect.
 [browser_input_file_tooltips.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (TypeError: doc.createElement is not a function)
 [browser_keyevents_during_autoscrolling.js]
-skip-if = e10s # Bug 921935 - focusmanager issues with e10s
 [browser_save_resend_postdata.js]
 support-files =
   common/mockTransfer.js
   data/post_form_inner.sjs
   data/post_form_outer.sjs
-skip-if = e10s # Bug ?????? - test directly manipulates content (gBrowser.contentDocument.getElementById("postForm").submit();)
--- a/toolkit/crashreporter/test/browser/browser.ini
+++ b/toolkit/crashreporter/test/browser/browser.ini
@@ -1,10 +1,8 @@
 [DEFAULT]
 support-files =
   head.js
   crashreport.sjs
 
-skip-if = e10s # Bug 929045 - [tracking] e10s support for Crash Reporting
-
 [browser_aboutCrashes.js]
 [browser_aboutCrashesResubmit.js]
 [browser_bug471404.js]
--- a/toolkit/devtools/server/tests/browser/browser.ini
+++ b/toolkit/devtools/server/tests/browser/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
   head.js
   storage-dynamic-windows.html
   storage-listings.html
   storage-unsecured-iframe.html
   storage-updates.html
   storage-secured-iframe.html
 
--- a/toolkit/forgetaboutsite/test/browser/browser.ini
+++ b/toolkit/forgetaboutsite/test/browser/browser.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 support-files = browser_clearplugindata.html
 
 [browser_clearplugindata.js]
-skip-if = e10s # Bug ?????? - test touches content (gBrowser.selectedBrowser.contentWindow.wrappedJSObject.testFinishedCallback = function() {...})
--- a/toolkit/modules/tests/browser/browser.ini
+++ b/toolkit/modules/tests/browser/browser.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 
 [browser_Deprecated.js]
 [browser_Finder.js]
-skip-if = e10s # Bug ?????? - test already uses content scripts, but still fails only under e10s.
 [browser_Geometry.js]
 [browser_InlineSpellChecker.js]
 [browser_Troubleshoot.js]
--- a/toolkit/mozapps/extensions/test/browser/browser-common.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser-common.ini
@@ -1,25 +1,23 @@
 [DEFAULT]
 support-files =
   head.js
 
 [browser_about.js]
 [browser_bug523784.js]
 [browser_bug557943.js]
 [browser_bug562797.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_bug562854.js]
 [browser_bug562890.js]
 [browser_bug562899.js]
 [browser_bug562992.js]
 [browser_bug567127.js]
 [browser_bug567137.js]
 [browser_bug570760.js]
-skip-if = e10s # Bug ?????? - EventUtils.synthesizeKey not e10s friendly
 [browser_bug572561.js]
 [browser_bug577990.js]
 [browser_bug580298.js]
 [browser_bug581076.js]
 [browser_bug586574.js]
 [browser_bug587970.js]
 [browser_bug591465.js]
 [browser_bug591663.js]
@@ -29,40 +27,31 @@ skip-if = e10s # Bug ?????? - EventUtils
 [browser_bug610764.js]
 [browser_bug618502.js]
 [browser_bug679604.js]
 [browser_bug714593.js]
 [browser_bug590347.js]
 [browser_debug_button.js]
 [browser_details.js]
 [browser_discovery.js]
-skip-if = e10s # Bug ?????? - test times out on try on all platforms, but works locally for markh!
 [browser_dragdrop.js]
 [browser_experiments.js]
 [browser_list.js]
 [browser_metadataTimeout.js]
 [browser_searching.js]
 [browser_sorting.js]
-skip-if = e10s # Bug ?????? - leaked until shutdown [nsGlobalWindow #1760 about:blank]
 [browser_uninstalling.js]
-skip-if = e10s # Bug ?????? - leaked until shutdown [nsGlobalWindow #1760 about:blank]
 [browser_install.js]
 [browser_recentupdates.js]
 [browser_manualupdates.js]
 [browser_globalwarnings.js]
 [browser_globalinformations.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_eula.js]
 [browser_updateid.js]
-skip-if = e10s # Bug ?????? - window leak reported at end of test run.
 [browser_purchase.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_openDialog.js]
 [browser_types.js]
-skip-if = e10s # Bug ?????? - leaked until shutdown [nsGlobalWindow #1760 about:blank]
 [browser_inlinesettings.js]
 [browser_inlinesettings_custom.js]
 [browser_inlinesettings_info.js]
 [browser_tabsettings.js]
-skip-if = e10s # Bug ?????? - leaked until shutdown [nsGlobalWindow #1760 about:blank]
 [browser_pluginprefs.js]
 [browser_CTP_plugins.js]
-skip-if = e10s # Bug 899347 - no e10s click-to-play support
--- a/toolkit/mozapps/extensions/test/xpinstall/browser.ini
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = e10s # Bug ?????? - addon installation seems broken (gXPInstallObserver._findChildShell tries to directly use a content docShell)
 support-files =
   authRedirect.sjs
   bug540558.html
   bug638292.html
   bug645699.html
   cookieRedirect.sjs
   corrupt.xpi
   empty.xpi