Bug 1776212 - cleanup e10s in manifest conditions for bc/dt. r=aryx,n…

…ecko-reviewers,extension-reviewers,preferences-reviewers,dragana,zombie

Differential Revision: https://phabricator.services.mozilla.com/D150127

accessible/tests/browser/bounds/browser.ini

@@ -9,12 +9,12 @@ support-files =
 
 [browser_accessible_moved.js]
 [browser_test_resolution.js]
-skip-if = e10s && os == 'win' # bug 1372296
+skip-if = os == 'win' # bug 1372296
 [browser_test_zoom.js]
 skip-if = true # Bug 1734271
 [browser_test_zoom_text.js]
 https_first_disabled = true
-skip-if = e10s && os == 'win' # bug 1372296
+skip-if = os == 'win' # bug 1372296
 [browser_zero_area.js]
 [browser_test_display_contents.js]
 [browser_test_simple_transform.js]

accessible/tests/browser/browser.ini

@@ -14,22 +14,20 @@ skip-if = (os == 'linux' && debug && bits == 64) #Bug 1421307
 [browser_shutdown_multi_acc_reference_doc.js]
 [browser_shutdown_multi_reference.js]
 [browser_shutdown_parent_own_reference.js]
-skip-if = !e10s || (verify && debug && (os == 'win')) # e10s specific test for a11y start/shutdown between parent and content.
+skip-if = (verify && debug && (os == 'win'))
 [browser_shutdown_pref.js]
 [browser_shutdown_proxy_acc_reference.js]
-skip-if = !e10s || (os == 'win') # e10s specific test for a11y start/shutdown between parent and content.
+skip-if = (os == 'win')
 [browser_shutdown_proxy_doc_acc_reference.js]
-skip-if = !e10s || (os == 'win') || (verify && debug) # e10s specific test for a11y start/shutdown between parent and content.
+skip-if = (os == 'win') || (verify && debug)
 [browser_shutdown_multi_proxy_acc_reference_doc.js]
-skip-if = !e10s || (os == 'win') || (verify && debug && (os == 'linux')) # e10s specific test for a11y start/shutdown between parent and content.
+skip-if = (os == 'win') || (verify && debug && (os == 'linux'))
 [browser_shutdown_multi_proxy_acc_reference_obj.js]
-skip-if = !e10s || (os == 'win') || (verify && debug && (os == 'linux')) # e10s specific test for a11y start/shutdown between parent and content.
+skip-if = (os == 'win') || (verify && debug && (os == 'linux'))
 [browser_shutdown_remote_no_reference.js]
-skip-if = !e10s || (verify && debug && (os == 'win')) # e10s specific test for a11y start/shutdown between parent and content.
+skip-if = (verify && debug && (os == 'win'))
 [browser_shutdown_remote_only.js]
-skip-if = !e10s # e10s specific test for a11y start/shutdown between parent and content.
 [browser_shutdown_remote_own_reference.js]
-skip-if = !e10s # e10s specific test for a11y start/shutdown between parent and content.
 [browser_shutdown_scope_lifecycle.js]
 [browser_shutdown_start_restart.js]
 skip-if = (verify && debug)

accessible/tests/browser/e10s/browser.ini

@@ -33,7 +33,7 @@ skip-if = (os == "linux" && bits == 64) || (debug && os == "mac") || (debug && o
 
 # Events tests
 [browser_events_announcement.js]
-skip-if = e10s && os == 'win' # Bug 1288839
+skip-if = os == 'win' # Bug 1288839
 [browser_events_caretmove.js]
 [browser_events_hide.js]
 [browser_events_show.js]
@@ -51,7 +51,7 @@ skip-if = e10s && os == 'win' # Bug 1288839
 skip-if = (os == 'win' && os_version == '10.0' && bits == 64 && !debug) #Bug 1462638 - Disabled on Win10 opt/pgo for frequent failures
 [browser_treeupdate_cssoverflow.js]
 [browser_treeupdate_doc.js]
-skip-if = e10s && os == 'win' # Bug 1288839
+skip-if = os == 'win' # Bug 1288839
 [browser_treeupdate_gencontent.js]
 [browser_treeupdate_hidden.js]
 [browser_treeupdate_imagemap.js]
@@ -70,6 +70,6 @@ skip-if =
 [browser_treeupdate_whitespace.js]
 skip-if = true # Failing due to incorrect index of test container children on document load.
 [browser_obj_group.js]
-skip-if = e10s && os == 'win' # Only supported with cache enabled
+skip-if = os == 'win' # Only supported with cache enabled
 [browser_caching_position.js]
 [browser_caching_hittest.js]

accessible/tests/browser/events/browser.ini

@@ -10,7 +10,7 @@ environment =
 
 [browser_test_caret_move_granularity.js]
 [browser_test_docload.js]
-skip-if = e10s
+skip-if = true
 [browser_test_scrolling.js]
 skip-if =
   os == 'win' && bits == 64 && !debug # Bug 1636476

accessible/tests/browser/scroll/browser.ini

@@ -7,6 +7,6 @@ support-files =
   !/accessible/tests/mochitest/*.js
 
 [browser_test_zoom_text.js]
-skip-if = e10s && os == 'win' # bug 1372296
+skip-if = os == 'win' # bug 1372296
 [browser_test_scroll_bounds.js]
 [browser_test_scrollTo.js]

accessible/tests/browser/selectable/browser.ini

@@ -6,6 +6,6 @@ support-files =
   !/accessible/tests/mochitest/*.js
 
 [browser_test_select.js]
-skip-if = e10s && os == 'win' # bug 1372296
+skip-if = os == 'win' # bug 1372296
 [browser_test_aria_select.js]
-skip-if = e10s && os == 'win' # bug 1372296
+skip-if = os == 'win' # bug 1372296

browser/base/content/test/general/browser.ini

@@ -105,7 +105,6 @@ skip-if = true # Bug 1478159
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug537013.js]
 skip-if = true # bug 1393813
-# skip-if = e10s # Bug 1134458 - Find bar doesn't work correctly in a detached tab
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug537474.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
@@ -189,7 +188,7 @@ https_first_disabled = true
 skip-if = true # Disabled due to the clipboard not supporting real file types yet (bug 1288773)
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_contentAreaClick.js]
-skip-if = e10s # Clicks in content don't go through contentAreaClick with e10s.
+skip-if = true # Clicks in content don't go through contentAreaClick.
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_contentAltClick.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
@@ -286,7 +285,7 @@ support-files =
 skip-if = !crashreporter # test requires crashreporter due to 1536221
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_save_link-perwindowpb.js]
-skip-if = (e10s && debug && os == "win") || verify # Bug 1280505
+skip-if = (debug && os == "win") || verify # Bug 1280505
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_save_private_link_perwindowpb.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
@@ -325,7 +324,6 @@ skip-if =
 [browser_tabfocus.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_tabkeynavigation.js]
-skip-if = (os == "mac" && !e10s) # Bug 1237713 - OSX eats keypresses for some reason
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_tabs_close_beforeunload.js]
 support-files =
@@ -337,7 +335,6 @@ support-files =
 [browser_tabs_owner.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js]
-run-if = e10s
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_typeAheadFind.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
@@ -358,7 +355,7 @@ skip-if = true # Bug 1409184 disabled because interactive find next is not autom
 skip-if = (os == "win" && !debug)
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_zbug569342.js]
-skip-if = e10s || debug # Bug 1094240 - has findbar-related failures
+skip-if = true # Bug 1094240 - has findbar-related failures
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_addCertException.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
@@ -386,7 +383,6 @@ skip-if = os == "win" && os_version == "6.1" # bug 1715862
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_newwindow_focus.js]
 https_first_disabled = true
-skip-if = os == "linux" && !e10s # Bug 1263254 - Perma fails on Linux without e10s for some reason.
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug1299667.js]
 https_first_disabled = true

browser/base/content/test/pageinfo/browser.ini

@@ -13,7 +13,7 @@ support-files =
 support-files =
   all_images.html
 [browser_pageinfo_image_info.js]
-skip-if = (os == 'linux' && e10s) # bug 1161699
+skip-if = (os == 'linux') # bug 1161699
 [browser_pageinfo_permissions.js]
 [browser_pageinfo_rtl.js]
 [browser_pageinfo_security.js]

browser/base/content/test/performance/browser.ini

@@ -40,7 +40,6 @@ skip-if =
   socketprocess_networking
 [browser_startup.js]
 [browser_startup_content.js]
-skip-if = !e10s
 support-files =
   file_empty.html
 [browser_startup_content_subframe.js]

browser/base/content/test/popups/browser.ini

@@ -8,7 +8,7 @@ support-files =
   popup_blocker_a.html
   popup_blocker_b.html
   popup_blocker_10_popups.html
-skip-if = (os == 'linux') || (e10s && debug) # Frequent bug 1081925 and bug 1125520 failures
+skip-if = (os == 'linux') || debug # Frequent bug 1081925 and bug 1125520 failures
 [browser_popup_frames.js]
 https_first_disabled = true
 support-files =

browser/base/content/test/tabcrashed/browser.ini

@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = (!e10s || !crashreporter)
+skip-if = !crashreporter
 support-files =
   head.js
   file_contains_emptyiframe.html

browser/base/content/test/tabcrashed/browser_aboutRestartRequired.ini

@@ -1,6 +1,6 @@
 [DEFAULT]
 skip-if =
-  !debug || !e10s || !crashreporter
+  !debug || !crashreporter
 support-files =
   head.js
 prefs =

browser/base/content/test/tabs/browser.ini

@@ -82,19 +82,16 @@ skip-if = os == 'mac' # Skipped because macOS keyboard support requires changing
 https_first_disabled = true
 [browser_new_file_whitelisted_http_tab.js]
 https_first_disabled = true
-skip-if = !e10s # Test only relevant for e10s.
 [browser_new_tab_insert_position.js]
 https_first_disabled = true
 skip-if = (debug && os == 'linux' && bits == 32) #Bug 1455882, disabled on Linux32 for almost permafailing
 support-files = file_new_tab_page.html
 [browser_new_tab_in_privilegedabout_process_pref.js]
 https_first_disabled = true
 skip-if =
-  !e10s
-  os == 'linux' && debug && bits == 64  # Pref and test only relevant for e10s, Bug 1581500.
+  os == 'linux' && debug && bits == 64  # Bug 1581500.
 [browser_privilegedmozilla_process_pref.js]
 https_first_disabled = true
-skip-if = !e10s # Pref and test only relevant for e10s.
 [browser_newwindow_tabstrip_overflow.js]
 [browser_open_newtab_start_observer_notification.js]
 [browser_opened_file_tab_navigated_to_web.js]
@@ -129,7 +126,6 @@ skip-if =
 [browser_tabReorder_overflow.js]
 [browser_tabReorder.js]
 [browser_tabSpinnerProbe.js]
-skip-if = !e10s # Tab spinner is e10s only.
 [browser_tabSuccessors.js]
 [browser_tabswitch_contextmenu.js]
 [browser_tabswitch_updatecommands.js]

browser/base/content/test/webextensions/browser.ini

@@ -25,7 +25,6 @@ support-files =
 [browser_permissions_local_file.js]
 [browser_permissions_mozAddonManager.js]
 [browser_permissions_optional.js]
-skip-if = !e10s
 [browser_permissions_pointerevent.js]
 [browser_permissions_unsigned.js]
 skip-if = require_signing

browser/components/extensions/test/browser/browser.ini

@@ -218,7 +218,7 @@ skip-if = os == 'linux' && swgl && fission && tsan # high frequency intermittent
 [browser_ext_popup_shutdown.js]
 [browser_ext_port_disconnect_on_crash.js]
 https_first_disabled = true
-skip-if = !e10s || !crashreporter
+skip-if = !crashreporter
 [browser_ext_port_disconnect_on_window_close.js]
 [browser_ext_request_permissions.js]
 [browser_ext_runtime_openOptionsPage.js]
@@ -260,7 +260,7 @@ skip-if = true # Bug 1575369
 [browser_ext_simple.js]
 [browser_ext_slow_script.js]
 https_first_disabled = true
-skip-if = !e10s || debug || asan || (os == "win" && processor == "aarch64") # windows10-aarch64 due to 1534857
+skip-if = debug || asan || (os == "win" && processor == "aarch64") # windows10-aarch64 due to 1534857
 [browser_ext_tab_runtimeConnect.js]
 [browser_ext_tabs_attention.js]
 https_first_disabled = true
@@ -274,7 +274,6 @@ skip-if = os == "linux" && debug && bits == 32 # Bug 1350189
 [browser_ext_tabs_detectLanguage.js]
 https_first_disabled = true
 [browser_ext_tabs_discard.js]
-skip-if = !e10s
 [browser_ext_tabs_discard_reversed.js]
 https_first_disabled = true
 skip-if =

browser/components/preferences/tests/browser.ini

@@ -93,11 +93,9 @@ support-files = empty_pdf_file.pdf
 [browser_password_management.js]
 [browser_performance.js]
 [browser_performance_content_process_limit.js]
-skip-if = !e10s
 [browser_performance_e10srollout.js]
-skip-if = !e10s
 [browser_performance_non_e10s.js]
-skip-if = e10s
+skip-if = true
 [browser_permissions_checkPermissionsWereAdded.js]
 [browser_permissions_urlFieldHidden.js]
 [browser_proxy_backup.js]

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

@@ -66,6 +66,5 @@ tags = geolocation xr
 [browser_privatebrowsing_zoom.js]
 [browser_privatebrowsing_zoomrestore.js]
 [browser_privatebrowsing_newtab_from_popup.js]
-skip-if = (!e10s && os == "win" && (bits == 64)) # Bug 1354865
 [browser_privatebrowsing_blobUrl.js]
 [browser_oa_private_browsing_window.js]

browser/components/safebrowsing/content/test/browser.ini

@@ -5,7 +5,6 @@ support-files =
 
 [browser_bug400731.js]
 [browser_bug415846.js]
-# Disabled on Mac because of its bizarre special-and-unique snowflake of a help menu.
-skip-if = os == "mac" || e10s # e10s: Bug 1248632
+skip-if = true # Bug 1248632
 [browser_whitelisted.js]
 [browser_mixedcontent_aboutblocked.js]

browser/components/sessionstore/test/browser.ini

@@ -8,7 +8,7 @@
 # browser_580512.js is disabled for leaking browser windows (bug 752467)
 
 [DEFAULT]
-skip-if = os == 'linux' && !e10s
+skip-if = os == 'linux'
 support-files =
   head.js
   browser_formdata_sample.html
@@ -80,9 +80,8 @@ skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 support-files = file_async_duplicate_tab.html
 [browser_async_flushes.js]
 support-files = file_async_flushes.html
-run-if = e10s && crashreporter
+run-if = crashreporter
 [browser_async_remove_tab.js]
-run-if = e10s
 skip-if = !sessionHistoryInParent
 [browser_attributes.js]
 [browser_backup_recovery.js]
@@ -95,7 +94,7 @@ https_first_disabled = true
 [browser_crashedTabs.js]
 https_first_disabled = true
 skip-if =
-  !e10s || !crashreporter || verify
+  !crashreporter || verify
   win10_2004 && fission # high frequency intermittent, Bug 1684120 - timed out
   os == "mac" && fission # high frequency intermittent
 [browser_formdata_max_size.js]
@@ -107,11 +106,11 @@ skip-if = debug || ccov # Bug 1625525
 [browser_restored_window_features.js]
 [browser_unrestored_crashedTabs.js]
 skip-if =
-  !e10s || !crashreporter
+  !crashreporter
 [browser_revive_crashed_bg_tabs.js]
 https_first_disabled = true
 skip-if =
-  !e10s || !crashreporter
+  !crashreporter
 [browser_dying_cache.js]
 skip-if = (os == 'win') # bug 1331853
 [browser_dynamic_frames.js]
@@ -167,7 +166,6 @@ support-files =
 https_first_disabled = true
 [browser_swapDocShells.js]
 [browser_switch_remoteness.js]
-run-if = e10s
 [browser_upgrade_backup.js]
 skip-if = debug || asan || tsan || (verify && debug && os == 'mac') # Bug 1435394 disabled on Linux, OSX and Windows
 [browser_windowRestore_perwindowpb.js]
@@ -221,7 +219,7 @@ skip-if = (os == "win" && os_version == "10.0" && !ccov) # Bug 1418627
 [browser_528776.js]
 [browser_579868.js]
 [browser_579879.js]
-skip-if = (os == 'linux' && e10s && (debug||asan)) # Bug 1234404
+skip-if = (os == 'linux' && (debug||asan)) # Bug 1234404
 [browser_581937.js]
 [browser_586147.js]
 [browser_586068-apptabs.js]
@@ -299,7 +297,6 @@ https_first_disabled = true
 skip-if = os == "linux" && bits == 64 && os_version == "18.04" # bug 1446464
 [browser_911547.js]
 [browser_1284886_suspend_tab.js]
-skip-if = !e10s
 [browser_async_window_flushing.js]
 https_first_disabled = true
 [browser_focus_after_restore.js]
@@ -309,23 +306,20 @@ https_first_disabled = true
 https_first_disabled = true
 [browser_multiple_navigateAndRestore.js]
 skip-if = debug && os == 'linux' && bits == 64 #Bug 1570468
-run-if = e10s
 [browser_newtab_userTypedValue.js]
 skip-if = verify && debug
 [browser_parentProcessRestoreHash.js]
 https_first_disabled = true
-run-if = e10s
 tags = openUILinkIn
 [browser_send_async_message_oom.js]
 skip-if = fission # Tests that the frame script OOMs, which is unused in Fission.
 [browser_sessionStoreContainer.js]
 [browser_windowStateContainer.js]
 [browser_1234021.js]
 [browser_remoteness_flip_on_restore.js]
-run-if = e10s
 [browser_background_tab_crash.js]
 https_first_disabled = true
-run-if = e10s && crashreporter
+run-if = crashreporter
 # Disabled on debug for frequent intermittent failures:
 [browser_undoCloseById.js]
 skip-if = debug
@@ -336,7 +330,7 @@ skip-if = debug
 [browser_duplicate_history.js]
 [browser_tabicon_after_bg_tab_crash.js]
 skip-if =
-  !crashreporter || !e10s # Tabs can't crash without e10s
+  !crashreporter
 [browser_tabs_in_urlbar.js]
 https_first_disabled = true
 
@@ -357,7 +351,7 @@ skip-if = true #Bug 1455602
 https_first_disabled = true
 [browser_ignore_updates_crashed_tabs.js]
 https_first_disabled = true
-run-if = e10s && crashreporter
+run-if = crashreporter
 skip-if =
   asan
   (os == "win" && fission && verify) # bug 1709907