Bug 1597342 [wpt PR 20300] - Update wpt metadata, a=testonly
authormoz-wptsync-bot <wptsync@mozilla.com>
Thu, 21 Nov 2019 17:32:19 +0000
changeset 504557 91a06d5c5d1e8701b225d167a2f0a65692681ed2
parent 504556 cfce63b63347ff47355f925f5b6fef334e86b4a0
child 504558 690678db913a99d5fac90c016555c58bf28ef2d6
push id36862
push useraciure@mozilla.com
push dateFri, 29 Nov 2019 21:26:53 +0000
treeherdermozilla-central@b4b10ae558b9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1597342, 20300
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1597342 [wpt PR 20300] - Update wpt metadata, a=testonly wpt-pr: 20300 wpt-type: metadata
testing/web-platform/meta/fetch/metadata/appcache.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/fetch.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/fetch.tentative.sub.html.ini
testing/web-platform/meta/fetch/metadata/font.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/history.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/iframe.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/iframe.tentative.sub.html.ini
testing/web-platform/meta/fetch/metadata/img.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/object.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini
testing/web-platform/meta/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html.ini
testing/web-platform/meta/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
testing/web-platform/meta/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/report.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/script.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/navigation.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/portal.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/unload.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/window-open.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/serviceworker.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/sharedworker.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/track.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/unload.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/window-open.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/worker.tentative.https.sub.html.ini
testing/web-platform/meta/fetch/metadata/xslt.tentative.https.sub.html.ini
--- a/testing/web-platform/meta/fetch/metadata/appcache.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/appcache.tentative.https.sub.html.ini
@@ -1,5 +1,8 @@
 [appcache.tentative.https.sub.html]
-  prefs: [browser.cache.offline.storage.enable:true,browser.cache.offline.enable:true]
-  [Appcache!]
+  prefs: [browser.cache.offline.storage.enable:true, browser.cache.offline.enable:true]
+  [undefined: sec-fetch-mode]
     expected: FAIL
 
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html.ini
@@ -1,4 +1,10 @@
 [fetch-via-serviceworker--fallback.tentative.https.sub.html]
-  [Sec-Fetch headers after SW fallback]
+  [undefined: sec-fetch-mode]
     expected: FAIL
 
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html.ini
@@ -1,4 +1,10 @@
 [fetch-via-serviceworker--respondWith.tentative.https.sub.html]
-  [Sec-Fetch headers after SW fallback]
+  [undefined: sec-fetch-mode]
     expected: FAIL
 
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/fetch.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/fetch.tentative.https.sub.html.ini
@@ -1,19 +1,55 @@
 [fetch.tentative.https.sub.html]
-  [Same-origin fetch]
+  [CORS mode: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin mode: sec-fetch-dest]
+    expected: FAIL
+
+  [Cross-site fetch: sec-fetch-dest]
+    expected: FAIL
+
+  [Cross-site fetch: sec-fetch-site]
     expected: FAIL
 
-  [Same-origin mode]
+  [Same-origin fetch: sec-fetch-mode]
+    expected: FAIL
+
+  [CORS mode: sec-fetch-mode]
     expected: FAIL
 
-  [Cross-site fetch]
+  [Same-origin mode: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-origin mode: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin fetch: sec-fetch-site]
     expected: FAIL
 
-  [Same-site fetch]
+  [Cross-site fetch: sec-fetch-mode]
+    expected: FAIL
+
+  [CORS mode: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-origin fetch: sec-fetch-dest]
+    expected: FAIL
+
+  [no-CORS mode: sec-fetch-dest]
     expected: FAIL
 
-  [no-CORS mode]
+  [Same-site fetch: sec-fetch-dest]
+    expected: FAIL
+
+  [no-CORS mode: sec-fetch-site]
     expected: FAIL
 
-  [CORS mode]
+  [Same-site fetch: sec-fetch-site]
     expected: FAIL
 
+  [no-CORS mode: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-site fetch: sec-fetch-mode]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/fetch.tentative.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/fetch.tentative.sub.html.ini
@@ -1,4 +1,10 @@
 [fetch.tentative.sub.html]
-  [http->https fetch (cross-scheme => cross-site)]
+  [http->https fetch (cross-scheme => cross-site): sec-fetch-dest]
     expected: FAIL
 
+  [http->https fetch (cross-scheme => cross-site): sec-fetch-site]
+    expected: FAIL
+
+  [http->https fetch (cross-scheme => cross-site): sec-fetch-mode]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/font.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/font.tentative.https.sub.html.ini
@@ -1,10 +1,28 @@
 [font.tentative.https.sub.html]
-  [Cross-Site font]
+  [Cross-Site font: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Site font: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Site font: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Origin font: sec-fetch-mode]
     expected: FAIL
 
-  [Same-Site font]
+  [Same-Origin font: sec-fetch-site]
+    expected: FAIL
+
+  [Cross-Site font: sec-fetch-mode]
     expected: FAIL
 
-  [Same-Origin font]
+  [Cross-Site font: sec-fetch-site]
     expected: FAIL
 
+  [Same-Site font: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Origin font: sec-fetch-dest]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/history.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/history.tentative.https.sub.html.ini
@@ -1,10 +1,55 @@
 [history.tentative.https.sub.html]
-  [back to same-origin-initiated navigation]
+  [back to same-origin-initiated navigation 2: sec-fetch-mode]
+    expected: FAIL
+
+  [back to same-site-initiated navigation 1: sec-fetch-dest]
+    expected: FAIL
+
+  [back to same-origin-initiated navigation 2: sec-fetch-dest]
+    expected: FAIL
+
+  [back to same-origin-initiated navigation 1: sec-fetch-mode]
+    expected: FAIL
+
+  [back to cross-site-initiated navigation 2: sec-fetch-site]
+    expected: FAIL
+
+  [back to same-site-initiated navigation 1: sec-fetch-site]
+    expected: FAIL
+
+  [back to same-site-initiated navigation 2: sec-fetch-mode]
+    expected: FAIL
+
+  [back to cross-site-initiated navigation 1: sec-fetch-mode]
+    expected: FAIL
+
+  [back to cross-site-initiated navigation 1: sec-fetch-site]
     expected: FAIL
 
-  [back to same-site-initiated navigation]
+  [back to cross-site-initiated navigation 1: sec-fetch-dest]
+    expected: FAIL
+
+  [back to same-site-initiated navigation 2: sec-fetch-dest]
+    expected: FAIL
+
+  [back to cross-site-initiated navigation 2: sec-fetch-dest]
+    expected: FAIL
+
+  [back to cross-site-initiated navigation 2: sec-fetch-mode]
     expected: FAIL
 
-  [back to cross-site-initiated navigation]
+  [back to same-origin-initiated navigation 1: sec-fetch-dest]
+    expected: FAIL
+
+  [back to same-site-initiated navigation 1: sec-fetch-mode]
     expected: FAIL
 
+  [back to same-site-initiated navigation 2: sec-fetch-site]
+    expected: FAIL
+
+  [back to same-origin-initiated navigation 2: sec-fetch-site]
+    expected: FAIL
+
+  [back to same-origin-initiated navigation 1: sec-fetch-site]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/iframe.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/iframe.tentative.https.sub.html.ini
@@ -1,19 +1,64 @@
 [iframe.tentative.https.sub.html]
-  [web-platform.test -> www.not-web-platform.test:8443 iframe: user-activated]
+  [web-platform.test -> www.web-platform.test:8443 iframe: forced: sec-fetch-site]
+    expected: FAIL
+
+  [web-platform.test -> www.not-web-platform.test:8443 iframe: user-activated: sec-fetch-mode]
+    expected: FAIL
+
+  [web-platform.test -> web-platform.test:8443 iframe: forced: sec-fetch-dest]
+    expected: FAIL
+
+  [web-platform.test -> www.not-web-platform.test:8443 iframe: forced: sec-fetch-mode]
     expected: FAIL
 
-  [web-platform.test -> web-platform.test:8443 iframe: user-activated]
+  [web-platform.test -> web-platform.test:8443 iframe: forced: sec-fetch-site]
+    expected: FAIL
+
+  [web-platform.test -> www.not-web-platform.test:8443 iframe: user-activated: sec-fetch-dest]
     expected: FAIL
 
-  [web-platform.test -> www.web-platform.test:8443 iframe: forced]
+  [web-platform.test -> web-platform.test:8443 iframe: user-activated: sec-fetch-user]
+    expected: FAIL
+
+  [web-platform.test -> www.not-web-platform.test:8443 iframe: user-activated: sec-fetch-site]
+    expected: FAIL
+
+  [web-platform.test -> www.web-platform.test:8443 iframe: user-activated: sec-fetch-mode]
+    expected: FAIL
+
+  [web-platform.test -> web-platform.test:8443 iframe: user-activated: sec-fetch-dest]
     expected: FAIL
 
-  [web-platform.test -> web-platform.test:8443 iframe: forced]
+  [web-platform.test -> web-platform.test:8443 iframe: user-activated: sec-fetch-mode]
+    expected: FAIL
+
+  [web-platform.test -> web-platform.test:8443 iframe: forced: sec-fetch-mode]
+    expected: FAIL
+
+  [web-platform.test -> www.not-web-platform.test:8443 iframe: forced: sec-fetch-dest]
+    expected: FAIL
+
+  [web-platform.test -> www.not-web-platform.test:8443 iframe: forced: sec-fetch-site]
+    expected: FAIL
+
+  [web-platform.test -> www.web-platform.test:8443 iframe: forced: sec-fetch-dest]
     expected: FAIL
 
-  [web-platform.test -> www.web-platform.test:8443 iframe: user-activated]
+  [web-platform.test -> www.web-platform.test:8443 iframe: forced: sec-fetch-mode]
+    expected: FAIL
+
+  [web-platform.test -> www.web-platform.test:8443 iframe: user-activated: sec-fetch-user]
+    expected: FAIL
+
+  [web-platform.test -> www.web-platform.test:8443 iframe: user-activated: sec-fetch-dest]
     expected: FAIL
 
-  [web-platform.test -> www.not-web-platform.test:8443 iframe: forced]
+  [web-platform.test -> www.not-web-platform.test:8443 iframe: user-activated: sec-fetch-user]
     expected: FAIL
 
+  [web-platform.test -> www.web-platform.test:8443 iframe: user-activated: sec-fetch-site]
+    expected: FAIL
+
+  [web-platform.test -> web-platform.test:8443 iframe: user-activated: sec-fetch-site]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/iframe.tentative.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/iframe.tentative.sub.html.ini
@@ -1,4 +1,10 @@
 [iframe.tentative.sub.html]
-  [Secure, cross-site (cross-scheme, same-host) iframe]
+  [Secure, cross-site (cross-scheme, same-host) iframe: sec-fetch-dest]
     expected: FAIL
 
+  [Secure, cross-site (cross-scheme, same-host) iframe: sec-fetch-site]
+    expected: FAIL
+
+  [Secure, cross-site (cross-scheme, same-host) iframe: sec-fetch-mode]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/img.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/img.tentative.https.sub.html.ini
@@ -1,10 +1,28 @@
 [img.tentative.https.sub.html]
-  [Cross-site image]
+  [Cross-site image: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-origin image: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-site image: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-site image: sec-fetch-mode]
     expected: FAIL
 
-  [Same-origin image]
+  [Cross-site image: sec-fetch-site]
+    expected: FAIL
+
+  [Same-site image: sec-fetch-site]
     expected: FAIL
 
-  [Same-site image]
+  [Same-origin image: sec-fetch-site]
     expected: FAIL
 
+  [Same-origin image: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-site image: sec-fetch-dest]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/object.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/object.tentative.https.sub.html.ini
@@ -1,10 +1,28 @@
 [object.tentative.https.sub.html]
-  [Same-Origin object]
+  [Same-Site object: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-Site object: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin object: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Origin object: sec-fetch-mode]
     expected: FAIL
 
-  [Cross-Site object]
+  [Same-Site object: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Origin object: sec-fetch-site]
     expected: FAIL
 
-  [Same-Site object]
+  [Cross-Site object: sec-fetch-dest]
     expected: FAIL
 
+  [Cross-Site object: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Site object: sec-fetch-site]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html.ini
@@ -1,10 +1,28 @@
 [cross-site-redirect.tentative.https.sub.html]
-  [Cross-Site -> Cross-Site redirect]
+  [Cross-Site -> Cross-Site redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Cross-Site -> Same-Origin redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-Site -> Cross-Site redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-Site -> Same-Site redirect: sec-fetch-mode]
     expected: FAIL
 
-  [Cross-Site -> Same-Site redirect]
+  [Cross-Site -> Same-Site redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Cross-Site -> Same-Site redirect: sec-fetch-dest]
     expected: FAIL
 
-  [Cross-Site -> Same-Origin redirect]
+  [Cross-Site -> Cross-Site redirect: sec-fetch-dest]
     expected: FAIL
 
+  [Cross-Site -> Same-Origin redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [Cross-Site -> Same-Origin redirect: sec-fetch-site]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
@@ -1,4 +1,10 @@
 [multiple-redirect-cross-site.tentative.https.sub.html]
-  [Same-Origin -> Cross-Site -> Same-Origin redirect]
+  [Same-Origin -> Cross-Site -> Same-Origin redirect: sec-fetch-mode]
     expected: FAIL
 
+  [Same-Origin -> Cross-Site -> Same-Origin redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin -> Cross-Site -> Same-Origin redirect: sec-fetch-dest]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini
@@ -1,41 +1,62 @@
 [multiple-redirect-https-downgrade-upgrade.tentative.sub.html]
   expected: TIMEOUT
   [Https downgrade-upgrade stylesheet]
     expected: TIMEOUT
 
-  [Https downgrade-upgrade object]
-    expected: FAIL
-
-  [Https downgrade-upgrade iframe]
-    expected: FAIL
-
-  [Https downgrade-upgrade script => No headers]
-    expected: FAIL
-
   [Https downgrade-upgrade track]
     expected: NOTRUN
 
-  [Https downgrade-upgrade fetch() api]
-    expected: FAIL
-
-  [Https downgrade-upgrade top level navigation]
-    expected: FAIL
-
   [Https downgrade-upgrade image => No headers]
     expected: NOTRUN
 
   [Https downgrade-upgrade font => No headers]
     expected: NOTRUN
 
   [Https downgrade-upgrade prefetch => No headers]
     expected:
-      if (processor == "x86_64") and not fission and (os == "linux") and debug and not webrender: [TIMEOUT, FAIL]
-      if (processor == "x86_64") and not fission and (os == "win") and not debug and not webrender: [TIMEOUT, FAIL]
-      if (processor == "x86_64") and not fission and (os == "win") and not debug and webrender: [TIMEOUT, FAIL]
-      if (processor == "x86_64") and not fission and (os == "win") and debug and webrender: [TIMEOUT, FAIL]
-      if (processor == "x86_64") and fission and (os == "linux") and not debug and not webrender: [TIMEOUT, FAIL]
+      if not fission and (os == "win") and debug and (processor == "x86_64") and webrender: [TIMEOUT, FAIL]
+      if fission and (os == "linux") and not debug and webrender: [TIMEOUT, FAIL]
+      if fission and (os == "linux") and not debug and not webrender: [TIMEOUT, FAIL]
+      if not fission and (os == "linux") and not webrender and not debug: [TIMEOUT, FAIL]
+      if not fission and (os == "win") and not debug and (processor == "x86_64"): [TIMEOUT, FAIL]
       [FAIL, TIMEOUT]
 
-  [Https downgrade-upgrade embed]
+  [Https downgrade-upgrade top level navigation: sec-fetch-mode]
+    expected: FAIL
+
+  [Https downgrade-upgrade script => No headers: sec-fetch-site]
+    expected: FAIL
+
+  [Https downgrade-upgrade iframe: sec-fetch-site]
+    expected: FAIL
+
+  [Https downgrade-upgrade fetch() api: sec-fetch-mode]
+    expected: FAIL
+
+  [Https downgrade-upgrade object: sec-fetch-site]
+    expected: FAIL
+
+  [Https downgrade-upgrade fetch() api: sec-fetch-dest]
     expected: FAIL
 
+  [Https downgrade-upgrade embed: sec-fetch-site]
+    expected: FAIL
+
+  [Https downgrade-upgrade object: sec-fetch-mode]
+    expected: FAIL
+
+  [Https downgrade-upgrade embed: sec-fetch-mode]
+    expected: FAIL
+
+  [Https downgrade-upgrade script => No headers: sec-fetch-mode]
+    expected: FAIL
+
+  [Https downgrade-upgrade fetch() api: sec-fetch-site]
+    expected: FAIL
+
+  [Https downgrade-upgrade top level navigation: sec-fetch-site]
+    expected: FAIL
+
+  [Https downgrade-upgrade iframe: sec-fetch-mode]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
@@ -1,4 +1,10 @@
 [multiple-redirect-same-site.tentative.https.sub.html]
-  [Same-Origin -> Same-Site -> Same-Origin redirect]
+  [undefined: sec-fetch-mode]
     expected: FAIL
 
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html.ini
@@ -1,38 +1,60 @@
 [redirect-http-upgrade.tentative.sub.html]
   expected: TIMEOUT
-  [Http upgrade embed]
-    expected: FAIL
-
-  [Http upgrade top level navigation]
-    expected: FAIL
-
-  [Http upgrade iframe]
-    expected: FAIL
-
-  [Http upgrade script => No headers]
-    expected: FAIL
-
   [Http upgrade image => No headers]
     expected: NOTRUN
 
   [Http upgrade font => No headers]
     expected: NOTRUN
 
-  [Http upgrade object]
-    expected: FAIL
-
   [Http upgrade stylesheet]
     expected: TIMEOUT
 
   [Http upgrade prefetch => No headers]
     expected:
-      if not fission and (os == "linux") and webrender and debug: [TIMEOUT, FAIL]
-      if not fission and (os == "linux") and not webrender and debug: [TIMEOUT, FAIL]
+      if (os == "win") and (processor == "x86_64") and not debug and fission and webrender: [TIMEOUT, FAIL]
+      if (os == "win") and (processor == "x86_64") and not debug and not fission: [TIMEOUT, FAIL]
+      if (os == "win") and (processor == "x86_64") and debug and webrender: [TIMEOUT, FAIL]
       [FAIL, TIMEOUT]
 
   [Http upgrade track]
     expected: NOTRUN
 
-  [Http upgrade fetch() api]
+  [Http upgrade top level navigation: sec-fetch-mode]
+    expected: FAIL
+
+  [Http upgrade object: sec-fetch-mode]
+    expected: FAIL
+
+  [Http upgrade fetch() api: sec-fetch-dest]
+    expected: FAIL
+
+  [Http upgrade iframe: sec-fetch-site]
+    expected: FAIL
+
+  [Http upgrade top level navigation: sec-fetch-site]
+    expected: FAIL
+
+  [Http upgrade fetch() api: sec-fetch-mode]
     expected: FAIL
 
+  [Http upgrade embed: sec-fetch-site]
+    expected: FAIL
+
+  [Http upgrade object: sec-fetch-site]
+    expected: FAIL
+
+  [Http upgrade script => No headers: sec-fetch-mode]
+    expected: FAIL
+
+  [Http upgrade iframe: sec-fetch-mode]
+    expected: FAIL
+
+  [Http upgrade fetch() api: sec-fetch-site]
+    expected: FAIL
+
+  [Http upgrade script => No headers: sec-fetch-site]
+    expected: FAIL
+
+  [Http upgrade embed: sec-fetch-mode]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
@@ -1,29 +1,27 @@
 [redirect-https-downgrade.tentative.sub.html]
   expected: TIMEOUT
+  [Https downgrade script => No headers]
+    expected: FAIL
+
   [Https downgrade stylesheet]
     expected: TIMEOUT
 
   [Https downgrade font => No headers]
     expected: NOTRUN
 
   [Https downgrade prefetch => No headers]
     expected:
-      if (os == "linux") and not debug and not webrender and not fission and (processor == "x86"): FAIL
-      if (os == "win") and debug and (processor == "x86_64") and webrender and not fission: ["TIMEOUT", "FAIL"]
-      if (os == "linux") and debug and webrender and not fission: ["TIMEOUT", "FAIL"]
-      if (os == "linux") and not debug and not webrender and fission: FAIL
-      if (os == "win") and debug and (processor == "x86") and fission: FAIL
-      if (os == "linux") and not debug and webrender: FAIL
-      if os == "mac": ["TIMEOUT", "FAIL"]
-      if os == "android": FAIL
-      [FAIL, PASS, TIMEOUT]
+      if (os == "win") and (processor == "x86_64") and webrender and not debug and not fission: [TIMEOUT, FAIL]
+      if (os == "win") and (processor == "x86_64") and webrender and not debug and fission: [TIMEOUT, FAIL]
+      if (os == "win") and (processor == "x86_64") and not webrender and not debug and fission: [TIMEOUT, FAIL]
+      if (os == "win") and (processor == "x86_64") and not webrender and not debug and not fission: TIMEOUT
+      if (os == "win") and (processor == "x86_64") and webrender and debug: [FAIL, TIMEOUT]
+      if (os == "win") and (processor == "x86_64") and not webrender and debug: [TIMEOUT, FAIL]
+      FAIL
 
   [Https downgrade track]
     expected: NOTRUN
 
-  [Https downgrade script => No headers]
-    expected: FAIL
-
   [Https downgrade image => No headers]
     expected: NOTRUN
 
--- a/testing/web-platform/meta/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html.ini
@@ -1,10 +1,28 @@
 [same-origin-redirect.tentative.https.sub.html]
-  [Same-Origin -> Cross-Site redirect]
+  [Same-Origin -> Cross-Site redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin -> Same-Site redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Origin -> Cross-Site redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [undefined: sec-fetch-mode]
     expected: FAIL
 
-  [Same-Origin -> Same-Site redirect]
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin -> Cross-Site redirect: sec-fetch-mode]
     expected: FAIL
 
-  [Same-Origin -> Same-Origin redirect]
+  [Same-Origin -> Same-Site redirect: sec-fetch-site]
     expected: FAIL
 
+  [Same-Origin -> Same-Site redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html.ini
@@ -1,10 +1,28 @@
 [same-site-redirect.tentative.https.sub.html]
-  [Same-Site -> Same-Origin redirect]
+  [Same-Site -> Same-Site redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Site -> Same-Origin redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Site -> Same-Site redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Site -> Cross-Site redirect: sec-fetch-dest]
     expected: FAIL
 
-  [Same-Site -> Same-Site redirect]
+  [Same-Site -> Same-Origin redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Site -> Cross-Site redirect: sec-fetch-site]
     expected: FAIL
 
-  [Same-Site -> Cross-Site redirect]
+  [Same-Site -> Same-Origin redirect: sec-fetch-site]
     expected: FAIL
 
+  [Same-Site -> Same-Site redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Site -> Cross-Site redirect: sec-fetch-mode]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/report.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/report.tentative.https.sub.html.ini
@@ -1,11 +1,28 @@
 [report.tentative.https.sub.html]
-  expected: ERROR
-  [cross-site report]
-    expected: TIMEOUT
+  [same-origin report: sec-fetch-site]
+    expected: FAIL
+
+  [same-origin report: sec-fetch-mode]
+    expected: FAIL
+
+  [same-site report: sec-fetch-site]
+    expected: FAIL
+
+  [cross-site report: sec-fetch-site]
+    expected: FAIL
 
-  [same-site report]
-    expected: TIMEOUT
+  [same-site report: sec-fetch-dest]
+    expected: FAIL
+
+  [cross-site report: sec-fetch-dest]
+    expected: FAIL
 
-  [same-origin report]
-    expected: TIMEOUT
+  [same-site report: sec-fetch-mode]
+    expected: FAIL
 
+  [same-origin report: sec-fetch-dest]
+    expected: FAIL
+
+  [cross-site report: sec-fetch-mode]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/script.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/script.tentative.https.sub.html.ini
@@ -1,13 +1,37 @@
 [script.tentative.https.sub.html]
-  [Same-origin script]
+  [Cross-site script: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-site script: sec-fetch-dest]
     expected: FAIL
 
-  [Cross-site script]
+  [Cross-site script: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin script: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-site script: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin script: sec-fetch-mode]
     expected: FAIL
 
-  [Same-origin CORS script]
+  [Same-origin CORS script: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-origin CORS script: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin CORS script: sec-fetch-mode]
     expected: FAIL
 
-  [Same-site script]
+  [Same-origin script: sec-fetch-site]
     expected: FAIL
 
+  [Same-site script: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-site script: sec-fetch-dest]
+    expected: FAIL
+
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[embed.tentative.https.sub.html]
-  [Cross-Site embed]
-    expected: FAIL
-
-  [Same-Site embed]
-    expected: FAIL
-
-  [Same-Origin embed]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch-preflight.tentative.https.sub.html]
-  [Same-site fetch with preflight]
-    expected: FAIL
-
-  [Cross-site fetch with preflight]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[fetch-via-serviceworker--fallback.tentative.https.sub.html]
-  [Sec-Fetch headers after SW fallback]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[fetch-via-serviceworker--respondWith.tentative.https.sub.html]
-  [Sec-Fetch headers after SW fallback]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[fetch.tentative.https.sub.html]
-  [Same-origin fetch]
-    expected: FAIL
-
-  [Same-origin mode]
-    expected: FAIL
-
-  [Cross-site fetch]
-    expected: FAIL
-
-  [Same-site fetch]
-    expected: FAIL
-
-  [no-CORS mode]
-    expected: FAIL
-
-  [CORS mode]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[fetch.tentative.sub.html]
-  [http->https fetch (cross-scheme => cross-site)]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[font.tentative.https.sub.html]
-  [Cross-Site font]
-    expected: FAIL
-
-  [Same-Site font]
-    expected: FAIL
-
-  [Same-Origin font]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[frame.tentative.https.sub.html]
-  [web-platform.test -> www.not-web-platform.test:8443 iframe: user-activated]
-    expected: FAIL
-
-  [web-platform.test -> web-platform.test:8443 iframe: user-activated]
-    expected: FAIL
-
-  [web-platform.test -> www.web-platform.test:8443 iframe: forced]
-    expected: FAIL
-
-  [web-platform.test -> web-platform.test:8443 iframe: forced]
-    expected: FAIL
-
-  [web-platform.test -> www.web-platform.test:8443 iframe: user-activated]
-    expected: FAIL
-
-  [web-platform.test -> www.not-web-platform.test:8443 iframe: forced]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[frame.tentative.sub.html]
-  [Secure, cross-site (cross-scheme, same-host) frame]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[history.tentative.https.sub.html]
-  [back to same-origin-initiated navigation]
-    expected: FAIL
-
-  [back to same-site-initiated navigation]
-    expected: FAIL
-
-  [back to cross-site-initiated navigation]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[iframe.tentative.https.sub.html]
-  [web-platform.test -> www.not-web-platform.test:8443 iframe: user-activated]
-    expected: FAIL
-
-  [web-platform.test -> web-platform.test:8443 iframe: user-activated]
-    expected: FAIL
-
-  [web-platform.test -> www.web-platform.test:8443 iframe: forced]
-    expected: FAIL
-
-  [web-platform.test -> web-platform.test:8443 iframe: forced]
-    expected: FAIL
-
-  [web-platform.test -> www.web-platform.test:8443 iframe: user-activated]
-    expected: FAIL
-
-  [web-platform.test -> www.not-web-platform.test:8443 iframe: forced]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[iframe.tentative.sub.html]
-  [Secure, cross-site (cross-scheme, same-host) iframe]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[img.tentative.https.sub.html]
-  [Cross-site image]
-    expected: FAIL
-
-  [Same-origin image]
-    expected: FAIL
-
-  [Same-site image]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/navigation.https.sub.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[navigation.https.sub.html]
-  expected: ERROR
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[object.tentative.https.sub.html]
-  [Same-Origin object]
-    expected: FAIL
-
-  [Cross-Site object]
-    expected: FAIL
-
-  [Same-Site object]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/portal.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[portal.tentative.https.sub.html]
-  expected: TIMEOUT
-  [web-platform.test -> www.web-platform.test:8443 portal]
-    expected: TIMEOUT
-
-  [web-platform.test -> web-platform.test:8443 portal]
-    expected: TIMEOUT
-
-  [web-platform.test -> www.not-web-platform.test:8443 portal]
-    expected: TIMEOUT
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[prefetch.tentative.https.sub.html]
-  [<link rel='prefetch' href='https://www.web-platform.test:8443/...'>]
-    expected: FAIL
-
-  [<link rel='prefetch' href='https://www.not-web-platform.test:8443/...'>]
-    expected: FAIL
-
-  [<link rel='prefetch' href='https://web-platform.test:8443/...'>]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-site-redirect.tentative.https.sub.html]
-  [Cross-Site -> Cross-Site redirect]
-    expected: FAIL
-
-  [Cross-Site -> Same-Site redirect]
-    expected: FAIL
-
-  [Cross-Site -> Same-Origin redirect]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[multiple-redirect-cross-site.tentative.https.sub.html]
-  [Same-Origin -> Cross-Site -> Same-Origin redirect]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[multiple-redirect-same-site.tentative.https.sub.html]
-  [Same-Origin -> Same-Site -> Same-Origin redirect]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-redirect.tentative.https.sub.html]
-  [Same-Origin -> Cross-Site redirect]
-    expected: FAIL
-
-  [Same-Origin -> Same-Site redirect]
-    expected: FAIL
-
-  [Same-Origin -> Same-Origin redirect]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-site-redirect.tentative.https.sub.html]
-  [Same-Site -> Same-Origin redirect]
-    expected: FAIL
-
-  [Same-Site -> Same-Site redirect]
-    expected: FAIL
-
-  [Same-Site -> Cross-Site redirect]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[report.tentative.https.sub.html]
-  expected: ERROR
-  [cross-site report]
-    expected: TIMEOUT
-
-  [same-site report]
-    expected: TIMEOUT
-
-  [same-origin report]
-    expected: TIMEOUT
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[script.tentative.https.sub.html]
-  [Same-origin script]
-    expected: FAIL
-
-  [Cross-site script]
-    expected: FAIL
-
-  [Same-origin CORS script]
-    expected: FAIL
-
-  [Same-site script]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[serviceworker.tentative.https.sub.html]
-  [metadata for service worker scripts]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sharedworker.tentative.https.sub.html]
-  [Same-Origin sharedworker]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[style.tentative.https.sub.html]
-  expected: TIMEOUT
-  [Same-Origin, cors style]
-    expected: NOTRUN
-
-  [Cross-Site style]
-    expected: NOTRUN
-
-  [Same-Site style]
-    expected: NOTRUN
-
-  [Same-Origin style]
-    expected: TIMEOUT
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[track.tentative.https.sub.html]
-  [Same-Site track]
-    expected: FAIL
-
-  [Same-Origin track]
-    expected: FAIL
-
-  [Same-Origin, CORS track]
-    expected: FAIL
-
-  [Cross-Site track]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[trailing-dot.tentative.https.sub.html]
-  [Fetching a resource from a cross-site host, spelled with a trailing dot.]
-    expected: FAIL
-
-  [Fetching a resource from the same origin, but spelled with a trailing dot.]
-    expected: FAIL
-
-  [Fetching a resource from the same site, but spelled with a trailing dot.]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/unload.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[unload.tentative.https.sub.html]
-  [Fetch from an unload handler]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/window-open.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[window-open.tentative.https.sub.html]
-  [Same-site window, forced]
-    expected: FAIL
-
-  [Same-site window, user-activated]
-    expected: FAIL
-
-  [Cross-site window, forced, reloaded]
-    expected: FAIL
-
-  [Cross-site window, user-activated]
-    expected: FAIL
-
-  [Same-origin window, user-activated]
-    expected: FAIL
-
-  [Cross-site window, forced]
-    expected: FAIL
-
-  [Same-origin window, forced]
-    expected: FAIL
-
-  [Same-origin window, forced, reloaded]
-    expected: FAIL
-
-  [Same-site window, forced, reloaded]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[worker.tentative.https.sub.html]
-  [Same-Origin worker]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[xslt.tentative.https.sub.html]
-  [Same-Origin xslt]
-    expected: FAIL
-
-  [Cross-site xslt]
-    expected: FAIL
-
-  [Same-site xslt]
-    expected: FAIL
-
--- a/testing/web-platform/meta/fetch/metadata/serviceworker.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/serviceworker.tentative.https.sub.html.ini
@@ -1,4 +1,19 @@
 [serviceworker.tentative.https.sub.html]
-  [metadata for service worker scripts]
+  [Register service worker: sec-fetch-dest]
+    expected: FAIL
+
+  [Register service worker: sec-fetch-mode]
+    expected: FAIL
+
+  [Update service worker: sec-fetch-mode]
     expected: FAIL
 
+  [Update service worker: sec-fetch-site]
+    expected: FAIL
+
+  [Update service worker: sec-fetch-dest]
+    expected: FAIL
+
+  [Register service worker: sec-fetch-site]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/sharedworker.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/sharedworker.tentative.https.sub.html.ini
@@ -1,4 +1,10 @@
 [sharedworker.tentative.https.sub.html]
-  [Same-Origin sharedworker]
+  [undefined: sec-fetch-mode]
     expected: FAIL
 
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/track.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/track.tentative.https.sub.html.ini
@@ -1,14 +1,37 @@
 [track.tentative.https.sub.html]
-  expected: ERROR
-  [Same-Site track]
-    expected: NOTRUN
+  [Same-Site track: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin, CORS track: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Site track: sec-fetch-dest]
+    expected: FAIL
+
+  [Cross-Site track: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-Site track: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Origin track: sec-fetch-mode]
+    expected: FAIL
 
-  [Same-Origin track]
-    expected: TIMEOUT
+  [Same-Origin track: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin track: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Origin, CORS track: sec-fetch-dest]
+    expected: FAIL
 
-  [Same-Origin, CORS track]
-    expected: NOTRUN
+  [Same-Site track: sec-fetch-mode]
+    expected: FAIL
 
-  [Cross-Site track]
-    expected: NOTRUN
+  [Same-Origin, CORS track: sec-fetch-site]
+    expected: FAIL
 
+  [Cross-Site track: sec-fetch-site]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/unload.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/unload.tentative.https.sub.html.ini
@@ -1,4 +1,10 @@
 [unload.tentative.https.sub.html]
-  [Fetch from an unload handler]
+  [undefined: sec-fetch-mode]
     expected: FAIL
 
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/window-open.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/window-open.tentative.https.sub.html.ini
@@ -1,28 +1,103 @@
 [window-open.tentative.https.sub.html]
-  [Same-site window, forced]
+  expected:
+    if (os == "android") and not debug: ["OK", "ERROR"]
+    if (os == "android") and debug: ["OK", "ERROR"]
+  [Cross-site window, forced, reloaded]
+    expected:
+      if os == "android": FAIL
+
+  [Same-site window, forced, reloaded]
+    expected:
+      if (os == "android") and not debug: FAIL
+      if (os == "android") and debug: ["FAIL", "PASS"]
+
+  [Cross-site window, user-activated: sec-fetch-user]
+    expected: FAIL
+
+  [Same-origin window, user-activated: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-origin window, forced, reloaded: sec-fetch-site]
+    expected: FAIL
+
+  [Cross-site window, forced, reloaded: sec-fetch-dest]
     expected: FAIL
 
-  [Same-site window, user-activated]
+  [Same-origin window, forced: sec-fetch-site]
+    expected: FAIL
+
+  [Same-site window, user-activated: sec-fetch-site]
+    expected: FAIL
+
+  [Cross-site window, user-activated: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-origin window, forced, reloaded: sec-fetch-dest]
     expected: FAIL
 
-  [Cross-site window, forced, reloaded]
+  [Same-site window, forced: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-site window, user-activated: sec-fetch-dest]
     expected: FAIL
 
-  [Cross-site window, user-activated]
+  [Cross-site window, forced: sec-fetch-dest]
+    expected: FAIL
+
+  [Cross-site window, user-activated: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-site window, forced, reloaded: sec-fetch-dest]
     expected: FAIL
 
-  [Same-origin window, user-activated]
+  [Same-origin window, user-activated: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-site window, forced: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-site window, forced: sec-fetch-site]
     expected: FAIL
 
-  [Cross-site window, forced]
+  [Cross-site window, forced, reloaded: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-site window, forced: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-origin window, forced, reloaded: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-site window, forced, reloaded: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin window, user-activated: sec-fetch-user]
     expected: FAIL
 
-  [Same-origin window, forced]
+  [Cross-site window, user-activated: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin window, forced: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-site window, user-activated: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-origin window, forced: sec-fetch-mode]
     expected: FAIL
 
-  [Same-origin window, forced, reloaded]
+  [Same-site window, forced, reloaded: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-site window, user-activated: sec-fetch-user]
     expected: FAIL
 
-  [Same-site window, forced, reloaded]
+  [Same-site window, forced, reloaded: sec-fetch-site]
     expected: FAIL
 
+  [Same-origin window, user-activated: sec-fetch-site]
+    expected: FAIL
+
+  [Same-site window, forced: sec-fetch-site]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/worker.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/worker.tentative.https.sub.html.ini
@@ -1,4 +1,10 @@
 [worker.tentative.https.sub.html]
-  [Same-Origin worker]
+  [undefined: sec-fetch-mode]
     expected: FAIL
 
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
+    expected: FAIL
+
--- a/testing/web-platform/meta/fetch/metadata/xslt.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/metadata/xslt.tentative.https.sub.html.ini
@@ -1,10 +1,16 @@
 [xslt.tentative.https.sub.html]
-  [Same-Origin xslt]
-    expected: FAIL
-
   [Cross-site xslt]
     expected: FAIL
 
   [Same-site xslt]
     expected: FAIL
 
+  [undefined: sec-fetch-mode]
+    expected: FAIL
+
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
+    expected: FAIL
+