Backed out 5 changesets (bug 1809843) for causing Cargo related build bustages. CLOSED TREE

Backed out changeset 5c494680f448 (bug 1809843)
Backed out changeset 02742b38edab (bug 1809843)
Backed out changeset 2b9b32ca8294 (bug 1809843)
Backed out changeset 56631cb02ae6 (bug 1809843)
Backed out changeset 37e35a60a71f (bug 1809843)

Cargo.lock

@@ -2601,8 +2601,6 @@ version = "0.1.1"
 dependencies = [
  "base64",
  "bindgen 0.63.0",
- "http",
- "hyper",
  "log",
  "mio 0.6.23",
  "mio-extras",
@@ -2611,7 +2609,6 @@ dependencies = [
  "neqo-http3",
  "neqo-qpack",
  "neqo-transport",
- "tokio 1.17.0",
 ]
 
 [[package]]
@@ -4975,15 +4972,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "siphasher"
 version = "0.3.10"
@@ -5479,10 +5467,7 @@ dependencies = [
  "memchr",
  "mio 0.8.0",
  "num_cpus",
- "once_cell",
- "parking_lot 0.12.999",
  "pin-project-lite",
- "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "winapi",

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

@@ -8,5 +8,3 @@ prefs =
     javascript.options.asyncstack_capture_debuggee_only=false
 
 [test_ext_all_apis.html]
-skip-if =
-  http3

build/pgo/certs/http2-cert.ca

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDEzCCAfugAwIBAgIUCTTdK3eSofAM6mNwAi4Z4YUn8WEwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOIEhUVFAyIFRlc3QgQ0EwIhgPMjAxNzAxMDEwMDAwMDBa
-GA8yMDI3MDEwMTAwMDAwMFowGzEZMBcGA1UEAwwQIEhUVFAyIFRlc3QgQ2VydDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
-PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
-HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
-Dw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7
-EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SK
-lWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0C
-AwEAAaNNMEswSQYDVR0RBEIwQIIJbG9jYWxob3N0gg9mb28uZXhhbXBsZS5jb22C
-EGFsdDEuZXhhbXBsZS5jb22CEGFsdDIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEL
-BQADggEBAE5aEiXOkvEYeWpMhkGheeeaKwgr44qiWJKC5N/8t+NprB3vNCbTMzE9
-09iWQh9EXbwMjMQ8H0uZwedek2sryxsTzxsdTC5qmEtxs/kbf0rTNUwQDjGHvzMk
-gO+ULESdLTcIFJ57olHaZaXtPGm2ELJAOiEpsYFTafmCEPXZ/b+UkGsSkuVLSOIA
-ClaIJgjff/ucvCvRwl79GzGDCoh3qpqhvxQpC/Fcdz1iQDYEVAmjgUrYJe1lTfj8
-ZozM1WIq8fQ3SCXTJK82CnX818tJio2PWq3uzb9vhpuxJJif7WoMP88Jpdh8zcEb
-YL15XPzhQMyor2p6XfwNI3J6347fd7U=
------END CERTIFICATE-----

build/pgo/certs/http2-cert.ca.keyspec

@@ -1 +0,0 @@
-default

build/pgo/certs/http2-cert.certspec

@@ -1,4 +0,0 @@
-issuer: HTTP2 Test CA
-subject: HTTP2 Test Cert
-validity:20170101-20270101
-extension:subjectAlternativeName:localhost,foo.example.com,alt1.example.com,alt2.example.com

build/pgo/certs/mochitest-cert.ca

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDATCCAemgAwIBAgIUAeSb69XNazLEM2BEnfdqqHGMg+4wDQYJKoZIhvcNAQEL
-BQAwHTEbMBkGA1UEAwwSIE1vY2hpdGVzdCBUZXN0IENBMCIYDzIwMjIwMTAxMDAw
-MDAwWhgPMjAzMjAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFCBNb2NoaXRlc3QgVGVz
-dCBDZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB
-/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRx
-CHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMC
-OosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdm
-Wqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGz
-ey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUD
-rNoYCjXtjQIDAQABozMwMTAvBgNVHREEKDAmggptb2NoaS50ZXN0ggtleGFtcGxl
-LmNvbYILZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADggEBAD+eIJ+Dn8qEtMcj
-FKpf4mAQkSTzoAd0OFgujWY7a5NXS/rhr2n768vIN0cGreCBjlJKWTTbpc9Q6MK/
-wM5RCLkW5lt2hooN/vTgMCgKTlyomPXryWqk0kG04SDNFhSbkuJtoMIHvFHPRdwr
-f6U2FvSdJ4BgZ2BfCEWeLNCPhGnxmL83Q0nQX9FUVrY9vciq+QaK0UsDkdUKm+Hg
-xxCy6VAL5WbWr5MXrhWAl8Z7v2vQqfR/uhAb/r4CfZ0VfJ6HHAnBkkV769RQ/Mas
-/+DgE2ZGbXNLXP3IV1nDg6G+2yQU1xGc58drBzEqvOBRk8YyQSaPZyKSgG/6+PBx
-ZoDXYjE=
------END CERTIFICATE-----

build/pgo/certs/mochitest-cert.ca.keyspec

@@ -1 +0,0 @@
-default

build/pgo/certs/mochitest-cert.certspec

@@ -1,4 +0,0 @@
-issuer: Mochitest Test CA
-subject: Mochitest Test Cert
-validity:20220101-20320101
-extension:subjectAlternativeName:mochi.test,example.com,example.org

build/pgo/server-locations.txt

@@ -371,9 +371,3 @@ http://expired.example.com:80                   privileged
 http://redirect-example.com:80              privileged
 https://redirect-example.com:443            privileged,cert=bug1706126cert
 https://www.redirect-example.com:443        privileged,cert=bug1706126cert
-
-# DoH server
-https://foo.example.com:4433                privileged,cert=http2-cert.pem
-
-# Mochitest
-https://mochi.test:443                      privileged,cert=mochitest-cert.pem

caps/tests/mochitest/mochitest.ini

@@ -13,6 +13,4 @@ skip-if = os == 'android'
 [test_bug423375.html]
 [test_bug470804.html]
 [test_bug1367586.html]
-skip-if =
-  http3
 [test_disallowInheritPrincipal.html]

docshell/test/iframesandbox/mochitest.ini

@@ -26,5 +26,3 @@ tags = openwindow
 support-files =
   file_top_navigation_by_user_activation.html
   file_top_navigation_by_user_activation_iframe.html
-skip-if =
-  http3

docshell/test/mochitest/mochitest.ini

@@ -64,8 +64,6 @@ support-files =
 [test_bug385434.html]
 [test_bug387979.html]
 [test_bug402210.html]
-skip-if =
-  http3
 [test_bug404548.html]
 [test_bug413310.html]
 skip-if = true
@@ -77,12 +75,8 @@ skip-if = toolkit != "cocoa" || headless # Headless: bug 1410525
 support-files = file_bug511449.html
 [test_bug529119-1.html]
 [test_bug529119-2.html]
-skip-if =
-  http3
 [test_bug530396.html]
 support-files = bug530396-noref.sjs bug530396-subframe.html
-skip-if =
-  http3
 [test_bug540462.html]
 skip-if = toolkit == 'android' && debug
 [test_bug551225.html]
@@ -93,8 +87,6 @@ skip-if = (verify && !debug && (os == 'win'))
 [test_bug590573.html]
 [test_bug598895.html]
 [test_bug634834.html]
-skip-if =
-  http3
 [test_bug637644.html]
 [test_bug640387_1.html]
 [test_bug640387_2.html]
@@ -121,8 +113,6 @@ support-files = file_bug675587.html
 [test_bug1645781.html]
 support-files =
   form_submit.sjs
-skip-if =
-  http3
 [test_bug1729662.html]
 support-files =
   file_bug1729662.html
@@ -143,17 +133,13 @@ skip-if = toolkit == "android" && !sessionHistoryInParent
 support-files =
   file_bug1742865.sjs
   file_bug1742865_outer.sjs
-skip-if =
+skip-if = toolkit == "android" && debug && fission && verify # Bug 1745937
-  toolkit == "android" && debug && fission && verify # Bug 1745937
-  http3
 [test_bug1743353.html]
 support-files =
   file_bug1743353.html
 [test_bug1747033.html]
 support-files =
   file_bug1747033.sjs
-skip-if =
-  http3
 [test_bug1773192.html]
 support-files =
   file_bug1773192_1.html
@@ -166,41 +152,23 @@ support-files =
 support-files =
   file_content_javascript_loads_root.html
   file_content_javascript_loads_frame.html
-skip-if =
-  http3
 [test_forceinheritprincipal_overrule_owner.html]
-skip-if =
-  http3
 [test_framedhistoryframes.html]
 support-files = file_framedhistoryframes.html
-skip-if =
-  http3
 [test_load_during_reload.html]
 support-files = file_load_during_reload.html
 [test_pushState_after_document_open.html]
 [test_navigate_after_pagehide.html]
-skip-if =
-  http3
 [test_redirect_history.html]
 support-files =
   file_redirect_history.html
   form_submit_redirect.sjs
-skip-if =
-  http3
 [test_windowedhistoryframes.html]
-skip-if =
+skip-if = (!debug && os == 'android') # Bug 1573892
-  (!debug && os == 'android') # Bug 1573892
-  http3
 [test_triggeringprincipal_location_seturi.html]
-skip-if =
-  http3
 [test_double_submit.html]
 support-files =
   clicker.html
   double_submit.sjs
-skip-if =
-  http3
 [test_iframe_srcdoc_to_remote.html]
-skip-if =
-  http3
 [test_javascript_sandboxed_popup.html]

docshell/test/navigation/mochitest.ini

@@ -93,8 +93,6 @@ support-files =
 [test_beforeunload_and_bfcache.html]
 support-files = file_beforeunload_and_bfcache.html
 [test_bug13871.html]
-skip-if =
-  http3
 [test_bug1583110.html]
 support-files = file_bug1583110.html
 [test_bug1706090.html]
@@ -112,8 +110,6 @@ support-files = file_bug1750973.html
 support-files = file_bug1758664.html
 skip-if = !sessionHistoryInParent # the old implementation behaves inconsistently
 [test_bug270414.html]
-skip-if =
-  http3
 [test_bug278916.html]
 [test_bug279495.html]
 [test_bug344861.html]
@@ -121,9 +117,7 @@ skip-if = toolkit == "android"
 [test_bug386782.html]
 [test_bug430624.html]
 [test_bug430723.html]
-skip-if =
+skip-if = (!debug && (os == 'mac' || os == 'win')) # Bug 874423
-  (!debug && (os == 'mac' || os == 'win')) # Bug 874423
-  http3
 [test_bug1364364.html]
 skip-if = (os == "android") # Bug 1560378
 [test_bug1375833.html]
@@ -135,16 +129,12 @@ support-files =
   slow.sjs
   iframe_slow_onload.html
   iframe_slow_onload_inner.html
-skip-if =
-  http3
 [test_child.html]
 [test_docshell_gotoindex.html]
 support-files = file_docshell_gotoindex.html
 [test_evict_from_bfcache.html]
 support-files = file_evict_from_bfcache.html
 [test_grandchild.html]
-skip-if =
-  http3
 [test_load_history_entry.html]
 [test_meta_refresh.html]
 support-files = file_meta_refresh.html
@@ -160,8 +150,6 @@ support-files =
   file_new_shentry_during_history_navigation_3.html^headers^
   file_new_shentry_during_history_navigation_4.html
 [test_not-opener.html]
-skip-if =
-  http3
 [test_online_offline_bfcache.html]
 support-files = file_online_offline_bfcache.html
 [test_opener.html]
@@ -171,14 +159,10 @@ skip-if =
   win10_2004 # Bug 1572299
   win11_2009 # Bug 1797751
 [test_popup-navigates-children.html]
-skip-if =
-  http3
 [test_reload.html]
 support-files = file_reload.html
 [test_reload_nonbfcached_srcdoc.html]
 support-files = file_reload_nonbfcached_srcdoc.sjs
-skip-if =
-  http3
 [test_reserved.html]
 skip-if = 
   debug  # bug 1263213
@@ -195,8 +179,6 @@ support-files = file_sessionhistory_iframe_removal.html
 [test_session_history_entry_cleanup.html]
 [test_fragment_handling_during_load.html]
 [test_nested_frames.html]
-skip-if =
-  http3
 [test_shiftReload_and_pushState.html]
 [test_scrollRestoration.html]
 [test_bug1609475.html]
@@ -209,39 +191,23 @@ skip-if = toolkit == 'android' || sessionHistoryInParent # It relies on the bfca
 skip-if = true # This was disabled for a few years now anyway, bug 1677544
 [test_sibling-matching-parent.html]
 [test_sibling-off-domain.html]
-skip-if =
-  http3
 [test_triggeringprincipal_frame_nav.html]
-skip-if =
-  http3
 [test_triggeringprincipal_frame_same_origin_nav.html]
-skip-if =
-  http3
 [test_triggeringprincipal_window_open.html]
-skip-if =
-  http3
 [test_triggeringprincipal_parent_iframe_window_open.html]
-skip-if =
-  http3
 [test_triggeringprincipal_iframe_iframe_window_open.html]
-skip-if =
-  http3
 [test_contentpolicy_block_window.html]
 [test_rate_limit_location_change.html]
 [test_reload_large_postdata.html]
 support-files =
   file_reload_large_postdata.sjs
 [test_recursive_frames.html]
-skip-if =
-  http3
 [test_bug1699721.html]
 skip-if = !fission # tests fission-only process switching behaviour
 [test_ship_beforeunload_fired.html]
 support-files =
   file_ship_beforeunload_fired.html
-skip-if =
+skip-if = !sessionHistoryInParent
-  !sessionHistoryInParent
-  http3
 [test_ship_beforeunload_fired_2.html]
 support-files =
   file_ship_beforeunload_fired.html

dom/animation/test/mochitest.ini

@@ -57,7 +57,6 @@ support-files =
 skip-if =
   (os == 'android' && debug) #Bug 1784931
   (os == 'linux' && tsan) #Bug 1784931
-  http3
 [mozilla/test_restyling_xhr_doc.html]
 [mozilla/test_set_easing.html]
 [mozilla/test_style_after_finished_on_compositor.html]

dom/base/test/fullscreen/mochitest.ini

@@ -43,8 +43,5 @@ allow_xul_xbl = true  # XUL is used in file_fullscreen-api.html
 skip-if =
   toolkit == 'android'
   os == 'mac' && bits == 64 && debug # Bug 1579623
-  http3
 [test_fullscreen_meta_viewport.html]
 [test_fullscreen_modal.html]
-skip-if =
-  http3

dom/base/test/mochitest.ini

@@ -246,17 +246,9 @@ support-files =
   slow.sjs
 
 [test_anchor_area_referrer.html]
-skip-if =
-  http3
 [test_anchor_area_referrer_changing.html]
-skip-if =
-  http3
 [test_anchor_area_referrer_invalid.html]
-skip-if =
-  http3
 [test_anchor_area_referrer_rel.html]
-skip-if =
-  http3
 [test_anonymousContent_api.html]
 [test_anonymousContent_append_after_reflow.html]
 [test_anonymousContent_canvas.html]
@@ -269,8 +261,6 @@ skip-if = headless # Bug 1405867
 [test_async_setTimeout_stack.html]
 [test_async_setTimeout_stack_across_globals.html]
 [test_base.xhtml]
-skip-if =
-  http3
 [test_bug1433073.html]
 skip-if = (os == "android" || headless) # See
 [test_bug1730284.html]
@@ -307,8 +297,6 @@ support-files = file_bug1639328.html
 [test_bug320799.html]
 [test_bug322317.html]
 [test_bug326337.html]
-skip-if =
-  http3
 [test_bug331959.html]
 [test_bug333064.html]
 skip-if = headless # Headless: Bug 1405868
@@ -317,15 +305,11 @@ skip-if = headless # Headless: Bug 1405868
 [test_bug337631.html]
 [test_bug338541.xhtml]
 [test_bug338583.html]
-skip-if =
-  http3
 [test_bug338679.html]
 [test_bug339494.html]
 [test_bug339494.xhtml]
 [test_bug343596.html]
 [test_bug345339.html]
-skip-if =
-  http3
 [test_bug346485.html]
 [test_bug352728.html]
 [test_bug352728.xhtml]
@@ -354,9 +338,7 @@ support-files = file_bug357450.js
 [test_bug373181.xhtml]
 [test_bug375314.html]
 [test_bug375314-2.html]
-skip-if =
+skip-if = xorigin # Hangs, [Exception... "Component returned failure code: 0xc1f30100 (NS_ERROR_FACTORY_EXISTS) [nsIComponentRegistrar.registerFactory]"  nsresult: "0xc1f30100 (NS_ERROR_FACTORY_EXISTS)"  location: "JS frame :: createChromeScript :: createChromeScript :: line 40"  data: no]
-  xorigin # Hangs, [Exception... "Component returned failure code: 0xc1f30100 (NS_ERROR_FACTORY_EXISTS) [nsIComponentRegistrar.registerFactory]"  nsresult: "0xc1f30100 (NS_ERROR_FACTORY_EXISTS)"  location: "JS frame :: createChromeScript :: createChromeScript :: line 40"  data: no]
-  http3
 [test_bug378969.html]
 [test_bug380418.html]
 support-files = test_bug380418.html^headers^
@@ -371,8 +353,6 @@ support-files = test_bug380418.html^headers^
 [test_bug395915.html]
 [test_bug397234.html]
 [test_bug398243.html]
-skip-if =
-  http3
 [test_bug401662.html]
 [test_bug402150.html]
 support-files = test_bug402150.html^headers^
@@ -397,34 +377,20 @@ support-files = test_bug402150.html^headers^
 [test_bug420700.html]
 [test_bug421602.html]
 [test_bug422403-1.html]
-skip-if =
-  http3
 [test_bug422403-2.xhtml]
 [test_bug422537.html]
-skip-if =
-  http3
 [test_bug424212.html]
 [test_bug424359-1.html]
-skip-if =
-  http3
 [test_bug424359-2.html]
 [test_bug426308.html]
-skip-if =
-  http3
 [test_bug426646.html]
-skip-if =
-  http3
 [test_bug428847.html]
-skip-if =
-  http3
 [test_bug431082.html]
 [test_bug431701.html]
 [test_bug431833.html]
 [test_bug433533.html]
 [test_bug433662.html]
 [test_bug435425.html]
-skip-if =
-  http3
 [test_bug444322.html]
 [test_bug444546.html]
 disabled = Disabled for now. Mochitest is not reliable enough for these.
@@ -439,19 +405,13 @@ support-files = bug444546.sjs
 [test_bug454326.html]
 [test_bug455472.html]
 [test_bug455629.html]
-skip-if =
-  http3
 [test_bug456262.html]
 [test_bug457746.html]
 [test_bug459424.html]
 [test_bug461555.html]
 [test_bug461735.html]
-skip-if =
-  http3
 [test_bug465767.html]
 [test_bug466080.html]
-skip-if =
-  http3
 [test_bug466409.html]
 [test_bug466751.xhtml]
 [test_bug469020.html]
@@ -459,8 +419,6 @@ skip-if =
 [test_bug473162-1.html]
 [test_bug473162-2.html]
 [test_bug475156.html]
-skip-if =
-  http3
 [test_bug482935.html]
 [test_bug484396.html]
 [test_bug493881.html]
@@ -479,8 +437,6 @@ support-files = file_bug503473-frame.sjs
 [test_bug513194.html]
 [test_bug514487.html]
 [test_bug515401.html]
-skip-if =
-  http3
 [test_bug518104.html]
 support-files = file_bug518104.js
 [test_bug527896.html]
@@ -510,22 +466,14 @@ skip-if = (verify && (os == 'win'))
 [test_bug587931.html]
 [test_bug588990.html]
 [test_bug590812.html]
-skip-if =
+skip-if = (verify && !debug && (os == 'linux')) #bug 687032
-  (verify && !debug && (os == 'linux')) #bug 687032
-  http3
 [test_bug590870.html]
-skip-if =
-  http3
 [test_bug592366.html]
 [test_bug592829.html]
 [test_bug597345.html]
 [test_bug599295.html]
-skip-if =
-  http3
 [test_bug599588.html]
 [test_bug601803.html]
-skip-if =
-  http3
 [test_bug602838.html]
 [test_bug604592.html]
 [test_bug604660.html]
@@ -542,8 +490,6 @@ support-files = !/gfx/layers/apz/test/mochitest/apz_test_utils.js
 [test_bug628938.html]
 [test_bug631615.html]
 [test_bug638112.html]
-skip-if =
-  http3
 [test_bug647518.html]
 [test_bug650001.html]
 [test_bug650776.html]
@@ -566,27 +512,15 @@ skip-if =
 [test_bug693875.html]
 [test_bug694754.xhtml]
 [test_bug696301-1.html]
-skip-if =
-  http3
 [test_bug696301-2.html]
-skip-if =
-  http3
 [test_bug698381.html]
 [test_bug698384.html]
 [test_bug704063.html]
 [test_bug704320-1.html]
-skip-if =
-  http3
 [test_bug704320-2.html]
-skip-if =
-  http3
 [test_bug704320_policyset.html]
-skip-if =
-  http3
 [test_bug704320_policyset2.html]
 [test_bug704320_preload.html]
-skip-if =
-  http3
 [test_bug707142.html]
 [test_bug708620.html]
 [test_bug711047.html]
@@ -614,8 +548,6 @@ skip-if =
 [test_bug813919.html]
 [test_bug814576.html]
 [test_bug819051.html]
-skip-if =
-  http3
 [test_bug820909.html]
 [test_bug864595.html]
 [test_bug868999.html]
@@ -627,20 +559,14 @@ skip-if =
 [test_bug894874.html]
 [test_bug895974.html]
 [test_bug907892.html]
-skip-if =
-  http3
 [test_bug913761.html]
 [test_bug922681.html]
 [test_bug927196.html]
 [test_bug962251.html]
 [test_bug976673.html]
-skip-if =
-  http3
 [test_bug982153.html]
 [test_bug999456.html]
 [test_bug1022229.html]
-skip-if =
-  http3
 [test_bug1025933.html]
 [test_bug1037687.html]
 support-files = test_bug1037687_subframe.html
@@ -651,34 +577,22 @@ support-files = test_bug1037687_subframe.html
 [test_bug1070015.html]
 [test_bug1075702.html]
 [test_bug1091883.html]
-skip-if =
-  http3
 [test_bug1100912.html]
 support-files = file_bug1100912.html
 [test_bug1101364.html]
 [test_bug1118689.html]
 [test_bug1126851.html]
 [test_bug1163743.html]
-skip-if =
-  http3
 [test_bug1165501.html]
-skip-if =
-  http3
 [test_bug1187157.html]
 [test_bug1198095.html]
 [test_bug1238440.html]
 [test_bug1250148.html]
 [test_bug1259588.html]
 [test_bug1268962.html]
-skip-if =
-  http3
 [test_bug1222633.html]
-skip-if =
-  http3
 [test_bug1667316.html]
 [test_bug1222633_link_update.html]
-skip-if =
-  http3
 [test_bug1274806.html]
 [test_bug1281963.html]
 [test_bug1295852.html]
@@ -701,13 +615,9 @@ skip-if = toolkit == 'android' # Timeouts on android due to page closing issues
 support-files =
   iframe1_bug1640766.html
   iframe2_bug1640766.html
-skip-if =
-  http3
 [test_bug1648887.html]
 [test_caretPositionFromPoint.html]
 [test_change_policy.html]
-skip-if =
-  http3
 [test_clearTimeoutIntervalNoArg.html]
 [test_clipboard_nbsp.html]
 [test_constructor-assignment.html]
@@ -734,12 +644,8 @@ support-files = !/gfx/layers/apz/test/mochitest/apz_test_utils.js
 [test_custom_element.html]
 [test_custom_element_reflector.html]
 [test_current_inner_window.html]
-skip-if =
-  http3
 [test_document_wireframe.html]
-skip-if =
+skip-if = !sessionHistoryInParent
-  !sessionHistoryInParent
-  http3
 [test_domparser_null_char.html]
 [test_domparsing.html]
 [test_domrequest.html]
@@ -749,32 +655,20 @@ skip-if = toolkit == 'android' # Bug 1525959
 [test_element_closest.html]
 [test_elementTraversal.html]
 [test_embed_xorigin_document.html]
-skip-if =
-  http3
 [test_encodeToStringWithMaxLength.html]
 [test_encodeToStringWithRequiresReinitAfterOutput.html]
 [test_EventSource_redirects.html]
-skip-if =
-  http3
 [test_eventsource_event_listener_leaks.html]
 [test_eventsourceservice_basic.html]
-skip-if =
-  http3
 [test_eventsourceservice_reconnect_error.html]
-skip-if =
-  http3
 [test_eventsourceservice_status_error.html]
 [test_eventsourceservice_worker.html]
-skip-if =
-  http3
 [test_explicit_user_agent.html]
 [test_find.html]
 [test_find_nac.html]
 [test_find_bug1601118.html]
 [test_find_bug1654683.html]
 [test_focus_keyboard_event.html]
-skip-if =
-  http3
 [test_focus_shadow_dom_root.html]
 [test_focus_shadow_dom.html]
 [test_focus_scrollable_input.html]
@@ -786,8 +680,6 @@ support-files =
 [test_focus_display_none_xorigin_iframe.html]
 support-files =
   file_focus_display_none_xorigin_iframe_inner.html
-skip-if =
-  http3
 [test_getAttribute_after_createAttribute.html]
 [test_getElementById.html]
 [test_getTranslationNodes.html]
@@ -804,14 +696,8 @@ skip-if =
 [test_iframe_event_listener_leaks.html]
 skip-if = (processor == 'aarch64' && os == 'win') # aarch64 due to 1530895
 [test_iframe_referrer.html]
-skip-if =
-  http3
 [test_iframe_referrer_changing.html]
-skip-if =
-  http3
 [test_iframe_referrer_invalid.html]
-skip-if =
-  http3
 [test_Image_constructor.html]
 [test_innersize_scrollport.html]
 [test_input_vsync_alignment_lower_than_normal.html]
@@ -819,17 +705,9 @@ skip-if =
 [test_input_vsync_alignment_inner_event_loop.html]
 [test_integer_attr_with_leading_zero.html]
 [test_intersectionobservers.html]
-skip-if =
-  http3
 [test_link_prefetch.html]
-skip-if =
-  http3
 [test_link_preload.html]
-skip-if =
-  http3
 [test_link_stylesheet.html]
-skip-if =
-  http3
 [test_location_href_unknown_protocol.html]
 support-files = file_location_href_unknown_protocol.html
 [test_lock_orientation_after_fullscreen.html]
@@ -837,8 +715,6 @@ skip-if = toolkit != 'android' # Only run on Android.
 [test_lock_orientation_with_pending_fullscreen.html]
 skip-if = os == 'mac' || os == 'linux' || headless
 [test_meta_refresh_referrer.html]
-skip-if =
-  http3
 [test_mozMatchesSelector.html]
 [test_mutationobserver_anonymous.html]
 [test_mutationobservers.html]
@@ -865,11 +741,7 @@ skip-if = toolkit == 'android' # We don't ship pdf.js on Android
 skip-if = (os == 'win' && processor == 'aarch64')
 reason = Plugins are not supported on Windows/AArch64
 [test_postMessage_solidus.html]
-skip-if =
-  http3
 [test_postMessages_window.html]
-skip-if =
-  http3
 [test_postMessages_workers.html]
 [test_postMessages_broadcastChannel.html]
 [test_postMessages_messagePort.html]
@@ -1030,11 +902,7 @@ skip-if = debug == false
 [test_setTimeoutWith0.html]
 [test_setting_opener.html]
 [test_shared_compartment1.html]
-skip-if =
-  http3
 [test_shared_compartment2.html]
-skip-if =
-  http3
 [test_structuredclone_backref.html]
 [test_structuredclone_error.html]
 [test_style_cssText.html]
@@ -1042,9 +910,7 @@ skip-if =
 support-files =
   file_suppressed_events_and_scrolling.html
 [test_suppressed_events_nested_iframe.html]
-skip-if =
+skip-if = os == "android"
-  os == "android"
-  http3
 support-files =
   file_suppressed_events_top_xhr.html
   file_suppressed_events_top_modalstate.html
@@ -1076,14 +942,10 @@ support-files =
 [test_w3element_traversal.xhtml]
 [test_w3element_traversal_svg.html]
 [test_warning_for_blocked_cross_site_request.html]
-skip-if =
-  http3
 [test_window_close.html]
 [test_window_constructor.html]
 [test_window_content.html]
 [test_window_cross_origin_props.html]
-skip-if =
-  http3
 [test_window_define_nonconfigurable.html]
 [test_window_define_symbol.html]
 [test_window_element_enumeration.html]
@@ -1094,8 +956,6 @@ support-files = file_window_focus_by_close_and_open.html
 [test_window_indexing.html]
 [test_window_keys.html]
 [test_window_named_frame_enumeration.html]
-skip-if =
-  http3
 [test_window_own_props.html]
 [test_window_proto.html]
 [test_writable-replaceable.html]
@@ -1103,8 +963,5 @@ skip-if =
 skip-if =
     toolkit == 'android' && debug
     xorigin  # JavaScript error: http://mochi.test:8888/tests/dom/base/test/test_x-frame-options.html, line 48: TypeError: can't access property "textContent", this.content.document.getElementById(...) is null, JavaScript error: resource://gre/modules/ProcessSelector.jsm, line 56: TypeError: can't access property "tabCount", process is null
-    http3
 [test_youtube_flash_embed.html]
-skip-if =
-  http3
 # Please keep alphabetical order.

dom/bindings/test/mochitest.ini

@@ -21,9 +21,7 @@ prefs =
 [test_bug852846.html]
 [test_bug862092.html]
 [test_bug1036214.html]
-skip-if =
+skip-if = !debug
-  !debug
-  http3
 [test_bug1041646.html]
 [test_bug1123875.html]
 [test_barewordGetsWindow.html]
@@ -73,8 +71,6 @@ skip-if = debug == false
 [test_worker_UnwrapArg.html]
 [test_unforgeablesonexpando.html]
 [test_crossOriginWindowSymbolAccess.html]
-skip-if =
-  http3
 [test_primitive_this.html]
 [test_callback_exceptions.html]
 [test_bug1123516_maplikesetlike.html]

dom/broadcastchannel/tests/mochitest.ini

@@ -12,8 +12,6 @@ support-files =
   testUrl2_bfcache.html
 
 [test_broadcastchannel_basic.html]
-skip-if =
-  http3
 [test_broadcastchannel_close.html]
 [test_broadcastchannel_self.html]
 [test_broadcastchannel_sharedWorker.html]

dom/cache/test/mochitest/mochitest.ini

@@ -32,8 +32,6 @@ support-files =
 [test_cache_match_request.html]
 [test_cache_matchAll_request.html]
 [test_cache_overwrite.html]
-skip-if =
-  http3
 [test_cache_match_vary.html]
 [test_caches.html]
 [test_cache_keys.html]
@@ -55,8 +53,6 @@ skip-if = verify
   os == 'android' # bug 1468434 for android
   condprof  #: "The opaque response should be removed by caches.delete() and cache.delete()"
 [test_cache_untrusted.html]
-skip-if =
-  http3
 [test_cache_updateUsage.html]
 [test_chrome_constructor.html]
 [test_cache_worker_gc.html]

dom/canvas/test/crossorigin/mochitest.ini

@@ -8,8 +8,6 @@ support-files =
   video.sjs
 
 [test_canvas2d_crossorigin.html]
-skip-if =
-  http3
 [test_video_crossorigin.html]
 subsuite = gpu
 [test_webgl_crossorigin_textures.html]

dom/credentialmanagement/identity/tests/mochitest/mochitest.ini

@@ -35,12 +35,8 @@ support-files =
   server_idtoken_redirect_idtoken.sjs
 
 [test_simple.html]
-skip-if =
-  http3
 [test_no_accounts.html]
 [test_two_accounts.html]
-skip-if =
-  http3
 [test_accounts_error.html]
 [test_idtoken_error.html]
 [test_accounts_redirect.html]
@@ -49,6 +45,4 @@ skip-if =
 [test_get_without_providers.html]
 [test_empty_provider_list.html]
 [test_two_providers.html]
-skip-if =
-  http3
 [test_delay_reject.html]

dom/credentialmanagement/tests/mochitest/mochitest.ini

@@ -9,4 +9,3 @@ skip-if =
   xorigin  # Application time out
   win10_2004 # Bug 1718296
   win11_2009 # Bug 1718296
-  http3

dom/encoding/test/mochitest.ini

@@ -26,9 +26,5 @@ support-files =
 [test_TextDecoder.html]
 [test_TextEncoder.html]
 [test_TLD.html]
-skip-if =
-  http3
 [test_in_lk_TLD.html]
-skip-if =
-  http3
 [test_utf16_files.html]

dom/events/test/mochitest.ini

@@ -29,8 +29,6 @@ support-files =
 [test_accesskey.html]
 [test_addEventListenerExtraArg.html]
 [test_all_synthetic_events.html]
-skip-if =
-  http3
 [test_bug1539497.html]
 [test_bug1686716.html]
 [test_bug226361.xhtml]
@@ -53,11 +51,7 @@ skip-if = toolkit == 'android' # android: TIMED_OUT
 [test_bug418986-3.html]
 [test_bug422132.html]
 [test_bug426082.html]
-skip-if =
-  http3
 [test_bug427537.html]
-skip-if =
-  http3
 [test_bug428988.html]
 [test_bug432698.html]
 [test_bug443985.html]
@@ -116,9 +110,7 @@ skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug656954.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug659071.html]
-skip-if =
+skip-if = toolkit == 'android' # fail
-  toolkit == 'android' # fail
-  http3
 [test_bug659350.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug662678.html]
@@ -147,8 +139,6 @@ support-files =
 skip-if = debug #In order to be able to test touchmoves, the test needs to synthesize touchstart in a way which asserts
 [test_deviceSensor.html]
 [test_bug812744.html]
-skip-if =
-  http3
 [test_bug822898.html]
 [test_bug855741.html]
 [test_bug864040.html]
@@ -230,15 +220,11 @@ skip-if = toolkit == 'android' # Android doesn't have full zoom.
 [test_mouse_enterleave_iframe.html]
 support-files =
   file_mouse_enterleave.html
-skip-if =
+skip-if = toolkit == 'android' # timeout
-  toolkit == 'android' # timeout
-  http3
 [test_mouse_capture_iframe.html]
 support-files =
   file_empty.html
-skip-if =
+skip-if = toolkit == 'android' # timeout
-  toolkit == 'android' # timeout
-  http3
 [test_moz_mouse_pixel_scroll_event.html]
 [test_offsetxy.html]
 [test_onerror_handler_args.html]

dom/events/test/pointerevents/mochitest.ini

@@ -17,12 +17,8 @@ support-files =
 [test_bug1285128.html]
 [test_bug1293174_implicit_pointer_capture_for_touch_1.html]
 support-files = bug1293174_implicit_pointer_capture_for_touch_1.html
-skip-if =
-  http3
 [test_bug1293174_implicit_pointer_capture_for_touch_2.html]
 support-files = bug1293174_implicit_pointer_capture_for_touch_2.html
-skip-if =
-  http3
 [test_bug1303704.html]
 [test_bug1315862.html]
 [test_bug1323158.html]
@@ -47,67 +43,41 @@ support-files =
 support-files =
   wpt/pointerevent_attributes_hoverable_pointers-manual.html
   wpt/resources/pointerevent_attributes_hoverable_pointers-iframe.html
-skip-if =
-  http3
 [test_wpt_pointerevent_attributes_nohover_pointers-manual.html]
 support-files =
   wpt/pointerevent_attributes_nohover_pointers-manual.html
   wpt/resources/pointerevent_attributes_hoverable_pointers-iframe.html
-skip-if =
-  http3
 [test_wpt_pointerevent_boundary_events_in_capturing-manual.html]
 support-files = wpt/pointerevent_boundary_events_in_capturing-manual.html
-skip-if =
-  http3
 [test_wpt_pointerevent_change-touch-action-onpointerdown_touch-manual.html]
 support-files = wpt/pointerevent_change-touch-action-onpointerdown_touch-manual.html
 disabled = disabled
 [test_wpt_pointerevent_constructor.html]
 support-files = wpt/pointerevent_constructor.html
-skip-if =
-  http3
 [test_wpt_pointerevent_multiple_primary_pointers_boundary_events-manual.html]
 support-files = wpt/pointerevent_multiple_primary_pointers_boundary_events-manual.html
 disabled = should be investigated
 [test_wpt_pointerevent_pointercancel_touch-manual.html]
 support-files = wpt/pointerevent_pointercancel_touch-manual.html
-skip-if =
-  http3
 [test_wpt_pointerevent_pointerId_scope-manual.html]
 support-files = wpt/resources/pointerevent_pointerId_scope-iframe.html
 disabled = should be investigated
 [test_wpt_pointerevent_pointerleave_after_pointercancel_touch-manual.html]
 support-files = wpt/pointerevent_pointerleave_after_pointercancel_touch-manual.html
-skip-if =
-  http3
 [test_wpt_pointerevent_pointerleave_pen-manual.html]
 support-files = wpt/pointerevent_pointerleave_pen-manual.html
-skip-if =
-  http3
 [test_wpt_pointerevent_pointerout_after_pointercancel_touch-manual.html]
 support-files = wpt/pointerevent_pointerout_after_pointercancel_touch-manual.html
-skip-if =
-  http3
 [test_wpt_pointerevent_pointerout_pen-manual.html]
 support-files = wpt/pointerevent_pointerout_pen-manual.html
-skip-if =
-  http3
 [test_wpt_pointerevent_releasepointercapture_events_to_original_target-manual.html]
 support-files = wpt/pointerevent_releasepointercapture_events_to_original_target-manual.html
-skip-if =
-  http3
 [test_wpt_pointerevent_releasepointercapture_onpointercancel_touch-manual.html]
 support-files = wpt/pointerevent_releasepointercapture_onpointercancel_touch-manual.html
-skip-if =
-  http3
 [test_wpt_pointerevent_sequence_at_implicit_release_on_drag-manual.html]
 support-files = wpt/pointerevent_sequence_at_implicit_release_on_drag-manual.html
-skip-if =
-  http3
 [test_wpt_pointerevent_drag_interaction-manual.html]
 support-files = wpt/html/pointerevent_drag_interaction-manual.html
-skip-if =
-  http3
 [test_wpt_touch_action.html]
 skip-if =
   os == 'android' # Bug 1312791
@@ -140,8 +110,6 @@ support-files =
 support-files =
   wpt/pointerlock/pointerevent_movementxy-manual.html
   wpt/pointerlock/resources/pointerevent_movementxy-iframe.html
-skip-if =
-  http3
 [test_trigger_fullscreen_by_pointer_events.html]
 support-files =
   file_test_trigger_fullscreen.html

dom/file/ipc/tests/mochitest.ini

@@ -5,8 +5,6 @@ support-files = script_file.js
 [test_ipcBlob_workers.html]
 [test_ipcBlob_createImageBitmap.html]
 support-files = green.jpg
-skip-if =
-  http3
 [test_ipcBlob_emptyMultiplex.html]
 [test_ipcBlob_mixedMultiplex.html]
 support-files = ok.sjs

dom/file/tests/mochitest.ini

@@ -22,8 +22,6 @@ support-files =
 [test_blobURL_expiring.html]
 [test_file_from_blob.html]
 [test_nonascii_blob_url.html]
-skip-if =
-  http3
 [test_file_negative_date.html]
 [test_fileapi_basic.html]
 [test_fileapi_encoding.html]
@@ -40,9 +38,7 @@ skip-if = (verify && !debug && (os == 'win'))
 [test_fileapi_slice_memFile_2.html]
 [test_fileapi_slice_image.html]
 [test_mozfiledataurl.html]
-skip-if =
+skip-if = toolkit == 'android' #TIMED_OUT
-  toolkit == 'android' #TIMED_OUT
-  http3
 [test_bug1507893.html]
 support-files = worker_bug1507893.js
 [test_bug1742540.html]
@@ -50,5 +46,3 @@ support-files = worker_bug1742540.js
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_blob_reading.html]
 support-files = common_blob_reading.js worker_blob_reading.js
-skip-if =
-  http3

dom/html/test/mochitest.ini

@@ -265,8 +265,6 @@ skip-if = toolkit == 'android' # Bug 1525959
 [test_bug456229.html]
 [test_bug458037.xhtml]
 allow_xul_xbl = true
-skip-if =
-  http3
 [test_bug460568.html]
 [test_bug481335.xhtml]
 skip-if = toolkit == 'android' #TIMED_OUT
@@ -335,8 +333,6 @@ skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug605125-2.html]
 [test_bug606817.html]
 [test_bug607145.html]
-skip-if =
-  http3
 [test_bug610212.html]
 [test_bug610687.html]
 [test_bug611189.html]
@@ -374,8 +370,6 @@ support-files =
   bug649134/file_bug649134-1.sjs
   bug649134/file_bug649134-2.sjs
   bug649134/index.html
-skip-if =
-  http3
 [test_bug651956.html]
 [test_bug658746.html]
 [test_bug659596.html]
@@ -429,8 +423,6 @@ skip-if = toolkit == 'android' # Bug 1525959
 [test_bug1287321.html]
 [test_bug1323815.html]
 [test_change_crossorigin.html]
-skip-if =
-  http3
 [test_checked.html]
 [test_dir_attributes_reflection.html]
 [test_dl_attributes_reflection.html]
@@ -448,8 +440,6 @@ skip-if = toolkit == 'android'
 [test_htmlcollection.html]
 [test_iframe_sandbox_general.html]
 tags = openwindow
-skip-if =
-  http3
 [test_iframe_sandbox_inheritance.html]
 tags = openwindow
 [test_iframe_sandbox_navigation.html]
@@ -496,8 +486,6 @@ tags = openwindow
 [test_bug1823.html]
 [test_bug57600.html]
 [test_bug196523.html]
-skip-if =
-  http3
 [test_bug199692.html]
 [test_bug255820.html]
 [test_bug259332.html]
@@ -539,22 +527,17 @@ skip-if = true # Disabled permanently (bug 559932).
 skip-if = toolkit == "android" # Android: needs control of popup window size
 [test_non-ascii-cookie.html]
 support-files = file_cookiemanager.js
-skip-if =
+# Bug 1617611: Fix all the tests broken by "cookies SameSite=lax by default"
-  xorigin
+skip-if = xorigin
-  http3
 [test_bug765780.html]
 [test_bug871161.html]
 support-files = file_bug871161-1.html file_bug871161-2.html
-skip-if =
-  http3
 [test_bug1013316.html]
 [test_window_open_close.html]
 tags = openwindow
 skip-if = (toolkit == "android" && debug) || (os == "linux") || (os == "win" && debug && bits == 64) # Bug 1533759
 [test_viewport_resize.html]
 [test_image_clone_load.html]
-skip-if =
-  http3
 [test_bug1203668.html]
 [test_bug1166138.html]
 [test_bug1230665.html]
@@ -568,20 +551,14 @@ skip-if = (os == 'android' || os == 'mac')
 [test_bug1261674-2.html]
 skip-if = (os == 'mac')
 [test_bug1260704.html]
-skip-if =
-  http3
 [test_allowMedia.html]
 skip-if = (verify && (os == 'linux' || os == 'win')) || ((!debug && os == "mac" && bits == 64) || (debug && os == "win") || (debug && os == "linux" && os_version == '18.04')) #Bug 1434744
 [test_bug1292522_same_domain_with_different_port_number.html]
-skip-if =
-  http3
 [test_bug1295719_event_sequence_for_arrow_keys.html]
 skip-if = os == "android" # up/down arrow keys not supported on android
 [test_bug1295719_event_sequence_for_number_keys.html]
 [test_bug1310865.html]
 [test_bug1315146.html]
-skip-if =
-  http3
 [test_bug1322678.html]
 skip-if = toolkit == "android"
 [test_bug1472426.html]

dom/indexedDB/test/mochitest.ini

@@ -118,28 +118,20 @@ support-files =
 [test_abort_on_reload.html]
 support-files =
   abort_on_reload.html
-skip-if =
-  http3
 [test_add_put.html]
 [test_add_twice_failure.html]
 [test_advance.html]
 [test_autoIncrement.html]
 [test_autoIncrement_indexes.html]
 [test_bfcache.html]
-skip-if =
-  http3
 [test_blob_file_backed.html]
 [test_blob_simple.html]
 [test_blob_worker_crash.html]
 skip-if = os == 'win' && os_version == '6.1' # Bug 1342415
 [test_blob_worker_xhr_post.html]
-skip-if =
+skip-if = (os == 'win' && os_version == '6.1') || (verify && (os == 'win')) # Bug 1342415
-  (os == 'win' && os_version == '6.1') || (verify && (os == 'win')) # Bug 1342415
-  http3
 [test_blob_worker_xhr_post_multifile.html]
-skip-if =
+skip-if = os == 'win' && os_version == '6.1' # Bug 1342415
-  os == 'win' && os_version == '6.1' # Bug 1342415
-  http3
 [test_blob_worker_xhr_read.html]
 [test_blob_worker_xhr_read_slice.html]
 [test_blocked_order.html]
@@ -249,8 +241,6 @@ support-files =
   third_party_window.html
   third_party_iframe1.html
   third_party_iframe2.html
-skip-if =
-  http3
 [test_traffic_jam.html]
 [test_transaction_abort.html]
 [test_transaction_abort_hang.html]

dom/ipc/tests/mochitest.ini

@@ -14,10 +14,6 @@ skip-if =
 [test_window_open_discarded_bc.html]
 skip-if = toolkit == 'android'
 [test_bcg_processes.html]
-skip-if =
-  http3
 [test_browsingcontext_currenturi.html]
 support-files =
   file_broadcast_currenturi_onload.html
-skip-if =
-  http3

dom/midi/tests/mochitest.ini

@@ -8,9 +8,7 @@ scheme = https
 [test_midi_permission_allow.html]
 [test_midi_permission_deny.html]
 [test_midi_permission_gated.html]
-skip-if =
+skip-if = os == 'android' #Bug 1747637
-  os == 'android' #Bug 1747637
-  http3
 [test_midi_device_enumeration.html]
 [test_midi_device_implicit_open_close.html]
 [test_midi_device_explicit_open_close.html]

dom/notification/test/mochitest/mochitest.ini

@@ -13,10 +13,6 @@ skip-if = xorigin # Bug 1792790
 # This test needs to be run on HTTP (not HTTPS).
 [test_notification_insecure_context.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_notification_permissions.html]
 scheme = https
 [test_notification_tag.html]
-skip-if =
-  http3

dom/origin-trials/tests/mochitest/mochitest.ini

@@ -22,5 +22,3 @@ scheme = https
 support-files =
   file_subdomain_good_frame.html
   file_subdomain_bad_frame.html
-skip-if =
-  http3

dom/performance/tests/mochitest.ini

@@ -31,14 +31,8 @@ skip-if = true # Bug 1571904
 [test_timeOrigin.html]
 skip-if = toolkit == 'android' # Bug 1525959
 [test_worker_performance_entries.html]
-skip-if =
+skip-if = toolkit == 'android' # Bug 1525959
-  toolkit == 'android' # Bug 1525959
-  http3
 [test_performance_timing_json.html]
 [test_performance_server_timing.html]
 scheme = https
-skip-if =
-  http3
 [test_performance_server_timing_plain_http.html]
-skip-if =
-  http3

dom/quota/test/mochitest/mochitest.ini

@@ -7,8 +7,6 @@ support-files =
   helpers.js
 
 [test_simpledb.html]
-skip-if =
-  http3
 [test_storage_manager_persist_allow.html]
 fail-if = xorigin
 scheme=https

dom/reporting/tests/mochitest.ini

@@ -6,10 +6,6 @@ prefs =
 
 [test_deprecated.html]
 support-files = common_deprecated.js worker_deprecated.js
-skip-if =
-  http3
 [test_memoryPressure.html]
 [test_delivering.html]
 support-files = delivering.sjs iframe_delivering.html worker_delivering.js
-skip-if =
-  http3

dom/security/test/cors/mochitest.ini

@@ -6,11 +6,5 @@ support-files =
   file_CrossSiteXHR_server.sjs
 
 [test_CrossSiteXHR.html]
-skip-if =
-  http3
 [test_CrossSiteXHR_cache.html]
-skip-if =
-  http3
 [test_CrossSiteXHR_origin.html]
-skip-if =
-  http3

dom/security/test/csp/mochitest.ini

@@ -251,30 +251,20 @@ prefs =
   javascript.options.experimental.shadow_realms=true
 
 [test_base-uri.html]
-skip-if =
-  http3
 [test_blob_data_schemes.html]
 [test_blob_uri_blocks_modals.html]
-skip-if =
+skip-if = xorigin && os == "linux" && (asan || tsan) # alert should be blocked by CSP - got false, expected true
-  xorigin
-  os == "linux"
-  (asan || tsan) # alert should be blocked by CSP - got false, expected true
-  http3
 [test_bug1777572.html]
 support-files = file_bug1777572.html
 skip-if = toolkit == 'android' # This unusual window.close/open test times out on Android.
 [test_connect-src.html]
 [test_CSP.html]
-skip-if =
-  http3
 [test_bug1452037.html]
 [test_allow_https_schemes.html]
 [test_bug663567.html]
 skip-if =
   fission && xorigin && debug && os == "win"  # Bug 1716406 - New fission platform triage
 [test_bug802872.html]
-skip-if =
-  http3
 [test_bug885433.html]
 [test_bug888172.html]
 [test_bug1505412.html]
@@ -283,37 +273,23 @@ skip-if = !debug
 [test_evalscript_blocked_by_strict_dynamic.html]
 [test_evalscript_allowed_by_strict_dynamic.html]
 [test_frameancestors.html]
-skip-if =
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
-  xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
-  http3
 [test_frameancestors_userpass.html]
-skip-if =
-  http3
 [test_inlinescript.html]
 [test_inlinestyle.html]
 [test_invalid_source_expression.html]
 [test_bug836922_npolicies.html]
-skip-if =
+skip-if = verify
-  verify
-  http3
 [test_bug886164.html]
 [test_redirects.html]
-skip-if =
-  http3
 [test_bug910139.html]
 skip-if = verify
 [test_bug909029.html]
 [test_bug1229639.html]
-skip-if =
-  http3
 [test_bug1579094.html]
 [test_frame_ancestors_ro.html]
-skip-if =
-  http3
 [test_policyuri_regression_from_multipolicy.html]
 [test_nonce_source.html]
-skip-if =
-  http3
 [test_nonce_redirects.html]
 [test_bug941404.html]
 [test_form-action.html]
@@ -321,43 +297,23 @@ skip-if =
 skip-if =
   fission && xorigin && debug  # Bug 1716406 - New fission platform triage
 [test_scheme_relative_sources.html]
-skip-if =
-  http3
 [test_ignore_unsafe_inline.html]
 skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object, [Child 3789, Main Thread] WARNING: NS_ENSURE_TRUE(request) failed: file /builds/worker/checkouts/gecko/netwerk/base/nsLoadGroup.cpp, line 591
 [test_self_none_as_hostname_confusion.html]
 [test_empty_directive.html]
 [test_path_matching.html]
-skip-if =
-  http3
 [test_path_matching_redirect.html]
-skip-if =
-  http3
 [test_report_uri_missing_in_report_only_header.html]
 [test_report.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_301_redirect.html]
-skip-if =
-  http3
 [test_302_redirect.html]
-skip-if =
-  http3
 [test_303_redirect.html]
-skip-if =
-  http3
 [test_307_redirect.html]
-skip-if =
-  http3
 [test_subframe_run_js_if_allowed.html]
 [test_leading_wildcard.html]
-skip-if =
-  http3
 [test_multi_policy_injection_bypass.html]
 [test_null_baseuri.html]
-skip-if =
-  http3
 [test_dual_header.html]
 [test_win_open_blocked.html]
 [test_upgrade_insecure.html]
@@ -365,106 +321,63 @@ skip-if =
   os == 'linux' && bits == 64 # Bug 1620516
   os == "android" # Bug 1777028
 [test_upgrade_insecure_reporting.html]
-skip-if =
-  http3
 [test_upgrade_insecure_cors.html]
-skip-if =
-  http3
 [test_upgrade_insecure_loopback.html]
 [test_report_for_import.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_blocked_uri_in_reports.html]
-skip-if =
-  http3
 [test_service_worker.html]
 [test_child-src_worker.html]
-skip-if =
-  http3
 [test_child-src_worker_data.html]
-skip-if =
-  http3
 [test_child-src_worker-redirect.html]
-skip-if =
-  http3
 [test_child-src_iframe.html]
-skip-if =
-  http3
 [test_meta_element.html]
 [test_meta_header_dual.html]
 [test_docwrite_meta.html]
 [test_multipartchannel.html]
-skip-if =
-  http3
 [test_fontloader.html]
 [test_block_all_mixed_content.html]
 tags = mcb
 [test_block_all_mixed_content_frame_navigation.html]
 tags = mcb
-skip-if =
-  http3
 [test_form_action_blocks_url.html]
 [test_meta_whitespace_skipping.html]
 [test_iframe_sandbox.html]
 skip-if =
   fission && xorigin && debug && (os == "win" || os == "linux")  # Bug 1716406 - New fission platform triage
-  http3
 [test_iframe_sandbox_top_1.html]
 [test_sandbox.html]
 skip-if = true # Bug 1657934
 [test_ping.html]
-skip-if =
-  http3
 [test_sendbeacon.html]
 [test_upgrade_insecure_docwrite_iframe.html]
 [test_bug1242019.html]
 [test_bug1312272.html]
 [test_strict_dynamic.html]
-skip-if =
-  http3
 [test_strict_dynamic_parser_inserted.html]
-skip-if =
-  http3
 [test_strict_dynamic_default_src.html]
-skip-if =
-  http3
 [test_upgrade_insecure_navigation.html]
-skip-if =
-  http3
 [test_punycode_host_src.html]
-skip-if =
-  http3
 [test_iframe_sandbox_srcdoc.html]
 skip-if =
   fission && xorigin && debug && os == "win"  # Bug 1716406 - New fission platform triage
 [test_iframe_srcdoc.html]
 [test_image_nonce.html]
 [test_websocket_self.html]
-skip-if =
+skip-if = toolkit == 'android' # no websocket support Bug 982828
-  toolkit == 'android' # no websocket support Bug 982828
-  http3
 [test_websocket_localhost.html]
-skip-if =
+skip-if = toolkit == 'android' # no websocket support Bug 982828
-  toolkit == 'android' # no websocket support Bug 982828
-  http3
 [test_ignore_xfo.html]
-skip-if =
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
-  xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
-  http3
 [test_data_csp_inheritance.html]
 [test_data_csp_merge.html]
 [test_report_font_cache.html]
-skip-if =
-  http3
 [test_data_doc_ignore_meta_csp.html]
 [test_meta_csp_self.html]
 [test_uir_top_nav.html]
 support-files =
   file_uir_top_nav.html
   file_uir_top_nav_dummy.html
-skip-if =
-  http3
 [test_sandbox_allow_scripts.html]
 support-files =
   file_sandbox_allow_scripts.html
@@ -478,16 +391,12 @@ support-files =
   file_spawn_worker.js
   file_spawn_shared_worker.js
   file_spawn_service_worker.js
-skip-if =
-  http3
 [test_frame_src.html]
 support-files =
   file_frame_src_frame_governs.html
   file_frame_src_child_governs.html
   file_frame_src.js
   file_frame_src_inner.html
-skip-if =
-  http3
 [test_security_policy_violation_event.html]
 [test_csp_worker_inheritance.html]
 support-files =
@@ -495,8 +404,6 @@ support-files =
   worker_helper.js
   main_csp_worker.html
   main_csp_worker.html^headers^
-skip-if =
-  http3
 [test_nonce_snapshot.html]
 support-files =
   file_nonce_snapshot.sjs
@@ -507,8 +414,6 @@ support-files =
   file_windowwatcher_subframeC.html
   file_windowwatcher_subframeD.html
   file_windowwatcher_win_open.html
-skip-if =
-  http3
 [test_script_template.html]
 support-files =
   file_script_template.html
@@ -521,8 +426,6 @@ support-files =
 support-files =
   file_navigate_to.sjs
   file_navigate_to_request.html
-skip-if =
-  http3
 [test_independent_iframe_csp.html]
 [test_xslt_inherits_csp.html]
 support-files =
@@ -551,8 +454,6 @@ support-files =
   file_upgrade_insecure_navigation_redirect.sjs
   file_upgrade_insecure_navigation_redirect_same_origin.html
   file_upgrade_insecure_navigation_redirect_cross_origin.html
-skip-if =
-  http3
 [test_csp_style_src_empty_hash.html]
 [test_csp_frame_ancestors_about_blank.html]
 support-files =
@@ -563,14 +464,10 @@ support-files =
   file_blocked_uri_redirect_frame_src.html
   file_blocked_uri_redirect_frame_src.html^headers^
   file_blocked_uri_redirect_frame_src_server.sjs
-skip-if =
-  http3
 [test_blocked_uri_in_violation_event_after_redirects.html]
 support-files =
   file_blocked_uri_in_violation_event_after_redirects.html
   file_blocked_uri_in_violation_event_after_redirects.sjs
-skip-if =
-  http3
 [test_bug1738418.html]
 support-files =
   file_bug1738418_parent.html

dom/security/test/general/mochitest.ini

@@ -25,12 +25,8 @@ support-files =
   window_nosniff_navigation.html
 
 [test_contentpolicytype_targeted_link_iframe.html]
-skip-if =
-  http3
 [test_nosniff.html]
 [test_cache_split.html]
-skip-if =
-  http3
 [test_nosniff_navigation.html]
 [test_block_script_wrong_mime.html]
 [test_block_toplevel_data_navigation.html]
@@ -41,35 +37,19 @@ skip-if = toolkit == 'android' # no pdf reader on Android
 [test_block_subresource_redir_to_data.html]
 [test_same_site_cookies_subrequest.html]
 fail-if = xorigin # Cookies set incorrectly
-skip-if =
-  http3
 [test_same_site_cookies_toplevel_nav.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_same_site_cookies_cross_origin_context.html]
-skip-if =
-  http3
 [test_same_site_cookies_from_script.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_same_site_cookies_redirect.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_same_site_cookies_toplevel_set_cookie.html]
 fail-if = xorigin # Cookies not set
-skip-if =
-  http3
 [test_same_site_cookies_iframe.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_same_site_cookies_about.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_assert_about_page_no_csp.html]
 skip-if = !debug
 [test_same_site_cookies_laxByDefault.html]
@@ -77,18 +57,12 @@ skip-if =  debug
 support-files = closeWindow.sjs
 [test_xfo_error_page.html]
 support-files = file_xfo_error_page.sjs
-skip-if =
-  http3
 [test_bug1450853.html]
-skip-if =
-  http3
 [test_meta_referrer.html]
 support-files =
   file_meta_referrer_in_head.html
   file_meta_referrer_notin_head.html
 [test_bug1660452_http.html]
-skip-if =
-  http3
 [test_bug1660452_https.html]
 scheme = https
 [test_gpc.html]

dom/security/test/https-first/mochitest.ini

@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = http3
 
 [test_fragment.html]
 support-files = file_fragment.html

dom/security/test/https-only/mochitest.ini

@@ -10,32 +10,20 @@ prefs =
 
 [test_resource_upgrade.html]
 scheme=https
-skip-if =
-  http3
 [test_redirect_upgrade.html]
 scheme=https
 fail-if = xorigin
-skip-if =
-  http3
 [test_http_background_request.html]
 support-files = file_http_background_request.sjs
-skip-if =
-  http3
 [test_http_background_auth_request.html]
 support-files = file_http_background_auth_request.sjs
-skip-if =
-  http3
 [test_break_endless_upgrade_downgrade_loop.html]
-skip-if =
+skip-if = (toolkit == 'android') # no support for error pages, Bug 1697866
-  (toolkit == 'android') # no support for error pages, Bug 1697866
-  http3
 support-files =
   file_break_endless_upgrade_downgrade_loop.sjs
   file_user_gesture.html
 [test_user_suggestion_box.html]
-skip-if =
+skip-if = toolkit == 'android' # no https-only errorpage support in android
-  toolkit == 'android' # no https-only errorpage support in android
-  http3
 [test_fragment.html]
 support-files = file_fragment.html
 [test_insecure_reload.html]

dom/security/test/mixedcontentblocker/mochitest.ini

@@ -28,13 +28,9 @@ skip-if =
     (verify && !debug && os == 'linux')  # Android: TIMED_OUT; bug 1402554
     tsan  # Times out / Memory consumption, bug 1612707
 [test_bug803225.html]
-skip-if =
+skip-if = (os=='linux' && bits==32) || headless || tsan # Linux32:bug 1324870; Headless:bug 1405870; tsan:bug 1612707
-  (os=='linux' && bits==32) || headless || tsan # Linux32:bug 1324870; Headless:bug 1405870; tsan:bug 1612707
-  http3
 [test_frameNavigation.html]
 skip-if =
     true  # Bug 1424752
 [test_redirect.html]
 [test_bug1551886.html]
-skip-if =
-  http3

dom/security/test/referrer-policy/mochitest.ini

@@ -7,12 +7,6 @@ support-files =
   referrer_testserver.sjs
 
 [test_img_referrer.html]
-skip-if =
-  http3
 [test_referrer_header_current_document.html]
-skip-if =
-  http3
 [test_referrer_redirect.html]
 # Please keep alphabetical order.
-skip-if =
-  http3

dom/security/test/sec-fetch/mochitest.ini

@@ -10,10 +10,7 @@ support-files =
 [test_trustworthy_loopback.html]
 skip-if =
   os == "linux" && !fission  # Bug 1805760
-  http3
 support-files = file_trustworthy_loopback.html
 [test_websocket.html]
-skip-if =
+skip-if = toolkit == 'android' # no websocket support Bug 982828
-  toolkit == 'android' # no websocket support Bug 982828
-  http3
 support-files = file_websocket_wsh.py

dom/security/test/sri/mochitest.ini

@@ -38,11 +38,7 @@ support-files =
 
 [test_script_sameorigin.html]
 [test_script_crossdomain.html]
-skip-if =
-  http3
 [test_style_crossdomain.html]
-skip-if =
-  http3
 [test_style_sameorigin.html]
 [test_bug_1271796.html]
 [test_bug_1364262.html]

dom/serviceworkers/test/mochitest-common.ini

@@ -234,16 +234,12 @@ skip-if =
 [test_claim_oninstall.html]
 [test_controller.html]
 [test_cross_origin_url_after_redirect.html]
-skip-if =
-  http3
 [test_devtools_bypass_serviceworker.html]
 [test_empty_serviceworker.html]
 [test_enabled_pref.html]
 [test_error_reporting.html]
 skip-if = serviceworker_e10s
 [test_escapedSlashes.html]
-skip-if =
-  http3
 [test_eval_allowed.html]
 [test_event_listener_leaks.html]
 skip-if = (os == "win" && processor == "aarch64") #bug 1535784
@@ -273,12 +269,9 @@ skip-if =
   apple_catalina && !debug # Bug 1717091
 scheme = https
 [test_imagecache.html]
-skip-if =
-  http3
 [test_imagecache_max_age.html]
 skip-if =
   os == 'linux' && bits == 64 && !debug && asan && os_version == '18.04' # Bug 1585668
-  http3
 [test_importscript.html]
 [test_install_event.html]
 [test_install_event_gc.html]
@@ -287,9 +280,7 @@ skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/Simpl
 [test_match_all.html]
 [test_match_all_advanced.html]
 [test_match_all_client_id.html]
-skip-if =
+skip-if = toolkit == 'android'
-  toolkit == 'android'
-  http3
 [test_match_all_client_properties.html]
 skip-if = toolkit == 'android'
 [test_navigationPreload_disable_crash.html]
@@ -305,9 +296,8 @@ skip-if = serviceworker_e10s # leaks InterceptedHttpChannel and others things
 skip-if = xorigin # Bug 1792790
 [test_notification_openWindow.html]
 skip-if =
-  toolkit == 'android'  # Bug 1620052
+    toolkit == 'android'  # Bug 1620052
-  xorigin  # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
+    xorigin  # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
-  http3
 support-files = notification_openWindow_worker.js file_notification_openWindow.html
 tags = openwindow
 [test_notificationclick-otherwindow.html]
@@ -321,28 +311,16 @@ skip-if = xorigin # Bug 1792790
 [test_onmessageerror.html]
 skip-if = xorigin # Hangs with no error log
 [test_opaque_intercept.html]
-skip-if =
-  http3
 [test_origin_after_redirect.html]
-skip-if =
-  http3
 [test_origin_after_redirect_cached.html]
-skip-if =
-  http3
 [test_origin_after_redirect_to_https.html]
 [test_origin_after_redirect_to_https_cached.html]
 [test_post_message.html]
 [test_post_message_advanced.html]
 [test_post_message_source.html]
 [test_register_base.html]
-skip-if =
-  http3
 [test_register_https_in_http.html]
-skip-if =
-  http3
 [test_sandbox_intercept.html]
-skip-if =
-  http3
 [test_sanitize.html]
 [test_scopes.html]
 [test_script_loader_intercepted_js_cache.html]
@@ -353,12 +331,8 @@ skip-if = serviceworker_e10s
 [test_service_worker_allowed.html]
 [test_serviceworker.html]
 [test_serviceworker_header.html]
-skip-if =
-  http3
 [test_serviceworker_interfaces.html]
 [test_serviceworker_not_sharedworker.html]
-skip-if =
-  http3
 [test_skip_waiting.html]
 [test_streamfilter.html]
 [test_strict_mode_warning.html]
@@ -374,5 +348,3 @@ skip-if = verify
 [test_worker_reference_gc_timeout.html]
 [test_workerupdatefoundevent.html]
 [test_xslt.html]
-skip-if =
-  http3

dom/serviceworkers/test/mochitest.ini

@@ -15,8 +15,6 @@ tags = condprof
 [test_cookie_fetch.html]
 [test_csp_upgrade-insecure_intercept.html]
 [test_eventsource_intercept.html]
-skip-if =
-  http3
 [test_https_fetch.html]
 skip-if = condprof  #: timed out
 [test_https_fetch_cloned_response.html]
@@ -27,13 +25,11 @@ skip-if = condprof  #: timed out
 [test_importscript_mixedcontent.html]
 tags = mcb
 [test_openWindow.html]
-skip-if =
+skip-if = 
-  toolkit == 'android' # Bug 1620052
+    toolkit == 'android' # Bug 1620052
-  xorigin # Bug 1792790
+    xorigin # Bug 1792790
   condprof  #: timed out
-  http3
 tags = openwindow
 [test_sanitize_domain.html]
-skip-if =
+
-  http3
 [include:mochitest-common.ini]

dom/tests/mochitest/beacon/mochitest.ini

@@ -7,16 +7,8 @@ support-files = beacon-frame.html
 
 [test_beacon.html]
 [test_beaconFrame.html]
-skip-if =
-  http3
 [test_beaconPreflightWithCustomContentType.html]
-skip-if =
-  http3
 [test_beaconContentPolicy.html]
 [test_beaconOriginHeader.html]
-skip-if =
+skip-if = verify
-  verify
-  http3
 [test_beaconRedirect.html]
-skip-if =
-  http3

dom/tests/mochitest/bugs/mochitest.ini

@@ -42,8 +42,6 @@ support-files =
 
 [test_DOMWindowCreated_chromeonly.html]
 [test_bug132255.html]
-skip-if =
-  http3
 [test_bug1551425_reference_to_childnodes_nodelist_keeps_childnodes_alive.html]
 [test_bug159849.html]
 [test_bug289714.html]
@@ -51,13 +49,9 @@ fail-if = xorigin
 [test_bug260264.html]
 skip-if = toolkit == 'android'
 [test_bug260264_nested.html]
-skip-if =
-  http3
 [test_bug265203.html]
 [test_bug291377.html]
 [test_bug304459.html]
-skip-if =
-  http3
 [test_bug308856.html]
 [test_bug327891.html]
 [test_bug333983.html]
@@ -65,9 +59,7 @@ skip-if =
 [test_bug342448.html]
 [test_bug345521.html]
 [test_bug346659.html]
-skip-if =
+skip-if = toolkit == 'android' && debug
-  toolkit == 'android' && debug
-  http3
 [test_bug369306.html]
 skip-if = condprof  #: "The focus should not have been changed with URL=test2_bug369306.htm"
 [test_bug370098.html]
@@ -84,15 +76,11 @@ tags = openwindow
 [test_bug42976.html]
 [test_bug430276.html]
 [test_bug440572.html]
-skip-if =
-  http3
 [test_bug456151.html]
 [test_bug458091.html]
 skip-if = toolkit == 'android' # Bug 1525959
 [test_bug459848.html]
 [test_bug465263.html]
-skip-if =
-  http3
 [test_bug484775.html]
 [test_bug492925.html]
 [test_bug49312.html]
@@ -143,21 +131,14 @@ fail-if = xorigin
 [test_bug862540.html]
 [test_bug873229.html]
 support-files = file_bug873229.js
-skip-if =
-  http3
 [test_bug876098.html]
 [test_bug927901.html]
-skip-if =
-  http3
 [test_devicemotion_multiple_listeners.html]
 skip-if =
   os == 'android'  # Bug 1780219
-  http3
 [test_domparser_after_blank.html]
 [test_errorReporting.html]
 [test_navigator_buildID.html]
-skip-if =
-  http3
 [test_onerror_message.html]
 [test_protochains.html]
 [test_resize_move_windows.html]
@@ -177,16 +158,10 @@ skip-if = toolkit == 'android' #Windows can't change size on Android
 [test_bug1160342_marquee.html]
 [test_bug1171215.html]
 support-files = window_bug1171215.html
-skip-if =
-  http3
 [test_bug1530292.html]
 [test_instanceof_error_message.html]
 [test_no_find_showDialog.html]
 skip-if = toolkit == 'android' # Bug 1358633 - window.find doesn't work for Android
 [test_postmessage.html]
-skip-if =
+skip-if = xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
-  xorigin # JavaScript error: http://mochi.xorigin-test:8888/tests/SimpleTest/TestRunner.js, line 157: SecurityError: Permission denied to access property "wrappedJSObject" on cross-origin object
-  http3
 [test_bug1774135.html]
-skip-if =
-  http3

dom/tests/mochitest/dom-level0/mochitest.ini

@@ -13,31 +13,13 @@ support-files =
   file_test_background_loading_iframes.html
 
 [test_crossdomainprops.html]
-skip-if =
-  http3
 [test_innerWidthHeight_script.html]
 [test_location.html]
-skip-if =
-  http3
 [test_location_framed.html]
-skip-if =
-  http3
 [test_location_getters.html]
-skip-if =
-  http3
 [test_location_sandboxed.html]
-skip-if =
-  http3
 [test_location_setters.html]
-skip-if =
-  http3
 [test_setting_document.domain_idn.html]
-skip-if =
-  http3
 [test_setting_document.domain_to_shortened_ipaddr.html]
-skip-if =
-  http3
 [test_separate_post_message_queue.html]
 [test_background_loading_iframes.html]
-skip-if =
-  http3

dom/tests/mochitest/dom-level2-core/mochitest.ini

@@ -74,8 +74,6 @@ support-files =
 [test_documentimportnode01.html]
 [test_documentimportnode02.html]
 [test_documentimportnode03.html]
-skip-if =
-  http3
 [test_documentimportnode04.html]
 [test_documentimportnode05.html]
 [test_documentimportnode06.html]

dom/tests/mochitest/fetch/mochitest.ini

@@ -56,37 +56,21 @@ support-files =
 [test_fetch_basic_http_sw_empty_reroute.html]
 [test_fetch_cached_redirect.html]
 [test_fetch_cors.html]
-skip-if =
-  http3
 [test_fetch_cors_sw_reroute.html]
-skip-if =
+skip-if = os == "android" # Bug 1623134
-  os == "android" # Bug 1623134
-  http3
 [test_fetch_cors_sw_empty_reroute.html]
-skip-if =
+skip-if = os == "android" # Bug 1623134
-  os == "android" # Bug 1623134
-  http3
 [test_fetch_csp_block.html]
 [test_fetch_observer.html]
-skip-if =
-  http3
 [test_fetch_user_control_rp.html]
-skip-if =
-  http3
 [test_formdataparsing.html]
 [test_formdataparsing_sw_reroute.html]
 [test_request.html]
 [test_request_context.html]
 [test_request_sw_reroute.html]
 [test_response.html]
-skip-if =
-  http3
 [test_response_sw_reroute.html]
-skip-if =
-  http3
 [test_temporaryFileBlob.html]
 [test_readableStreams.html]
 scheme=https
-skip-if =
-  http3
 [test_responseReadyForWasm.html]

dom/tests/mochitest/general/mochitest.ini

@@ -93,23 +93,15 @@ skip-if = headless # bug 1403542
 [test_DOMMatrix.html]
 [test_domWindowUtils.html]
 [test_domWindowUtils_scrollbarSize.html]
-skip-if =
-  http3
 [test_domWindowUtils_scrollXY.html]
 [test_donottrack.html]
 [test_focus_scrollchildframe.html]
 [test_focus_legend_noparent.html]
 [test_for_of.html]
 [test_framedhistoryframes.html]
-skip-if =
-  http3
 [test_frameElementWrapping.html]
-skip-if =
-  http3
 [test_img_mutations.html]
 [test_interfaces.html]
-skip-if =
-  http3
 [test_interfaces_secureContext.html]
 scheme = https
 [test_media_queries_with_zoom.html]
@@ -124,9 +116,7 @@ support-files = test_offsets.js
 [test_paste_selection.html]
 [test_performance_now.html]
 [test_performance_timeline.html]
-skip-if =
+skip-if = verify
-  verify
-  http3
 [test_performance_nav_timing_before_onload.html]
 [test_picture_apng.html]
 [test_picture_mutations.html]
@@ -134,30 +124,16 @@ skip-if =
 [test_pointerPreserves3DClip.html]
 [test_pointerPreserves3DPerspective.html]
 [test_resource_timing.html]
-skip-if =
+skip-if = verify
-  verify
-  http3
 [test_resource_timing_cross_origin.html]
-skip-if =
-  http3
 [test_resource_timing_frameset.html]
-skip-if =
-  http3
 [test_selectevents.html]
 skip-if = toolkit == 'android' # bug 1627523
 [test_showModalDialog_removed.html]
 [test_storagePermissionsAccept.html]
-skip-if =
-  http3
 [test_storagePermissionsLimitForeign.html]
-skip-if =
-  http3
 [test_storagePermissionsReject.html]
-skip-if =
-  http3
 [test_storagePermissionsRejectForeign.html]
-skip-if =
-  http3
 [test_stylesheetPI.html]
 [test_toggling_performance_navigation_timing.html]
 skip-if =
@@ -165,18 +141,11 @@ skip-if =
   os == 'mac' && bits == 64 && !debug # Bug 1730152
 [test_vibrator.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_WebKitCSSMatrix.html]
 [test_windowedhistoryframes.html]
-skip-if =
-  http3
 [test_windowProperties.html]
 [test_resource_timing_nocors.html]
-skip-if =
-  http3
 [test_resizeby.html]
 skip-if = (toolkit == 'android') || (devedition && os == 'win' && bits == 32) || (os == 'linux' && bits == 64) # Window sizes cannot be controled on android; Windows: bug 1540554; Bug 1604152
 [test_resource_timing_cross_origin_navigate.html]
-skip-if =
+
-  http3

dom/tests/mochitest/geolocation/mochitest.ini

@@ -72,11 +72,7 @@ support-files = popup.html
 # This test REQUIRES to run on HTTP (_NOT_ HTTPS).
 [test_geoWatchPositionBlockedInInsecureContext.html]
 scheme = http
-skip-if =
-  http3
 
 # This test REQUIRES to run on HTTP (_NOT_ HTTPS).
 [test_geoGetCurrentPositionBlockedInInsecureContext.html]
 scheme = http
-skip-if =
-  http3

dom/tests/mochitest/localstorage/mochitest.ini

@@ -27,37 +27,19 @@ skip-if = verify
 [test_cookieBlock.html]
 [test_embededNulls.html]
 [test_keySync.html]
-skip-if =
-  http3
 [test_localStorageBase.html]
 [test_localStorageBaseSessionOnly.html]
 [test_localStorageCookieSettings.html]
 [test_localStorageEnablePref.html]
 [test_localStorageKeyOrder.html]
-skip-if =
-  http3
 [test_localStorageOriginsDiff.html]
-skip-if =
-  http3
 [test_localStorageOriginsDomainDiffs.html]
-skip-if =
-  http3
 [test_localStorageOriginsEquals.html]
-skip-if =
-  http3
 [test_localStorageOriginsPortDiffs.html]
-skip-if =
-  http3
 [test_localStorageOriginsSchemaDiffs.html]
-skip-if =
-  http3
 [test_localStorageQuota.html]
-skip-if =
-  http3
 [test_localStorageQuotaSessionOnly.html]
 [test_localStorageQuotaSessionOnly2.html]
 skip-if = true # bug 1347690
 [test_localStorageReplace.html]
-skip-if =
-  http3
 [test_storageConstructor.html]

dom/tests/mochitest/sessionstorage/mochitest.ini

@@ -11,18 +11,8 @@ support-files =
 [test_sessionStorageBase.html]
 [test_sessionStorageBaseSessionOnly.html]
 [test_sessionStorageClone.html]
-skip-if =
-  http3
 [test_sessionStorageClone_alwaysPartitioned.html]
-skip-if =
-  http3
 [test_sessionStorageClone_alwaysPartitioned_exempted.html]
-skip-if =
-  http3
 [test_sessionStorageHttpHttps.html]
-skip-if =
-  http3
 [test_sessionStorageReplace.html]
-skip-if =
-  http3
 [test_sessionStorageUsage.html]

dom/tests/mochitest/storageevent/mochitest.ini

@@ -11,15 +11,7 @@ support-files =
   interOriginTest2.js
 
 [test_storageLocalStorageEventCheckNoPropagation.html]
-skip-if =
-  http3
 [test_storageLocalStorageEventCheckPropagation.html]
-skip-if =
-  http3
 [test_storageNotifications.html]
 [test_storageSessionStorageEventCheckNoPropagation.html]
-skip-if =
-  http3
 [test_storageSessionStorageEventCheckPropagation.html]
-skip-if =
-  http3

dom/tests/mochitest/whatwg/mochitest.ini

@@ -19,50 +19,22 @@ support-files =
 [test_bug477323.html]
 [test_document_scripts.html]
 [test_MessageEvent_dispatchToOther.html]
-skip-if =
-  http3
 [test_MessageEvent.html]
 [test_postMessage_basehref.html]
-skip-if =
-  http3
 [test_postMessage_closed.html]
-skip-if =
+skip-if = toolkit == 'android' #bug 894914 - wrong data - got FAIL, expected message
-  toolkit == 'android' #bug 894914 - wrong data - got FAIL, expected message
-  http3
 [test_postMessage_hash.html]
-skip-if =
-  http3
 [test_postMessage.html]
-skip-if =
-  http3
 [test_postMessage_idn.xhtml]
-skip-if =
-  http3
 [test_postMessage_joined.html]
-skip-if =
-  http3
 [test_postMessage_onOther.html]
-skip-if =
-  http3
 [test_postMessage_origin.xhtml]
-skip-if =
-  http3
 [test_postMessage_override.html]
-skip-if =
-  http3
 [test_postMessage_special.xhtml]
-skip-if =
-  http3
 [test_postMessage_structured_clone.html]
-skip-if =
-  http3
 [test_postMessage_throw.html]
 [test_postMessage_transfer.html]
-skip-if =
-  http3
 [test_postMessage_userpass.html]
-skip-if =
-  http3
 [test_bug500328.html]
 skip-if = true # bug 696306
 support-files = file_bug500328_1.html file_bug500328_2.html

dom/u2f/tests/mochitest.ini

@@ -26,7 +26,6 @@ skip-if =
   xorigin # Hangs
   win10_2004 # Bug 1718296 (Windows 10 1903+ has its own window and U2F that we cannot control with tests.)
   win11_2009 # Bug 1718296 (Windows 10 1903+ has its own window and U2F that we cannot control with tests.)
-  http3
 [test_register.html]
 skip-if =
   xorigin # Hangs
@@ -44,20 +43,16 @@ skip-if =
   win11_2009 # Bug 1718296 (Windows 10 1903+ has its own window and U2F that we cannot control with tests.)
 [test_appid_facet_insecure.html]
 scheme = http
-skip-if =
-  http3
 [test_appid_facet_subdomain.html]
 skip-if =
   xorigin # Hangs
   win10_2004 # Bug 1718296 (Windows 10 1903+ has its own window and U2F that we cannot control with tests.)
   win11_2009 # Bug 1718296 (Windows 10 1903+ has its own window and U2F that we cannot control with tests.)
-  http3
 [test_multiple_keys.html]
 skip-if =
   xorigin # Hangs
   win10_2004 # Bug 1718296 (Windows 10 1903+ has its own window and U2F that we cannot control with tests.)
   win11_2009 # Bug 1718296 (Windows 10 1903+ has its own window and U2F that we cannot control with tests.)
-  http3
 [test_override_request.html]
 skip-if =
   toolkit == 'android'  # Bug 1530681

dom/websocket/tests/mochitest.ini

@@ -1,7 +1,5 @@
 [DEFAULT]
-skip-if =
+skip-if = toolkit == 'android' # bug 982828
-  toolkit == 'android' # bug 982828
-  http3
 support-files =
   !/dom/events/test/event_leak_utils.js
   file_websocket_basic_wsh.py

dom/websocket/tests/websocket_hybi/mochitest.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-skip-if =
-  http3
 support-files =
   file_binary-frames_wsh.py
   file_check-binary-messages_wsh.py

dom/workers/test/mochitest.ini

@@ -129,8 +129,6 @@ support-files =
 [test_bug1060621.html]
 [test_bug1062920.html]
 [test_bug1063538.html]
-skip-if =
-  http3
 [test_bug1104064.html]
 [test_bug1132395.html]
 skip-if = true # bug 1176225
@@ -145,8 +143,6 @@ skip-if = true # bug 1176225
 [test_csp.html]
 [test_dataURLWorker.html]
 [test_errorPropagation.html]
-skip-if =
-  http3
 [test_errorwarning.html]
 [test_eventDispatch.html]
 [test_fibonacci.html]
@@ -158,12 +154,8 @@ tags = mcb
 [test_loadEncoding.html]
 [test_loadError.html]
 [test_location.html]
-skip-if =
-  http3
 [test_longThread.html]
 [test_multi_sharedWorker.html]
-skip-if =
-  http3
 [test_multi_sharedWorker_lifetimes_nobfcache.html]
 [test_multi_sharedWorker_lifetimes_bfcache.html]
 [test_navigator.html]
@@ -171,8 +163,6 @@ support-files =
   test_navigator.js
   test_navigator_iframe.html
   test_navigator_iframe.js
-skip-if =
-  http3
 [test_navigator_secureContext.html]
 scheme=https
 support-files =
@@ -189,8 +179,6 @@ support-files =
 [test_promise_resolved_with_string.html]
 [test_recursion.html]
 [test_recursiveOnerror.html]
-skip-if =
-  http3
 [test_resolveWorker.html]
 [test_resolveWorker-assignment.html]
 [test_rvals.html]
@@ -199,11 +187,7 @@ skip-if =
 support-files =
   sharedWorker_thirdparty_frame.html
   sharedWorker_thirdparty_window.html
-skip-if =
-  http3
 [test_simpleThread.html]
-skip-if =
-  http3
 [test_suspend.html]
 [test_terminate.html]
 [test_threadErrors.html]
@@ -212,17 +196,11 @@ skip-if =
 [test_timeoutTracing.html]
 [test_transferable.html]
 [test_worker_interfaces.html]
-skip-if =
-  http3
 [test_worker_interfaces_secureContext.html]
 scheme=https
 [test_referrer.html]
 [test_referrer_header_worker.html]
-skip-if =
-  http3
 [test_importScripts_3rdparty.html]
-skip-if =
-  http3
 [test_sharedWorker_ports.html]
 [test_sharedWorker_lifetime.html]
 [test_navigator_workers_hardwareConcurrency.html]

dom/worklet/tests/mochitest.ini

@@ -12,8 +12,6 @@ skip-if = release_or_beta # requires dom.postMessage.sharedArrayBuffer.bypassCOO
 support-files=worklet_audioWorklet_WASM.js
 [test_audioWorklet_insecureContext.html]
 scheme = http
-skip-if =
-  http3
 [test_audioWorklet_options.html]
 skip-if = release_or_beta # requires dom.postMessage.sharedArrayBuffer.bypassCOOP_COEP.insecure.enabled
 support-files=worklet_audioWorklet_options.js

dom/xhr/tests/mochitest.ini

@@ -69,19 +69,13 @@ support-files =
   worker_bug1697539.js
 
 [test_bug1070763.html]
-skip-if =
-  http3
 [test_bug1300552.html]
-skip-if =
-  http3
 [test_bug1788125.html]
 [test_html_in_xhr.html]
 [test_relativeLoad.html]
 [test_sync_xhr_timer.xhtml]
 [test_sync_xhr_unload.html]
 [test_temporaryFileBlob.html]
-skip-if =
-  http3
 [test_worker_terminateSyncXHR.html]
 [test_worker_xhr.html]
 [test_worker_xhr2.html]
@@ -90,51 +84,31 @@ support-files = window_worker_xhr_3rdparty.html
 # Bug 1617611: Fix all the tests broken by "cookies SameSite=lax by default"
 skip-if = xorigin
 [test_worker_xhr_cors_redirect.html]
-skip-if =
-  http3
 [test_worker_xhr_headers.html]
-skip-if =
-  http3
 [test_worker_xhr_implicit_cancel.html]
 [test_worker_xhr_parameters.html]
 [test_worker_xhr_responseURL.html]
-skip-if =
-  http3
 [test_worker_xhr_system.html]
-skip-if =
-  http3
 [test_worker_xhr_timeout.html]
 [test_worker_xhrAbort.html]
 skip-if = (os == "win") || (os == "mac")
 [test_XHR.html]
 [test_xhr_abort_after_load.html]
 [test_XHR_anon.html]
-skip-if =
-  http3
 [test_xhr_forbidden_headers.html]
 [test_XHR_header.html]
-skip-if =
-  http3
 [test_XHR_onuploadprogress.html]
 [test_xhr_overridemimetype_throws_on_invalid_state.html]
 [test_XHR_parameters.html]
 [test_xhr_progressevents.html]
-skip-if =
-  http3
 [test_xhr_send.html]
 [test_xhr_send_readystate.html]
 [test_XHR_system.html]
-skip-if =
-  http3
 [test_XHR_timeout.html]
 support-files = test_XHR_timeout.js
 [test_xhr_withCredentials.html]
 [test_XHRDocURI.html]
-skip-if =
-  http3
 [test_XHRResponseURL.html]
-skip-if =
-  http3
 [test_XHRSendData.html]
 [test_sync_xhr_document_write_with_iframe.html]
 skip-if = toolkit == "android" && debug

dom/xml/test/mochitest.ini

@@ -10,5 +10,3 @@ support-files =
 [test_bug343870.xhtml]
 [test_bug355213.xhtml]
 [test_bug691215.html]
-skip-if =
-  http3

editor/spellchecker/tests/mochitest.ini

@@ -27,20 +27,12 @@ support-files =
 [test_bug596333.html]
 [test_bug636465.html]
 [test_bug678842.html]
-skip-if =
-  http3
 [test_bug697981.html]
 [test_bug717433.html]
-skip-if =
-  http3
 [test_bug1100966.html]
 [test_bug1154791.html]
 [test_bug1200533.html]
-skip-if =
-  http3
 [test_bug1204147.html]
-skip-if =
-  http3
 [test_bug1205983.html]
 [test_bug1209414.html]
 [test_bug1219928.html]
@@ -54,8 +46,6 @@ skip-if = true
 [test_bug1761273.html]
 [test_bug1773802.html]
 [test_multiple_content_languages.html]
-skip-if =
-  http3
 [test_spellcheck_after_edit.html]
 [test_spellcheck_after_pressing_navigation_key.html]
 [test_spellcheck_selection.html]

gfx/layers/apz/test/mochitest/mochitest.ini

@@ -22,8 +22,6 @@
 [test_frame_reconstruction.html]
 [test_group_bug1534549.html]
 [test_group_checkerboarding.html]
-  skip-if =
-    http3
 [test_group_displayport.html]
 [test_group_double_tap_zoom-2.html]
   run-if = ((os == 'android') || (os == 'mac')) # FIXME: enable on more desktop platforms (see bug 1608506 comment 4)
@@ -40,7 +38,6 @@
     os == 'win' # Bug 1776972
     os == 'linux' && !debug # stack is not large enough for the test, Bug 1776972
     apple_catalina && debug # Bug 1776972
-    http3
 [test_group_hittest-overscroll.html]
   skip-if =
     toolkit == 'android'  # mouse events not supported on mobile
@@ -61,14 +58,11 @@
 [test_group_overscroll_handoff.html]
   skip-if =
     toolkit == 'android'  # wheel events not supported on mobile
-    http3
 [test_group_pointerevents.html]
   skip-if = (os == 'win' && os_version == '10.0') # Bug 1404836
 [test_group_programmatic_scroll_behavior.html]
 [test_group_scroll_linked_effect.html]
-  skip-if =
+  skip-if = (toolkit == 'android') # wheel events not supported on mobile
-    (toolkit == 'android') # wheel events not supported on mobile
-    http3
 [test_group_scroll_snap.html]
   skip-if = (os == 'android') # wheel events not supported on mobile
 [test_group_scrollend.html]

image/test/mochitest/mochitest.ini

@@ -104,8 +104,6 @@ support-files =
 [test_animated_css_image.html]
 [test_animated_gif.html]
 support-files = child.html
-skip-if =
-  http3
 [test_animation.html]
 [test_canvas_frame_animation.html]
 [test_animation_operators.html]
@@ -136,28 +134,20 @@ skip-if = verify
 [test_bug614392.html]
 [test_bug657191.html]
 [test_bug671906.html]
-skip-if =
-  http3
 [test_bug733553.html]
-skip-if =
+skip-if = verify
-  verify
-  http3
 [test_bug767779.html]
 [test_bug865919.html]
 [test_bug89419-1.html]
 [test_bug89419-2.html]
 [test_bug1132427.html]
 [test_bug1180105.html]
-skip-if =
-  http3
 [test_bug1217571.html]
 [test_bug1325080.html]
 [test_bullet_animation.html]
 [test_changeOfSource.html]
 [test_changeOfSource2.html]
 [test_discardAnimatedImage.html]
-skip-if =
-  http3
 [test_discardFinishedAnimatedImage.html]
 [test_discardFramesAnimatedImage.html]
 [test_drawDiscardedImage.html]
@@ -179,6 +169,4 @@ disabled = bug 1295501
 [test_webcam.html]
 [test_xultree_animation.xhtml]
 allow_xul_xbl = true
-skip-if =
-  http3
 [test_image_cache_notification.html]

js/xpconnect/tests/mochitest/mochitest.ini

@@ -52,89 +52,51 @@ prefs =
 [test_bug390488.html]
 [test_bug393269.html]
 [test_bug396851.html]
-skip-if =
-  http3
 [test_bug428021.html]
 [test_bug446584.html]
 [test_bug462428.html]
 [test_bug478438.html]
-skip-if =
-  http3
 [test_bug500691.html]
 [test_bug505915.html]
-skip-if =
-  http3
 [test_bug560351.html]
 [test_bug585745.html]
 [test_bug589028.html]
 [test_bug601299.html]
 [test_bug605167.html]
-skip-if =
-  http3
 [test_bug618017.html]
 [test_bug623437.html]
 [test_bug628410.html]
 [test_bug628794.html]
 [test_bug629227.html]
-skip-if =
-  http3
 [test_bug629331.html]
-skip-if =
-  http3
 [test_bug636097.html]
-skip-if =
-  http3
 [test_bug650273.html]
-skip-if =
-  http3
 [test_bug655297-1.html]
 [test_bug655297-2.html]
 [test_bug661980.html]
 [test_bug691059.html]
 [test_bug720619.html]
-skip-if =
-  http3
 [test_bug731471.html]
 skip-if = toolkit == "android" && debug
 [test_bug764389.html]
 [test_bug772288.html]
 [test_bug781476.html]
 [test_bug789713.html]
-skip-if =
-  http3
 [test_bug790732.html]
 [test_bug793969.html]
 [test_bug800864.html]
-skip-if =
-  http3
 [test_bug802557.html]
-skip-if =
-  http3
 [test_bug803730.html]
 [test_bug809547.html]
 [test_bug829872.html]
-skip-if =
-  http3
 [test_bug862380.html]
-skip-if =
-  http3
 [test_bug865260.html]
-skip-if =
-  http3
 [test_bug871887.html]
 [test_bug912322.html]
 [test_bug916945.html]
-skip-if =
-  http3
 [test_bug92773.html]
-skip-if =
-  http3
 [test_bug940783.html]
-skip-if =
-  http3
 [test_bug965082.html]
-skip-if =
-  http3
 [test_bug960820.html]
 [test_bug993423.html]
 [test_bug1005806.html]
@@ -154,8 +116,6 @@ skip-if = (debug == false)
 skip-if = (debug == false)
 [test_nukeContentWindow.html]
 [test_sameOriginPolicy.html]
-skip-if =
-  http3
 [test_sandbox_fetch.html]
   support-files =
     ../../../../dom/tests/mochitest/fetch/test_fetch_basic.js

layout/base/tests/mochitest.ini

@@ -163,8 +163,6 @@ skip-if = toolkit == 'android' # android: Requires plugin support
 support-files =
   sendimagenevercomplete.sjs
   partial.png
-skip-if =
-  http3
 [test_preserve3d_sorting_hit_testing.html]
 support-files = preserve3d_sorting_hit_testing_iframe.html
 [test_preserve3d_sorting_hit_testing2.html]
@@ -437,6 +435,7 @@ support-files =
   bug1518339-2-ref.html
   bug1529492-1.html
   bug1529492-1-ref.html
+
 [test_resize_flush.html]
 support-files = resize_flush_iframe.html
 [test_scroll_event_ordering.html]
@@ -459,3 +458,5 @@ support-files =
   transformed_scrolling_repaints_3_window_frame.html
 [test_zoom_restore_bfcache.html]
 support-files = file_zoom_restore_bfcache.html
+
+# *** Please maintain alphabetical ordering when adding new tests ***

layout/forms/test/mochitest.ini

@@ -6,8 +6,6 @@ support-files =
 
 [test_bug231389.html]
 [test_bug287446.html]
-skip-if =
-  http3
 [test_bug345267.html]
 [test_bug346043.html]
 [test_bug348236.html]
@@ -21,8 +19,6 @@ skip-if = true # mac(select form control popup behavior is different)
 [test_bug476308.html]
 [test_bug477531.html]
 [test_bug477700.html]
-skip-if =
-  http3
 [test_bug534785.html]
 [test_bug542914.html]
 [test_bug549170.html]

layout/generic/test/mochitest.ini

@@ -33,9 +33,7 @@ skip-if = win10_2004 && bits == 32 # Bug 1727925
 [test_bug392923.html]
 [test_bug394173.html]
 [test_bug394239.html]
-skip-if =
+skip-if = (xorigin && debug)
-  (xorigin && debug)
-  http3
 [test_bug402380.html]
 [test_bug404872.html]
 [test_bug405178.html]
@@ -108,15 +106,11 @@ support-files = file_bug1566783.html
 support-files =
   frame_visibility_in_iframe.html
   frame_visibility_in_iframe_child.html
-skip-if =
-  http3
 [test_image_selection.html]
 [test_image_selection_2.html]
 [test_image_selection_3.html]
 [test_image_selection_in_contenteditable.html]
 [test_intrinsic_size_on_loading.html]
-skip-if =
-  http3
 [test_key_enter_open_second_summary.html]
 [test_key_enter_prevent_default.html]
 [test_key_enter_single_summary.html]

layout/style/test/mochitest.ini

@@ -125,8 +125,6 @@ support-files = file_animations_with_disabled_properties.html
 [test_bug391221.html]
 [test_bug397427.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_bug399349.html]
 [test_bug401046.html]
 skip-if = true # Bug 701060
@@ -158,8 +156,6 @@ support-files = file_bug645998-1.css file_bug645998-2.css
 [test_bug732153.html]
 [test_bug732209.html]
 support-files = bug732209-css.sjs
-skip-if =
-  http3
 [test_bug765590.html]
 [test_bug771043.html]
 [test_bug795520.html]
@@ -218,11 +214,7 @@ skip-if = toolkit == 'android'
 [test_crash_with_content_policy.html]
 support-files = file_bug1381233.html
 [test_css_cross_domain.html]
-skip-if =
-  http3
 [test_css_cross_domain_no_orb.html]
-skip-if =
-  http3
 [test_css_eof_handling.html]
 [test_css_escape_api.html]
 [test_css_function_mismatched_parenthesis.html]
@@ -237,8 +229,6 @@ skip-if =
 [test_descriptor_storage.html]
 [test_descriptor_syntax_errors.html]
 [test_display_mode.html]
-skip-if =
-  http3
 [test_dont_use_document_colors.html]
 [test_dont_use_document_fonts.html]
 [test_dynamic_change_causing_reflow.html]
@@ -266,9 +256,7 @@ support-files =
   file_font_loading_api_vframe.html
 # This test checks font loading state. When loaded second time, fonts may be
 # loaded synchronously, causing this test to fail in test-verify task.
-skip-if =
+skip-if = verify || toolkit == 'android' # Bug 1455824
-  verify || toolkit == 'android' # Bug 1455824
-  http3
 [test_garbage_at_end_of_declarations.html]
 [test_grid_container_shorthands.html]
 [test_grid_item_shorthands.html]
@@ -407,8 +395,6 @@ skip-if = tsan
 [test_variable_serialization_specified.html]
 [test_variables.html]
 support-files = support/external-variable-url.css
-skip-if =
-  http3
 [test_variables_loop.html]
 [test_variables_order.html]
 support-files = support/external-variable-url.css

layout/svg/tests/mochitest.ini

@@ -10,8 +10,6 @@ support-files =
   file_embed_sizing_size.svg
   file_embed_sizing_ratio.svg
   file_embed_sizing_both.svg
-skip-if =
-  http3
 
 [test_filter_crossorigin.html]
 support-files =

layout/xul/test/mochitest.ini

@@ -3,12 +3,8 @@ support-files =
   file_bug386386.sjs
 [test_bug386386.html]
 allow_xul_xbl = true
-skip-if =
-  http3
 [test_bug394800.xhtml]
 allow_xul_xbl = true
-skip-if =
-  http3
 [test_bug511075.html]
 skip-if = toolkit == 'android' #bug 798806
 [test_bug563416.html]

modules/libpref/init/StaticPrefList.yaml

@@ -12331,13 +12331,6 @@
   value: false
   mirror: always
 
-# Whether to use HTTPS RR and ignore NS_HTTP_DISALLOW_HTTPS_RR
-# This pref is only set when running tests
-- name: network.dns.force_use_https_rr
-  type: RelaxedAtomicBool
-  value: false
-  mirror: always
-
 - name: network.cache.frecency_array_check_enabled
   type: RelaxedAtomicBool
   value: @IS_EARLY_BETA_OR_EARLIER@

netwerk/protocol/http/nsHttpTransaction.cpp

@@ -357,15 +357,13 @@ nsresult nsHttpTransaction::Init(
     mPushedStream = trans->TakePushedStreamById(aPushedStreamId);
   }
 
-  bool forceUseHTTPSRR = StaticPrefs::network_dns_force_use_https_rr();
+  if (gHttpHandler->UseHTTPSRRAsAltSvcEnabled() &&
-  if ((gHttpHandler->UseHTTPSRRAsAltSvcEnabled() &&
+      !(mCaps & NS_HTTP_DISALLOW_HTTPS_RR)) {
-       !(mCaps & NS_HTTP_DISALLOW_HTTPS_RR)) ||
-      forceUseHTTPSRR) {
     nsCOMPtr<nsIEventTarget> target;
     Unused << gHttpHandler->GetSocketThreadTarget(getter_AddRefs(target));
     if (target) {
       if (StaticPrefs::network_dns_force_waiting_https_rr() ||
-          StaticPrefs::network_dns_echconfig_enabled() || forceUseHTTPSRR) {
+          StaticPrefs::network_dns_echconfig_enabled()) {
         mCaps |= NS_HTTP_FORCE_WAIT_HTTP_RR;
       }
 

netwerk/test/http3server/Cargo.toml

@@ -14,9 +14,6 @@ mio = "0.6.17"
 mio-extras = "2.0.5"
 log = "0.4.0"
 base64 = "0.13"
-http = "0.2.8"
-hyper = { version = "0.14", features = ["full"] }
-tokio = { version = "1", features = ["full"] }
 
 [dependencies.neqo-crypto]
 tag = "v0.6.4"

netwerk/test/http3server/src/main.rs

@@ -14,8 +14,7 @@ use neqo_http3::{
 };
 use neqo_transport::server::Server;
 use neqo_transport::{
-    ConnectionEvent, ConnectionParameters, Output, RandomConnectionIdGenerator, StreamId,
+    ConnectionEvent, ConnectionParameters, Output, RandomConnectionIdGenerator, StreamType,
-    StreamType,
 };
 use std::env;
 
@@ -24,14 +23,10 @@ use std::io;
 use std::path::PathBuf;
 use std::process::exit;
 use std::rc::Rc;
-use std::sync::mpsc::{channel, Receiver, TryRecvError};
 use std::thread;
 use std::time::{Duration, Instant};
 
 use core::fmt::Display;
-use hyper::body::HttpBody;
-use hyper::header::{HeaderName, HeaderValue};
-use hyper::{Body, Client, Method, Request};
 use mio::net::UdpSocket;
 use mio::{Events, Poll, PollOpt, Ready, Token};
 use mio_extras::timer::{Builder, Timeout, Timer};
@@ -492,7 +487,7 @@ impl HttpServer for Http3TestServer {
                 Http3ServerEvent::WebTransport(WebTransportServerEvent::SessionClosed {
                     session,
                     reason,
-                    headers: _,
+                    headers: _
                 }) => {
                     qdebug!(
                         "WebTransportServerEvent::SessionClosed {:?} {:?}",
@@ -557,301 +552,6 @@ impl HttpServer for Server {
     }
 }
 
-struct Http3ProxyServer {
-    server: Http3Server,
-    responses: HashMap<Http3OrWebTransportStream, Vec<u8>>,
-    server_port: i32,
-    request_header: HashMap<StreamId, Vec<Header>>,
-    request_body: HashMap<StreamId, Vec<u8>>,
-    stream_map: HashMap<StreamId, Http3OrWebTransportStream>,
-    response_to_send: HashMap<StreamId, Receiver<(Vec<Header>, Vec<u8>)>>,
-}
-
-impl ::std::fmt::Display for Http3ProxyServer {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        write!(f, "{}", self.server)
-    }
-}
-
-impl Http3ProxyServer {
-    pub fn new(server: Http3Server, server_port: i32) -> Self {
-        Self {
-            server,
-            responses: HashMap::new(),
-            server_port,
-            request_header: HashMap::new(),
-            request_body: HashMap::new(),
-            stream_map: HashMap::new(),
-            response_to_send: HashMap::new(),
-        }
-    }
-
-    fn new_response(&mut self, mut stream: Http3OrWebTransportStream, mut data: Vec<u8>) {
-        if data.len() == 0 {
-            let _ = stream.stream_close_send();
-            return;
-        }
-        match stream.send_data(&data) {
-            Ok(sent) => {
-                if sent < data.len() {
-                    self.responses.insert(stream, data.split_off(sent));
-                } else {
-                    stream.stream_close_send().unwrap();
-                }
-            }
-            Err(e) => {
-                eprintln!("error is {:?}", e);
-            }
-        }
-    }
-
-    fn handle_stream_writable(&mut self, mut stream: Http3OrWebTransportStream) {
-        if let Some(data) = self.responses.get_mut(&stream) {
-            match stream.send_data(&data) {
-                Ok(sent) => {
-                    if sent < data.len() {
-                        let new_d = (*data).split_off(sent);
-                        *data = new_d;
-                    } else {
-                        stream.stream_close_send().unwrap();
-                        self.responses.remove(&stream);
-                    }
-                }
-                Err(_) => {
-                    eprintln!("Unexpected error");
-                }
-            }
-        }
-    }
-
-    async fn fetch_url(
-        request: hyper::Request<Body>,
-        out_header: &mut Vec<Header>,
-        out_body: &mut Vec<u8>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let client = Client::new();
-        let mut resp = client.request(request).await?;
-        out_header.push(Header::new(":status", resp.status().as_str()));
-        for (key, value) in resp.headers() {
-            out_header.push(Header::new(
-                key.as_str().to_ascii_lowercase(),
-                match value.to_str() {
-                    Ok(str) => str,
-                    _ => "",
-                },
-            ));
-        }
-
-        while let Some(chunk) = resp.body_mut().data().await {
-            match chunk {
-                Ok(data) => {
-                    out_body.append(&mut data.to_vec());
-                }
-                _ => {}
-            }
-        }
-
-        Ok(())
-    }
-
-    fn fetch(
-        &mut self,
-        mut stream: Http3OrWebTransportStream,
-        request_headers: &Vec<Header>,
-        request_body: Vec<u8>,
-    ) {
-        let mut request: hyper::Request<Body> = Request::default();
-        let mut path = String::new();
-        for hdr in request_headers.iter() {
-            match hdr.name() {
-                ":method" => {
-                    *request.method_mut() = Method::from_bytes(hdr.value().as_bytes()).unwrap();
-                }
-                ":scheme" => {}
-                ":authority" => {
-                    request.headers_mut().insert(
-                        hyper::header::HOST,
-                        HeaderValue::from_str(hdr.value()).unwrap(),
-                    );
-                }
-                ":path" => {
-                    path = String::from(hdr.value());
-                }
-                _ => {
-                    if let Ok(hdr_name) = HeaderName::from_lowercase(hdr.name().as_bytes()) {
-                        request
-                            .headers_mut()
-                            .insert(hdr_name, HeaderValue::from_str(hdr.value()).unwrap());
-                    }
-                }
-            }
-        }
-        *request.body_mut() = Body::from(request_body);
-        *request.uri_mut() =
-            match format!("http://127.0.0.1:{}{}", self.server_port.to_string(), path).parse() {
-                Ok(uri) => uri,
-                _ => {
-                    eprintln!("invalid uri: {}", path);
-                    stream
-                        .send_headers(&[
-                            Header::new(":status", "400"),
-                            Header::new("cache-control", "no-cache"),
-                            Header::new("content-length", "0"),
-                        ])
-                        .unwrap();
-                    return;
-                }
-            };
-        qtrace!("request header: {:?}", request);
-
-        let (sender, receiver) = channel();
-        thread::spawn(move || {
-            let rt = tokio::runtime::Runtime::new().unwrap();
-            let mut h: Vec<Header> = Vec::new();
-            let mut data: Vec<u8> = Vec::new();
-            let _ = rt.block_on(Self::fetch_url(request, &mut h, &mut data));
-            qtrace!("response headers: {:?}", h);
-            qtrace!("res data: {:02X?}", data);
-
-            match sender.send((h, data)) {
-                Ok(()) => {}
-                _ => {
-                    eprintln!("sender.send failed");
-                }
-            }
-        });
-
-        self.response_to_send.insert(stream.stream_id(), receiver);
-        self.stream_map.insert(stream.stream_id(), stream);
-    }
-
-    fn maybe_process_response(&mut self) {
-        let mut data_to_send = HashMap::new();
-        self.response_to_send
-            .retain(|id, receiver| match receiver.try_recv() {
-                Ok((headers, body)) => {
-                    data_to_send.insert(*id, (headers.clone(), body.clone()));
-                    false
-                }
-                Err(TryRecvError::Empty) => true,
-                Err(TryRecvError::Disconnected) => false,
-            });
-        while let Some(id) = data_to_send.keys().next().cloned() {
-            let mut stream = self.stream_map.remove(&id).unwrap();
-            let (header, data) = data_to_send.remove(&id).unwrap();
-            qtrace!("response headers: {:?}", header);
-            match stream.send_headers(&header) {
-                Ok(()) => {
-                    self.new_response(stream, data);
-                }
-                _ => {}
-            }
-        }
-    }
-}
-
-impl HttpServer for Http3ProxyServer {
-    fn process(&mut self, dgram: Option<Datagram>) -> Output {
-        self.server.process(dgram, Instant::now())
-    }
-
-    fn process_events(&mut self) {
-        self.maybe_process_response();
-        while let Some(event) = self.server.next_event() {
-            qtrace!("Event: {:?}", event);
-            match event {
-                Http3ServerEvent::Headers {
-                    mut stream,
-                    headers,
-                    fin: _,
-                } => {
-                    qtrace!("Headers {:?}", headers);
-                    if self.server_port != -1 {
-                        let method_hdr = headers.iter().find(|&h| h.name() == ":method");
-                        match method_hdr {
-                            Some(method) => match method.value() {
-                                "POST" => {
-                                    let content_length =
-                                        headers.iter().find(|&h| h.name() == "content-length");
-                                    if let Some(length_str) = content_length {
-                                        if let Ok(len) = length_str.value().parse::<u32>() {
-                                            if len > 0 {
-                                                self.request_header
-                                                    .insert(stream.stream_id(), headers);
-                                                self.request_body
-                                                    .insert(stream.stream_id(), Vec::new());
-                                            } else {
-                                                self.fetch(stream, &headers, b"".to_vec());
-                                            }
-                                        }
-                                    }
-                                }
-                                _ => {
-                                    self.fetch(stream, &headers, b"".to_vec());
-                                }
-                            },
-                            _ => {}
-                        }
-                    } else {
-                        let path_hdr = headers.iter().find(|&h| h.name() == ":path");
-                        match path_hdr {
-                            Some(ph) if !ph.value().is_empty() => {
-                                let path = ph.value();
-                                match &path[..6] {
-                                    "/port?" => {
-                                        let port = path[6..].parse::<i32>();
-                                        if let Ok(port) = port {
-                                            qtrace!("got port {}", port);
-                                            self.server_port = port;
-                                        }
-                                    }
-                                    _ => {}
-                                }
-                            }
-                            _ => {}
-                        }
-                        stream
-                            .send_headers(&[
-                                Header::new(":status", "200"),
-                                Header::new("cache-control", "no-cache"),
-                                Header::new("content-length", "0"),
-                            ])
-                            .unwrap();
-                    }
-                }
-                Http3ServerEvent::Data {
-                    stream,
-                    mut data,
-                    fin,
-                } => {
-                    if let Some(d) = self.request_body.get_mut(&stream.stream_id()) {
-                        d.append(&mut data);
-                    }
-                    if fin {
-                        if let Some(d) = self.request_body.remove(&stream.stream_id()) {
-                            let headers = self.request_header.remove(&stream.stream_id()).unwrap();
-                            self.fetch(stream, &headers, d);
-                        }
-                    }
-                }
-                Http3ServerEvent::DataWritable { stream } => self.handle_stream_writable(stream),
-                Http3ServerEvent::StateChange { .. } | Http3ServerEvent::PriorityUpdate { .. } => {}
-                Http3ServerEvent::StreamReset { stream, error } => {
-                    qtrace!("Http3ServerEvent::StreamReset {:?} {:?}", stream, error);
-                }
-                Http3ServerEvent::StreamStopSending { stream, error } => {
-                    qtrace!(
-                        "Http3ServerEvent::StreamStopSending {:?} {:?}",
-                        stream,
-                        error
-                    );
-                }
-                Http3ServerEvent::WebTransport(_) => {}
-            }
-        }
-    }
-}
-
 #[derive(Default)]
 struct NonRespondingServer {}
 
@@ -905,9 +605,6 @@ fn process(
             }
 
             qinfo!("Setting timeout of {:?} for {}", new_timeout, server);
-            if new_timeout > Duration::from_secs(1) {
-                new_timeout = Duration::from_secs(1);
-            }
             *svr_timeout = Some(timer.set_timeout(new_timeout, inx));
             false
         }
@@ -949,7 +646,6 @@ enum ServerType {
     Http3Fail,
     Http3NoResponse,
     Http3Ech,
-    Http3Proxy,
 }
 
 struct ServersRunner {
@@ -978,24 +674,17 @@ impl ServersRunner {
     }
 
     pub fn init(&mut self) {
-        self.add_new_socket(0, ServerType::Http3, 0);
+        self.add_new_socket(0, ServerType::Http3);
-        self.add_new_socket(1, ServerType::Http3Fail, 0);
+        self.add_new_socket(1, ServerType::Http3Fail);
-        self.add_new_socket(2, ServerType::Http3Ech, 0);
+        self.add_new_socket(2, ServerType::Http3Ech);
-
+        self.add_new_socket(4, ServerType::Http3NoResponse);
-        let proxy_port = match env::var("MOZ_HTTP3_PROXY_PORT") {
-            Ok(val) => val.parse::<u16>().unwrap(),
-            _ => 0,
-        };
-        self.add_new_socket(3, ServerType::Http3Proxy, proxy_port);
-        self.add_new_socket(5, ServerType::Http3NoResponse, 0);
 
         println!(
-            "HTTP3 server listening on ports {}, {}, {}, {} and {}. EchConfig is @{}@",
+            "HTTP3 server listening on ports {}, {}, {} and {}. EchConfig is @{}@",
             self.hosts[0].port(),
             self.hosts[1].port(),
             self.hosts[2].port(),
             self.hosts[3].port(),
-            self.hosts[4].port(),
             base64::encode(&self.ech_config)
         );
         self.poll
@@ -1003,8 +692,8 @@ impl ServersRunner {
             .unwrap();
     }
 
-    fn add_new_socket(&mut self, count: usize, server_type: ServerType, port: u16) -> u16 {
+    fn add_new_socket(&mut self, count: usize, server_type: ServerType) -> u16 {
-        let addr = format!("127.0.0.1:{}", port).parse().unwrap();
+        let addr = "127.0.0.1:0".parse().unwrap();
 
         let socket = match UdpSocket::bind(&addr) {
             Err(err) => {
@@ -1099,34 +788,6 @@ impl ServersRunner {
                 self.ech_config = Vec::from(unboxed_server.ech_config());
                 server
             }
-            ServerType::Http3Proxy => {
-                let server_config = if env::var("MOZ_HTTP3_MOCHITEST").is_ok() {
-                    ("mochitest-cert", 8888)
-                } else {
-                    (" HTTP2 Test Cert", -1)
-                };
-                let server = Box::new(Http3ProxyServer::new(
-                    Http3Server::new(
-                        Instant::now(),
-                        &[server_config.0],
-                        PROTOCOLS,
-                        anti_replay,
-                        cid_mgr,
-                        Http3Parameters::default()
-                            .max_table_size_encoder(MAX_TABLE_SIZE)
-                            .max_table_size_decoder(MAX_TABLE_SIZE)
-                            .max_blocked_streams(MAX_BLOCKED_STREAMS)
-                            .webtransport(true)
-                            .connection_parameters(
-                                ConnectionParameters::default().datagram_size(1200),
-                            ),
-                        None,
-                    )
-                    .expect("We cannot make a server!"),
-                    server_config.1,
-                ));
-                server
-            }
         }
     }
 
@@ -1213,10 +874,10 @@ impl ServersRunner {
                 if event.token() == TIMER_TOKEN {
                     self.process_timeout()?;
                 } else {
-                    self.process_datagrams_and_events(
+                    if !event.readiness().is_readable() {
-                        event.token().0,
+                        continue;
-                        event.readiness().is_readable(),
+                    }
-                    )?;
+                    self.process_datagrams_and_events(event.token().0, true)?;
                 }
             }
             self.process_active_conns()?;

netwerk/test/mochitests/mochitest.ini

@@ -69,17 +69,11 @@ skip-if = bits == 32 || tsan || asan
 # Bug 1617611: Fix all the tests broken by "cookies SameSite=lax by default"
 skip-if = xorigin
 [test_idn_redirect.html]
-skip-if =
-  http3
 [test_loadinfo_redirectchain.html]
 fail-if = xorigin
-skip-if =
-  http3
 [test_partially_cached_content.html]
 [test_rel_preconnect.html]
 [test_redirect_ref.html]
-skip-if =
-  http3
 [test_uri_scheme.html]
 skip-if = (verify && debug && os == 'mac')
 [test_viewsource_unlinkable.html]
@@ -89,51 +83,25 @@ skip-if = (verify && debug && os == 'mac')
 [test_1331680_xhr.html]
 skip-if = verify
 [test_1396395.html]
-skip-if =
-  http3
 [test_1421324.html]
 [test_1425031.html]
 [test_1503201.html]
 [test_origin_header.html]
-skip-if =
-  http3
 [test_1502055.html]
 support-files = sw_1502055.js file_1502055.sjs iframe_1502055.html
 [test_accept_header.html]
 support-files = test_accept_header.sjs
 [test_different_domain_in_hierarchy.html]
-skip-if =
-  http3
 [test_differentdomain.html]
-skip-if =
-  http3
 [test_fetch_lnk.html]
 [test_image.html]
-skip-if =
-  http3
 [test_loadflags.html]
 # Bug 1617611: Fix all the tests broken by "cookies SameSite=lax by default"
-skip-if =
+skip-if = xorigin
-  xorigin
-  http3
 [test_same_base_domain.html]
-skip-if =
-  http3
 [test_same_base_domain_2.html]
-skip-if =
-  http3
 [test_same_base_domain_3.html]
-skip-if =
-  http3
 [test_same_base_domain_4.html]
-skip-if =
-  http3
 [test_same_base_domain_5.html]
-skip-if =
-  http3
 [test_same_base_domain_6.html]
-skip-if =
-  http3
 [test_samedomain.html]
-skip-if =
-  http3

netwerk/test/unit/head_trr.js

@@ -287,7 +287,7 @@ class TRRServerCode {
     await global.server.listen(port);
 
     global.dnsPacket = require(`${__dirname}/../dns-packet`);
-    global.ip = require(`${__dirname}/../node_ip`);
+    global.ip = require(`${__dirname}/../node-ip`);
 
     let serverPort = global.server.address().port;
 

netwerk/test/unit/test_http3_server.js

@@ -1,172 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-/* import-globals-from head_servers.js */
-
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-
-let h2Port;
-let h3Port;
-let trrServer;
-
-const certOverrideService = Cc[
-  "@mozilla.org/security/certoverride;1"
-].getService(Ci.nsICertOverrideService);
-const { TestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TestUtils.sys.mjs"
-);
-
-add_setup(async function setup() {
-  h2Port = Services.env.get("MOZHTTP2_PORT");
-  Assert.notEqual(h2Port, null);
-  Assert.notEqual(h2Port, "");
-
-  h3Port = Services.env.get("MOZHTTP3_PORT_PROXY");
-  Assert.notEqual(h3Port, null);
-  Assert.notEqual(h3Port, "");
-
-  trr_test_setup();
-
-  Services.prefs.setBoolPref("network.dns.upgrade_with_https_rr", true);
-  Services.prefs.setBoolPref("network.dns.use_https_rr_as_altsvc", true);
-
-  registerCleanupFunction(async () => {
-    trr_clear_prefs();
-    Services.prefs.clearUserPref("network.dns.upgrade_with_https_rr");
-    Services.prefs.clearUserPref("network.dns.use_https_rr_as_altsvc");
-    Services.prefs.clearUserPref("network.dns.disablePrefetch");
-    await trrServer.stop();
-  });
-
-  if (mozinfo.socketprocess_networking) {
-    Services.dns;
-    await TestUtils.waitForCondition(() => Services.io.socketProcessLaunched);
-  }
-});
-
-function makeChan(url) {
-  let chan = NetUtil.newChannel({
-    uri: url,
-    loadUsingSystemPrincipal: true,
-    contentPolicyType: Ci.nsIContentPolicy.TYPE_DOCUMENT,
-  }).QueryInterface(Ci.nsIHttpChannel);
-  return chan;
-}
-
-function channelOpenPromise(chan, flags) {
-  return new Promise(resolve => {
-    function finish(req, buffer) {
-      certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-        false
-      );
-      resolve([req, buffer]);
-    }
-    let internal = chan.QueryInterface(Ci.nsIHttpChannelInternal);
-    internal.setWaitForHTTPSSVCRecord();
-    certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-      true
-    );
-    chan.asyncOpen(new ChannelListener(finish, null, flags));
-  });
-}
-
-// Use NodeHTTPServer to create an HTTP server and test if the Http/3 server
-// can act as a reverse proxy.
-add_task(async function testHttp3ServerAsReverseProxy() {
-  trrServer = new TRRServer();
-  await trrServer.start();
-  Services.dns.clearCache(true);
-  Services.prefs.setIntPref("network.trr.mode", 3);
-  Services.prefs.setCharPref(
-    "network.trr.uri",
-    `https://foo.example.com:${trrServer.port}/dns-query`
-  );
-
-  await trrServer.registerDoHAnswers("test.h3_example.com", "HTTPS", {
-    answers: [
-      {
-        name: "test.h3_example.com",
-        ttl: 55,
-        type: "HTTPS",
-        flush: false,
-        data: {
-          priority: 1,
-          name: "test.h3_example.com",
-          values: [
-            { key: "alpn", value: "h3-29" },
-            { key: "port", value: h3Port },
-          ],
-        },
-      },
-    ],
-  });
-
-  await trrServer.registerDoHAnswers("test.h3_example.com", "A", {
-    answers: [
-      {
-        name: "test.h3_example.com",
-        ttl: 55,
-        type: "A",
-        flush: false,
-        data: "127.0.0.1",
-      },
-    ],
-  });
-
-  await new TRRDNSListener("test.h3_example.com", {
-    type: Ci.nsIDNSService.RESOLVE_TYPE_HTTPSSVC,
-  });
-
-  let server = new NodeHTTPServer();
-  await server.start();
-  registerCleanupFunction(async () => {
-    await server.stop();
-  });
-
-  await server.registerPathHandler("/test", (req, resp) => {
-    if (req.method === "GET") {
-      resp.writeHead(200);
-      resp.end("got GET request");
-    } else if (req.method === "POST") {
-      let received = "";
-      req.on("data", function receivePostData(chunk) {
-        received += chunk.toString();
-      });
-      req.on("end", function finishPost() {
-        resp.writeHead(200);
-        resp.end(received);
-      });
-    }
-  });
-
-  // Tell the Http/3 server which port to forward requests.
-  let chan = makeChan(`https://test.h3_example.com/port?${server.port()}`);
-  await channelOpenPromise(chan, CL_ALLOW_UNKNOWN_CL);
-
-  // Test GET method.
-  chan = makeChan(`https://test.h3_example.com/test`);
-  let [req, buf] = await channelOpenPromise(chan, CL_ALLOW_UNKNOWN_CL);
-  Assert.equal(req.protocolVersion, "h3-29");
-  Assert.equal(buf, "got GET request");
-
-  var stream = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(
-    Ci.nsIStringInputStream
-  );
-  stream.data = "b".repeat(500);
-
-  // Test POST method.
-  chan = makeChan(`https://test.h3_example.com/test`);
-  chan
-    .QueryInterface(Ci.nsIUploadChannel)
-    .setUploadStream(stream, "text/plain", stream.available());
-  chan.requestMethod = "POST";
-
-  [req, buf] = await channelOpenPromise(chan, CL_ALLOW_UNKNOWN_CL);
-  Assert.equal(req.protocolVersion, "h3-29");
-  Assert.equal(buf, stream.data);
-
-  await trrServer.stop();
-});

netwerk/test/unit/xpcshell.ini

@@ -757,6 +757,3 @@ run-sequentially = http3server
 [test_websocket_500k.js]
 skip-if = verify
 run-sequentially = node server exceptions dont replay well
-[test_http3_server.js]
-skip-if = os == 'android'
-run-sequentially = node server exceptions dont replay well

parser/htmlparser/tests/mochitest/mochitest.ini

@@ -108,15 +108,11 @@ support-files =
 support-files =
   blue.png
   file_base_csp_img.sjs
-skip-if =
-  http3
 [test_base_header_csp_img.html]
 support-files =
   blue.png
   file_base_csp_img.sjs
   test_base_header_csp_img.html^headers^
-skip-if =
-  http3
 [test_bug102699.html]
 [test_bug174351.html]
 [test_bug213517.html]
@@ -125,9 +121,7 @@ skip-if =
 [test_bug396568.html]
 [test_bug418464.html]
 [test_bug460437.xhtml]
-skip-if =
+skip-if = (xorigin && debug)
-  (xorigin && debug)
-  http3
 [test_bug502091.html]
 [test_bug543062.html]
 [test_bug552938-2.html]
@@ -142,12 +136,8 @@ skip-if = (xorigin && debug)
 [test_bug642908.html]
 [test_bug645115.html]
 [test_bug655682.html]
-skip-if =
-  http3
 [test_bug667533.html]
 [test_bug672453.html]
-skip-if =
-  http3
 [test_bug688580.html]
 [test_bug688580.xhtml]
 [test_bug709083.html]

python/mozbuild/mozbuild/action/test_archive.py

@@ -541,7 +541,7 @@ ARCHIVE_FILES = {
                 "mach_test_package_commands.py",
                 "moz-http2/**",
                 "node-http2/**",
-                "node_ip/**",
+                "node-ip/**",
                 "node-ws/**",
                 "dns-packet/**",
                 "odoh-wasm/**",

python/sites/mach.txt

@@ -38,7 +38,6 @@ pth:testing/mozbase/mozprocess
 pth:testing/mozbase/mozprofile
 pth:testing/mozbase/mozproxy
 pth:testing/mozbase/mozrunner
-pth:testing/mozbase/mozserve
 pth:testing/mozbase/mozsystemmonitor
 pth:testing/mozbase/mozscreenshot
 pth:testing/mozbase/moztest

security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini

@@ -1,7 +1,4 @@
 [DEFAULT]
-# Disable for Http/3 since Http/3 tests require to run with https.
-skip-if =
-  http3
 prefs =
   security.mixed_content.upgrade_display_content=false
   dom.security.https_first=false

supply-chain/config.toml

@@ -1092,10 +1092,6 @@ criteria = "safe-to-deploy"
 version = "1.1.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.signal-hook-registry]]
-version = "1.4.1"
-criteria = "safe-to-run"
-
 [[exemptions.siphasher]]
 version = "0.3.10"
 criteria = "safe-to-deploy"

taskcluster/ci/config.yml

@@ -57,7 +57,6 @@ treeherder:
         'M-headless-nofis': 'Headless Mochitests without fission enabled.'
         'M-headless-spi-nw': 'Headless Mochitests with fission and socketprocess networking.'
         'M-headless-spi-nw-nofis': 'Headless Mochitests with fission and socketprocess networking without fission enabled.'
-        'M-http3': 'Mochitests with Http/3 server'
         'M-aab': 'Mochitests with AAB test_runner.'
         'M-aab-nofis': 'Mochitests with AAB test_runner without fission enabled.'
         'M-1proc': 'Mochitests without e10s or fission'

taskcluster/ci/test/mochitest.yml

@@ -66,7 +66,6 @@ mochitest-plain:
         - webrender-sw
         - headless
         - headless+socketprocess_networking
-        - http3
     run-on-projects:
         by-variant:
             conditioned_profile:
@@ -119,10 +118,6 @@ mochitest-plain:
                     linux1804-64-qr/debug: ['trunk']
                     linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
                     default: []
-            http3:
-                by-test-platform:
-                    linux1804-64-qr/debug: built-projects
-                    default: []
             default:
                 by-test-platform:
                     android.*: []
@@ -154,31 +149,6 @@ mochitest-plain:
             by-test-platform:
                 android-em.*: false
                 default: true
-    fetches:
-        toolchain:
-            by-test-platform:
-                linux.*:
-                    - linux64-node-12
-                    - linux64-minidump-stackwalk
-                    - linux64-fix-stacks
-                macosx.*:
-                    - macosx64-node-12
-                    - macosx64-minidump-stackwalk
-                    - macosx64-fix-stacks
-                win.*-64.*:
-                    - win64-node-12
-                    - win32-minidump-stackwalk
-                    - win32-fix-stacks
-                win.*32.*:
-                    - win32-node-12
-                    - win32-minidump-stackwalk
-                    - win32-fix-stacks
-                android-em-7.*:
-                    - android-system-image-x86_64-linux
-                    - android-avd-x86_64-linux
-                    - android-emulator-linux
-                    - linux64-node-12
-                    - linux64-minidump-stackwalk
 
 mochitest-a11y:
     description: "Mochitest a11y run"

taskcluster/ci/test/variants.yml

@@ -276,13 +276,3 @@ msix:
         mozharness:
             extra-options:
                 - "--installer-path installer.msix"
-
-http3:
-    description: "{description} with http3 server"
-    component: "Testing::General"
-    expiration: "2023-09-01"
-    suffix: "http3"
-    merge:
-        mozharness:
-            extra-options:
-                - "--use-http3-server"

testing/config/mozbase_requirements.txt

@@ -18,7 +18,6 @@
 ../mozbase/mozprofile
 ../mozbase/mozproxy
 ../mozbase/mozrunner
-../mozbase/mozserve
 ../mozbase/mozscreenshot
 ../mozbase/moztest
 ../mozbase/mozversion

testing/config/mozbase_source_requirements.txt

@@ -18,7 +18,6 @@
 --editable ../mozbase/mozprofile
 --editable ../mozbase/mozproxy
 --editable ../mozbase/mozrunner
---editable ../mozbase/mozserve
 --editable ../mozbase/mozscreenshot
 --editable ../mozbase/moztest
 --editable ../mozbase/mozversion

testing/mochitest/DoHServer/doh_server.js

@@ -1,96 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-/* globals require, __dirname, global, Buffer, process */
-
-const fs = require("fs");
-const options = {
-  key: fs.readFileSync(__dirname + "/http2-cert.key.pem"),
-  cert: fs.readFileSync(__dirname + "/http2-cert.pem"),
-};
-const http2 = require("http2");
-const http = require("http");
-const url = require("url");
-
-const path = require("path");
-
-let dnsPacket;
-let libPath = path.join(__dirname, "../../xpcshell/dns-packet");
-if (fs.existsSync(libPath)) {
-  // This is the path of dns-packet when running mochitest locally.
-  dnsPacket = require(libPath);
-} else {
-  // This path is for running mochitest on try.
-  dnsPacket = require(path.join(__dirname, "./dns_packet"));
-}
-
-let serverPort = parseInt(process.argv[2].split("=")[1]);
-let listeningPort = parseInt(process.argv[3].split("=")[1]);
-
-let server = http2.createSecureServer(options, function handleRequest(
-  req,
-  res
-) {
-  let u = "";
-  if (req.url != undefined) {
-    u = url.parse(req.url, true);
-  }
-
-  if (u.pathname === "/dns-query") {
-    let payload = Buffer.from("");
-    req.on("data", function receiveData(chunk) {
-      payload = Buffer.concat([payload, chunk]);
-    });
-    req.on("end", function finishedData() {
-      let packet = dnsPacket.decode(payload);
-      let answers = [];
-      // Return the HTTPS RR to let Firefox connect to the HTTP/3 server
-      if (packet.questions[0].type === "HTTPS") {
-        answers.push({
-          name: packet.questions[0].name,
-          type: "HTTPS",
-          ttl: 55,
-          class: "IN",
-          flush: false,
-          data: {
-            priority: 1,
-            name: packet.questions[0].name,
-            values: [
-              { key: "alpn", value: ["h3"] },
-              { key: "port", value: serverPort },
-            ],
-          },
-        });
-      } else if (packet.questions[0].type === "A") {
-        answers.push({
-          name: packet.questions[0].name,
-          type: "A",
-          ttl: 55,
-          flush: false,
-          data: "127.0.0.1",
-        });
-      }
-
-      let buf = dnsPacket.encode({
-        type: "response",
-        id: packet.id,
-        flags: dnsPacket.RECURSION_DESIRED,
-        questions: packet.questions,
-        answers,
-      });
-
-      res.setHeader("Content-Type", "application/dns-message");
-      res.setHeader("Content-Length", buf.length);
-      res.writeHead(200);
-      res.write(buf);
-      res.end("");
-    });
-  }
-});
-
-server.listen(listeningPort);
-
-console.log(`DoH server listening on ports ${server.address().port}`);

testing/mochitest/DoHServer/http2-cert.key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6iFGoRI4W1kH9
-braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
-eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
-iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Za
-qn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7
-LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
-2hgKNe2NAgMBAAECggEBAJ7LzjhhpFTsseD+j4XdQ8kvWCXOLpl4hNDhqUnaosWs
-VZskBFDlrJ/gw+McDu+mUlpl8MIhlABO4atGPd6e6CKHzJPnRqkZKcXmrD2IdT9s
-JbpZeec+XY+yOREaPNq4pLDN9fnKsF8SM6ODNcZLVWBSXn47kq18dQTPHcfLAFeI
-r8vh6Pld90AqFRUw1YCDRoZOs3CqeZVqWHhiy1M3kTB/cNkcltItABppAJuSPGgz
-iMnzbLm16+ZDAgQceNkIIGuHAJy4yrrK09vbJ5L7kRss9NtmA1hb6a4Mo7jmQXqg
-SwbkcOoaO1gcoDpngckxW2KzDmAR8iRyWUbuxXxtlEECgYEA3W4dT//r9o2InE0R
-TNqqnKpjpZN0KGyKXCmnF7umA3VkTVyqZ0xLi8cyY1hkYiDkVQ12CKwn1Vttt0+N
-gSfvj6CQmLaRR94GVXNEfhg9Iv59iFrOtRPZWB3V4HwakPXOCHneExNx7O/JznLp
-xD3BJ9I4GQ3oEXc8pdGTAfSMdCsCgYEA16dz2evDgKdn0v7Ak0rU6LVmckB3Gs3r
-ta15b0eP7E1FmF77yVMpaCicjYkQL63yHzTi3UlA66jAnW0fFtzClyl3TEMnXpJR
-3b5JCeH9O/Hkvt9Go5uLODMo70rjuVuS8gcK8myefFybWH/t3gXo59hspXiG+xZY
-EKd7mEW8MScCgYEAlkcrQaYQwK3hryJmwWAONnE1W6QtS1oOtOnX6zWBQAul3RMs
-2xpekyjHu8C7sBVeoZKXLt+X0SdR2Pz2rlcqMLHqMJqHEt1OMyQdse5FX8CT9byb
-WS11bmYhR08ywHryL7J100B5KzK6JZC7smGu+5WiWO6lN2VTFb6cJNGRmS0CgYAo
-tFCnp1qFZBOyvab3pj49lk+57PUOOCPvbMjo+ibuQT+LnRIFVA8Su+egx2got7pl
-rYPMpND+KiIBFOGzXQPVqFv+Jwa9UPzmz83VcbRspiG47UfWBbvnZbCqSgZlrCU2
-TaIBVAMuEgS4VZ0+NPtbF3yaVv+TUQpaSmKHwVHeLQKBgCgGe5NVgB0u9S36ltit
-tYlnPPjuipxv9yruq+nva+WKT0q/BfeIlH3IUf2qNFQhR6caJGv7BU7naqNGq80m
-ks/J5ExR5vBpxzXgc7oBn2pyFJYckbJoccrqv48GRBigJpDjmo1f8wZ7fNt/ULH1
-NBinA5ZsT8d0v3QCr2xDJH9D
------END PRIVATE KEY-----

testing/mochitest/DoHServer/http2-cert.pem

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDEzCCAfugAwIBAgIUCTTdK3eSofAM6mNwAi4Z4YUn8WEwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOIEhUVFAyIFRlc3QgQ0EwIhgPMjAxNzAxMDEwMDAwMDBa
-GA8yMDI3MDEwMTAwMDAwMFowGzEZMBcGA1UEAwwQIEhUVFAyIFRlc3QgQ2VydDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
-PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
-HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
-Dw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7
-EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SK
-lWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0C
-AwEAAaNNMEswSQYDVR0RBEIwQIIJbG9jYWxob3N0gg9mb28uZXhhbXBsZS5jb22C
-EGFsdDEuZXhhbXBsZS5jb22CEGFsdDIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEL
-BQADggEBAE5aEiXOkvEYeWpMhkGheeeaKwgr44qiWJKC5N/8t+NprB3vNCbTMzE9
-09iWQh9EXbwMjMQ8H0uZwedek2sryxsTzxsdTC5qmEtxs/kbf0rTNUwQDjGHvzMk
-gO+ULESdLTcIFJ57olHaZaXtPGm2ELJAOiEpsYFTafmCEPXZ/b+UkGsSkuVLSOIA
-ClaIJgjff/ucvCvRwl79GzGDCoh3qpqhvxQpC/Fcdz1iQDYEVAmjgUrYJe1lTfj8
-ZozM1WIq8fQ3SCXTJK82CnX818tJio2PWq3uzb9vhpuxJJif7WoMP88Jpdh8zcEb
-YL15XPzhQMyor2p6XfwNI3J6347fd7U=
------END CERTIFICATE-----

testing/mochitest/mochitest_options.py

@@ -504,15 +504,6 @@ class MochitestArguments(ArgumentContainer):
                 "suppress": True,
             },
         ],
-        [
-            ["--use-http3-server"],
-            {
-                "dest": "useHttp3Server",
-                "default": False,
-                "help": "Whether to use the Http3 server",
-                "action": "store_true",
-            },
-        ],
         [
             ["--setpref"],
             {