Update web-platform-tests to revision e2ac2e7d7539c4eb9963b7f23dbb3f7692fce537

2025-07-16 11:53:39 +01:00 · 2019-01-09 21:01:39 -05:00 · 2019-01-09 21:01:39 -05:00 · 59ef536d5e
commit 59ef536d5e
parent e6e00cb554
120 changed files with 1207 additions and 3167 deletions
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_svg_image_with_foreign_object_does_not_taint.html.ini
+++ b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_svg_image_with_foreign_object_does_not_taint.html.ini
@ -0,0 +1,5 @@
+[drawimage_svg_image_with_foreign_object_does_not_taint.html]
+  expected: TIMEOUT
+  [Canvas should not be tainted after drawing SVG including <foreignObject>]
+    expected: TIMEOUT
+
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
--- a/tests/wpt/metadata/css/css-backgrounds/background-image-centered-with-border-radius.html.ini
+++ b/tests/wpt/metadata/css/css-backgrounds/background-image-centered-with-border-radius.html.ini
@ -0,0 +1,2 @@
+[background-image-centered-with-border-radius.html]
+  expected: FAIL
--- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
@ -23,9 +23,6 @@
  [Matching font-weight: '430' should prefer '450 460' over '500']
    expected: FAIL

-  [Matching font-weight: '430' should prefer '500' over '400 425']
-    expected: FAIL
-
  [Matching font-weight: '430' should prefer '400 425' over '350 399']
    expected: FAIL

--- a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
@ -74,6 +74,3 @@
  [opacity end]
    expected: FAIL

-  [outline-width end]
-    expected: FAIL
-
--- a/tests/wpt/metadata/encoding/encodeInto.any.js.ini
+++ b/tests/wpt/metadata/encoding/encodeInto.any.js.ini
@ -0,0 +1,261 @@
+[encodeInto.any.html]
+  [encodeInto() with 𝌆A and destination length 3, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with 𝌆A and destination length 3, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with 𝌆A and destination length 3, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with 𝌆A and destination length 3, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() cannot operate on a detached buffer]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with 𝌆A and destination length 3, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with 𝌆A and destination length 3, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 4, filler random]
+    expected: FAIL
+
+
+[encodeInto.any.worker.html]
+  [encodeInto() with 𝌆A and destination length 3, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with 𝌆A and destination length 3, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with 𝌆A and destination length 3, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with 𝌆A and destination length 3, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() cannot operate on a detached buffer]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 0, filler random]
+    expected: FAIL
+
+  [encodeInto() with Hi and destination length 0, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with A<> and destination length 4, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with <20>A<EFBFBD>A¥Hi and destination length 10, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with ¥¥ and destination length 4, offset 0, filler 0]
+    expected: FAIL
+
+  [encodeInto() with 𝌆A and destination length 3, offset 0, filler 128]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 4, filler 0]
+    expected: FAIL
+
+  [encodeInto() with 𝌆A and destination length 3, offset 4, filler random]
+    expected: FAIL
+
+  [encodeInto() with 𝌆 and destination length 4, offset 4, filler 128]
+    expected: FAIL
+
+  [encodeInto() with A and destination length 10, offset 4, filler random]
+    expected: FAIL
+
--- a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
+++ b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
@ -2,7 +2,7 @@
  type: testharness

 [single-byte-decoder.html?document]
-  expected: TIMEOUT
+  expected: CRASH
  [ISO-8859-4: iso_8859-4:1988 (document.characterSet and document.inputEncoding)]
    expected: FAIL

@ -32,7 +32,7 @@


 [single-byte-decoder.html?XMLHttpRequest]
-  expected: CRASH
+  expected: TIMEOUT
  [ISO-8859-2: iso_8859-2:1987 (XMLHttpRequest)]
    expected: FAIL

@ -55,7 +55,7 @@
    expected: FAIL

  [windows-1252: iso_8859-1:1987 (XMLHttpRequest)]
-    expected: FAIL
+    expected: TIMEOUT

  [windows-1254: iso_8859-9:1989 (XMLHttpRequest)]
    expected: TIMEOUT
@ -141,5 +141,44 @@
  [windows-1254: cp1254 (XMLHttpRequest)]
    expected: TIMEOUT

+  [windows-1252: iso88591 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: ibm819 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: iso_8859-1 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: latin1 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1253: cp1253 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: csisolatin1 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: iso8859-1 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: x-cp1252 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: l1 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: iso-8859-1 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: windows-1252 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: iso-ir-100 (XMLHttpRequest)]
+    expected: TIMEOUT
+
+  [windows-1252: us-ascii (XMLHttpRequest)]
+    expected: TIMEOUT
+

 [single-byte-decoder.html?TextDecoder]
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@ -1,4 +1,4 @@
-[traverse_the_history_5.html]
+[traverse_the_history_4.html]
  [Multiple history traversals, last would be aborted]
    expected: FAIL

--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
@ -5,7 +5,7 @@
    expected: TIMEOUT

  [picture: source (max-width:500px) valid image, img valid image, resize to wide]
-    expected: FAIL
+    expected: TIMEOUT

  [picture: source (max-width:500px) valid image, img broken image, resize to narrow]
    expected: TIMEOUT
@ -13,12 +13,3 @@
  [picture: source (max-width:500px) valid image, img valid image, resize to narrow]
    expected: FAIL

-  [picture: source (max-width:500px) broken image, img valid image, resize to narrow]
-    expected: FAIL
-
-  [img (srcset 1 cand) valid image, resize to narrow]
-    expected: FAIL
-
-  [picture: same URL in source (max-width:500px) and img, resize to narrow]
-    expected: FAIL
-
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-002.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-002.html.ini
@ -0,0 +1,2 @@
+[sizes-dynamic-002.html]
+  expected: TIMEOUT
--- a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
@ -1,7 +0,0 @@
-[toggleEvent.html]
-  [Calling open twice on 'details' fires only one toggle event]
-    expected: FAIL
-
-  [Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element]
-    expected: FAIL
-
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.html.ini
@ -1,5 +0,0 @@
-[promise-rejection-events.html]
-  expected: TIMEOUT
-  [rejectionhandled is dispatched from a queued task, and not immediately]
-    expected: TIMEOUT
-
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
@ -1,5 +1,4 @@
 [005.html]
-  expected: ERROR
  [dedicated worker in shared worker in dedicated worker]
    expected: FAIL

--- a/tests/wpt/mozilla/meta/mozilla/paint_timing.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/paint_timing.html.ini
@ -0,0 +1,4 @@
+[paint_timing.html]
+  [Performance entries observer]
+    expected: FAIL
+
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@ -10,13 +10,12 @@
 # of this repository" setting must also be enabled in the Azure DevOps project:
 # https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/github#validate-contributions-from-forks

-trigger: none # disable builds for branches
-
 jobs:
 # The affected tests jobs are unconditional for speed, as most PRs have one or
 # more affected tests: https://github.com/web-platform-tests/wpt/issues/13936.
 - job: affected_macOS
  displayName: 'affected tests (Safari Technology Preview)'
+  condition: eq(variables['Build.Reason'], 'PullRequest')
  pool:
    vmImage: 'macOS-10.13'
  steps:
@ -26,6 +25,7 @@ jobs:

 - job: affected_without_changes_macOS
  displayName: 'affected tests without changes (Safari Technology Preview)'
+  condition: eq(variables['Build.Reason'], 'PullRequest')
  pool:
    vmImage: 'macOS-10.13'
  steps:
@ -39,6 +39,7 @@ jobs:
 # and all following jobs wait for it to finish and depend on its output.
 - job: decision
  displayName: './wpt test-jobs'
+  condition: eq(variables['Build.Reason'], 'PullRequest')
  pool:
    vmImage: 'ubuntu-16.04'
  steps:
@ -121,3 +122,29 @@ jobs:
  - template: tools/ci/azure/tox_pytest.yml
    parameters:
      directory: tools/wpt/
+
+- job: all_macOS
+  displayName: 'all tests (Safari Technology Preview)'
+  condition: eq(variables['Build.SourceBranch'], 'refs/heads/epochs/daily')
+  strategy:
+    parallel: 4 # chosen to make runtime ~2h
+  timeoutInMinutes: 360
+  pool:
+    vmImage: 'macOS-10.13'
+  steps:
+  - template: tools/ci/azure/checkout.yml
+  - template: tools/ci/azure/pip_install.yml
+    parameters:
+      packages: virtualenv
+  - template: tools/ci/azure/install_fonts.yml
+  - template: tools/ci/azure/install_certs.yml
+  - template: tools/ci/azure/install_safari.yml
+  - template: tools/ci/azure/update_hosts.yml
+  - template: tools/ci/azure/update_manifest.yml
+  - script: no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --channel preview safari
+    displayName: 'Run tests'
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish results'
+    inputs:
+      artifactName: 'results'
+    condition: succeededOrFailed()
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_svg_image_with_foreign_object_does_not_taint.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_svg_image_with_foreign_object_does_not_taint.html
@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Draw an SVG image with a foreignObject to a canvas</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+function loadImage(url) {
+  return new Promise(resolve => {
+    const image = new window.Image();
+    image.onload = () => {
+      resolve(image);
+    };
+    image.src = url;
+  });
+}
+
+promise_test(async (t) => {
+  // Load a data URL for an SVG image with a foreign object.
+  const url = 'data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100"><foreignObject></foreignObject></svg>';
+  const image = await loadImage(url);
+
+  // Draw the image to a canvas.
+  const canvas = document.createElement('canvas');
+  const context = canvas.getContext('2d');
+  canvas.width = image.width;
+  canvas.height = image.height;
+  context.drawImage(image, 0, 0);
+
+  // The canvas should not be tainted, so the following shouldn't throw.
+  assert_true(canvas.toDataURL().length > 0);
+}, 'Canvas should not be tainted after drawing SVG including <foreignObject>');
+</script>
--- a/tests/wpt/web-platform-tests/bluetooth/META.yml
+++ b/tests/wpt/web-platform-tests/bluetooth/META.yml
@ -1,5 +1,6 @@
 spec: https://webbluetoothcg.github.io/web-bluetooth/
 suggested_reviewers:
-  - jyasskin
+  - dougt
  - g-ortuno
-  - scheib
+  - odejesush
+  - reillyeon
--- a/tests/wpt/web-platform-tests/css/compositing/inheritance.html
+++ b/tests/wpt/web-platform-tests/css/compositing/inheritance.html
@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Inheritance of Compositing and Blending properties</title>
+<link rel="help" href="https://drafts.fxtf.org/compositing-1/#property-index">
+<meta name="assert" content="Properties do not inherit.">
+<meta name="assert" content="Properties have initial values according to the spec.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/inheritance-testcommon.js"></script>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+assert_not_inherited('background-blend-mode', 'normal', 'multiply');
+assert_not_inherited('isolation', 'auto', 'isolate');
+assert_not_inherited('mix-blend-mode', 'normal', 'overlay');
+</script>
+</body>
+</html>
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-centered-with-border-radius.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-centered-with-border-radius.html
@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>CSS Background Test: Centered background image with border radius</title>
+  <link rel="author" title="schenney" href="mailto:schenney@chromium.org">
+  <link rel="help" href="http://www.w3.org/TR/css3-background">
+  <link rel="match" href="reference/background-image-centered-with-border-radius-ref.html">
+  <style>
+    span {
+      background: url(support/green-60x60-red-5px-border.png) no-repeat center;
+      border: 5px solid green;
+      border-radius: 5px;
+      box-sizing: border-box;
+      display: inline-block;
+      height: 60px;
+      width: 60px;
+    }
+  </style>
+</head>
+
+<body>
+  <span></span>
+</body>
+</html>
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-first-line.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/background-image-first-line.html
@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Test: background-image applicability to ::first-letter</title>
-<link rel="help" href="http://www.w3.org/TR/css3-background/">
-<link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#first-line-pseudo">
-<link rel="match" href="reference/background-image-first-line-ref.html">
-<meta name="flags" content="ahem image">
-<meta name="assert" content="background-image applicability to ::first-line">
-<style type="text/css">
-#content {
-  color: transparent;
-  font: 100px Ahem;
-}
-#content::first-line {
-  background-image: url("support/cat.png");  /* 98 w. by 99px h. */
-  background-repeat: no-repeat;
-}
-</style>
-<p>Test passes if cat image is visible.</p>
-<div id="content">X</div>
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-centered-with-border-radius-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-centered-with-border-radius-ref.html
@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>CSS Background Test Reference</title>
+  <link rel="author" title="schenney" href="mailto:schenney@chromium.org">
+  <style>
+    span {
+      background-color: green;
+      display: inline-block;
+      height: 60px;
+      width: 60px;
+      border: 5px solid green;
+      border-radius: 5px;
+      box-sizing: border-box;
+    }
+  </style>
+</head>
+
+<body>
+  <span></span>
+</body>
+</html>
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-first-line-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-image-first-line-ref.html
@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<meta name="flags" content="ahem image">
-<style type="text/css">
-#content {
-  color: transparent;
-  font: 100px Ahem;
-  background-image: url("../support/cat.png");  /* 98 w. by 99px h. */
-  background-repeat: no-repeat;
-}
-</style>
-<p>Test passes if cat image is visible.</p>
-<div id="content">X</div>
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/support/green-60x60-red-5px-border.png
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/support/green-60x60-red-5px-border.png
--- a/tests/wpt/web-platform-tests/encoding/encodeInto.any.js
+++ b/tests/wpt/web-platform-tests/encoding/encodeInto.any.js
@ -0,0 +1,144 @@
+[
+  {
+    "input": "Hi",
+    "read": 0,
+    "destinationLength": 0,
+    "written": []
+  },
+  {
+    "input": "A",
+    "read": 1,
+    "destinationLength": 10,
+    "written": [0x41]
+  },
+  {
+    "input": "\u{1D306}", // "\uD834\uDF06"
+    "read": 2,
+    "destinationLength": 4,
+    "written": [0xF0, 0x9D, 0x8C, 0x86]
+  },
+  {
+    "input": "\u{1D306}A",
+    "read": 0,
+    "destinationLength": 3,
+    "written": []
+  },
+  {
+    "input": "\uD834A\uDF06A¥Hi",
+    "read": 5,
+    "destinationLength": 10,
+    "written": [0xEF, 0xBF, 0xBD, 0x41, 0xEF, 0xBF, 0xBD, 0x41, 0xC2, 0xA5]
+  },
+  {
+    "input": "A\uDF06",
+    "read": 2,
+    "destinationLength": 4,
+    "written": [0x41, 0xEF, 0xBF, 0xBD]
+  },
+  {
+    "input": "¥¥",
+    "read": 2,
+    "destinationLength": 4,
+    "written": [0xC2, 0xA5, 0xC2, 0xA5]
+  }
+].forEach(testData => {
+  [
+    {
+      "bufferIncrease": 0,
+      "destinationOffset": 0,
+      "filler": 0
+    },
+    {
+      "bufferIncrease": 10,
+      "destinationOffset": 4,
+      "filler": 0
+    },
+    {
+      "bufferIncrease": 0,
+      "destinationOffset": 0,
+      "filler": 0x80
+    },
+    {
+      "bufferIncrease": 10,
+      "destinationOffset": 4,
+      "filler": 0x80
+    },
+    {
+      "bufferIncrease": 0,
+      "destinationOffset": 0,
+      "filler": "random"
+    },
+    {
+      "bufferIncrease": 10,
+      "destinationOffset": 4,
+      "filler": "random"
+    }
+  ].forEach(destinationData => {
+    test(() => {
+      // Setup
+      const bufferLength = testData.destinationLength + destinationData.bufferIncrease,
+            destinationOffset = destinationData.destinationOffset,
+            destinationLength = testData.destinationLength,
+            destinationFiller = destinationData.filler,
+            encoder = new TextEncoder(),
+            buffer = new ArrayBuffer(bufferLength),
+            view = new Uint8Array(buffer, destinationOffset, destinationLength),
+            fullView = new Uint8Array(buffer),
+            control = new Array(bufferLength);
+      let byte = destinationFiller;
+      for (let i = 0; i < bufferLength; i++) {
+        if (destinationFiller === "random") {
+          byte = Math.floor(Math.random() * 256);
+        }
+        control[i] = byte;
+        fullView[i] = byte;
+      }
+
+      // It's happening
+      const result = encoder.encodeInto(testData.input, view);
+
+      // Basics
+      assert_equals(view.byteLength, destinationLength);
+      assert_equals(view.length, destinationLength);
+
+      // Remainder
+      assert_equals(result.read, testData.read);
+      assert_equals(result.written, testData.written.length);
+      for (let i = 0; i < bufferLength; i++) {
+        if (i < destinationOffset || i >= (destinationOffset + testData.written.length)) {
+          assert_equals(fullView[i], control[i]);
+        } else {
+          assert_equals(fullView[i], testData.written[i - destinationOffset]);
+        }
+      }
+    }, "encodeInto() with " + testData.input + " and destination length " + testData.destinationLength + ", offset " + destinationData.destinationOffset + ", filler " + destinationData.filler);
+  });
+});
+
+[DataView,
+ Int8Array,
+ Int16Array,
+ Int32Array,
+ Uint16Array,
+ Uint32Array,
+ Uint8ClampedArray,
+ Float32Array,
+ Float64Array].forEach(view => {
+  test(() => {
+    assert_throws(new TypeError(), () => new TextEncoder().encodeInto("", new view(new ArrayBuffer(0))));
+  }, "Invalid encodeInto() destination: " + view);
+ });
+
+test(() => {
+  assert_throws(new TypeError(), () => new TextEncoder().encodeInto("", new ArrayBuffer(10)));
+}, "Invalid encodeInto() destination: ArrayBuffer");
+
+test(() => {
+  const buffer = new ArrayBuffer(10),
+        view = new Uint8Array(buffer);
+  const { read, written } = new TextEncoder().encodeInto("", view);
+  assert_equals(read, 0);
+  assert_equals(written, 0);
+  self.postMessage(buffer, "/", [buffer]);
+  assert_throws(new TypeError(), () => new TextEncoder().encodeInto("", view));
+}, "encodeInto() cannot operate on a detached buffer");
--- a/tests/wpt/web-platform-tests/fetch/api/abort/general.any.js
+++ b/tests/wpt/web-platform-tests/fetch/api/abort/general.any.js
@ -445,7 +445,7 @@ promise_test(async t => {
  const controller = new AbortController();
  const signal = controller.signal;

-  const response = await fetch(`../resources/method.py`, { signal });
+  const response = await fetch(`../resources/empty.txt`, { signal });

  // Read whole response to ensure close signal has sent.
  await response.clone().text();
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-002.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-002.html
@ -0,0 +1,33 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Image intrinsic size specified via sizes attribute reacts properly to media changes in Shadow DOM</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="match" href="sizes-dynamic-001-ref.html">
+<link rel="help" href="https://html.spec.whatwg.org/#sizes-attributes">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1149357">
+<script>
+function frameLoaded(frame) {
+  let doc = frame.contentDocument;
+  let shadow = doc.getElementById("host").attachShadow({ mode: "open" });
+
+  let img = doc.createElement("img");
+  img.srcset = "/images/green-256x256.png 100w";
+  img.style.maxWidth = "100%";
+  img.setAttribute("sizes", "(min-width: 400px) 10px, 20px");
+
+  img.onload = function() {
+    img.offsetWidth; // Flush layout.
+
+    frame.width = "500";
+
+    // Trigger the viewport resize, which will trigger the image load task.
+    img.offsetWidth;
+
+    // Wait for the image load task to run.
+    setTimeout(() => document.documentElement.removeAttribute("class"), 0);
+  };
+
+  shadow.appendChild(img);
+}
+</script>
+<iframe onload="frameLoaded(this)" width="200" height="500" srcdoc='<!doctype html><div id="host"></div>'></iframe>
--- a/tests/wpt/web-platform-tests/interfaces/webxr.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webxr.idl
@ -26,15 +26,15 @@ enum XREnvironmentBlendMode {
 [SecureContext, Exposed=Window] interface XRSession : EventTarget {
  // Attributes
  readonly attribute XRSessionMode mode;
-  readonly attribute XRPresentationContext outputContext;
+  readonly attribute XRPresentationContext? outputContext;
  readonly attribute XREnvironmentBlendMode environmentBlendMode;

  attribute double depthNear;
  attribute double depthFar;
-  attribute XRLayer baseLayer;
+  attribute XRLayer? baseLayer;

  // Methods
-  Promise<XRReferenceSpace> requestReferenceSpace(XRReferenceSpaceType type, optional XRReferenceSpaceOptions options);
+  Promise<XRReferenceSpace> requestReferenceSpace(XRReferenceSpaceOptions options);

  FrozenArray<XRInputSource> getInputSources();

@ -61,7 +61,7 @@ enum XRSessionMode {

 dictionary XRSessionCreationOptions {
  XRSessionMode mode = "inline";
-  XRPresentationContext outputContext;
+  XRPresentationContext? outputContext = null;
 };

 callback XRFrameRequestCallback = void (DOMHighResTimeStamp time, XRFrame frame);
@ -88,6 +88,7 @@ dictionary XRReferenceSpaceOptions {
 };

 [SecureContext, Exposed=Window] interface XRReferenceSpace : XRSpace {
+  attribute XRRigidTransform originOffset;
  attribute EventHandler onreset;
 };

--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-disabled-tracks.https.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-disabled-tracks.https.html
@ -0,0 +1,53 @@
+<!doctype html>
+<html>
+<head>
+  <title>MediaRecorder Disabled Tracks</title>
+  <link rel="help" href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#mediarecorder">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<script>
+
+  // This test verifies that MediaStream with disabled tracks can be correctly
+  // recorded. See crbug.com/878255 for more context.
+
+  [ ["video-only",  {video: true,  audio: false}],
+    ["audio-only",  {video: false, audio: true}],
+    ["audio-video", {video: true,  audio: true}]]
+  .forEach( function(args) {
+    async_test(function(test) {
+      let recorder;
+      const recorderOnDataAvailable = test.step_func(function(event) {
+        if (recorder.state != "recording")
+          return;
+
+        recorder.onstop = recorderOnStopExpected;
+        recorder.stop();
+      });
+
+      const recorderOnStopExpected = test.step_func_done();
+      const recorderOnStopUnexpected = test.unreached_func('Recording stopped.');
+      const recorderOnError = test.unreached_func('Recording error.');
+
+      const gotStream = test.step_func(function(stream) {
+        for (track in stream.getTracks())
+          track.enabled = false;
+
+        recorder = new MediaRecorder(stream);
+
+        assert_equals(recorder.state, "inactive");
+        recorder.ondataavailable = recorderOnDataAvailable;
+        recorder.onstop = recorderOnStopUnexpected;
+        recorder.onerror = recorderOnError;
+        recorder.start();
+
+        assert_equals(recorder.state, "recording");
+        recorder.requestData();
+      });
+
+      const onError = test.unreached_func('Error creating MediaStream.');
+      navigator.getUserMedia(args[1], gotStream, onError);
+    }, args[0]);
+  });
+
+</script>
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/tools/generate.py
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/tools/generate.py
@ -2,6 +2,7 @@

 from __future__ import print_function

+import copy
 import os, sys, json
 from common_paths import *
 import spec_validator
@ -142,21 +143,33 @@ def generate_test_source_files(spec_json, target):
            exclusion_dict[excluded_selection_path] = True

    for spec in specification:
+        # Used to make entries with expansion="override" override preceding
+        # entries with the same |selection_path|.
+        output_dict = {}
+
        for spec_test_expansion in spec['test_expansion']:
            expansion = expand_test_expansion_pattern(spec_test_expansion,
                                                      test_expansion_schema)
            for selection in permute_expansion(expansion):
                selection_path = selection_pattern % selection
                if not selection_path in exclusion_dict:
-                    subresource_path = \
-                        spec_json["subresource_path"][selection["subresource"]]
-                    generate_selection(selection,
-                                       spec,
-                                       subresource_path,
-                                       html_template)
+                    if selection_path in output_dict:
+                        if spec_test_expansion['expansion'] != 'override':
+                            print("Error: %s's expansion is default but overrides %s" % (selection['name'], output_dict[selection_path]['name']))
+                            sys.exit(1)
+                    output_dict[selection_path] = copy.deepcopy(selection)
                else:
                    print('Excluding selection:', selection_path)

+        for selection_path in output_dict:
+            selection = output_dict[selection_path]
+            subresource_path = \
+                spec_json["subresource_path"][selection["subresource"]]
+            generate_selection(selection,
+                           spec,
+                           subresource_path,
+                           html_template)
+

 def main(target):
    spec_json = load_spec_json();
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-downgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html.headers
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-upgrade.http.html.headers
@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/image.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html
@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/referrer-policy/generic/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "subresource_path": "/referrer-policy/generic/subresource/script.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
--- a/Show more
+++ b/Show more