Bug 1270050 - Change wpt test origin-when-crossorigin to origin-when-cross-origin. r=fkiefer, r=jdm
☠☠ backed out by 2adb4dd6324d ☠ ☠
authorThomas Nguyen <tnguyen@mozilla.com>
Wed, 18 May 2016 17:16:21 +0800
changeset 337874 d67e5ce76bf59714d57fe921107c5f82e162a72c
parent 337873 15df40db9c161ae5702dcfdbde4e6b358db76be8
child 337875 54be367a7ed9d9c38a7015de8155159a90c7efdb
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfkiefer, jdm
bugs1270050
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1270050 - Change wpt test origin-when-crossorigin to origin-when-cross-origin. r=fkiefer, r=jdm MozReview-Commit-ID: DProAfnX6ai
testing/web-platform/tests/referrer-policy/README.md
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-downgrade.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-downgrade.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-downgrade.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-upgrade.keep-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-upgrade.no-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/xhr-request/same-origin-upgrade.swap-origin-redirect.http.html.headers
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/xhr-request/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/xhr-request/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/xhr-request/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/xhr-request/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/xhr-request/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/xhr-request/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-downgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-downgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-downgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-upgrade.keep-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-upgrade.no-redirect.http.html
testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/same-origin-upgrade.swap-origin-redirect.http.html
testing/web-platform/tests/referrer-policy/spec.src.json
testing/web-platform/tests/referrer-policy/spec_json.js
--- a/testing/web-platform/tests/referrer-policy/README.md
+++ b/testing/web-platform/tests/referrer-policy/README.md
@@ -217,17 +217,17 @@ A single test expansion pattern, be it a
 * Permute - Recursively enumerate all **selections** accross all fields
 
 Be aware that if there is more than one pattern expanding into a same selection (which also shares the same ```name``` field), the pattern appearing later in the spec JSON will overwrite a previously generated selection. To make sure this is not undetected when generating, set the value of the ```expansion``` field to ```default``` for an expansion appearing earlier and ```override``` for the one appearing later.
 
 A **selection** is a single **test instance** (scenario) with explicit values, for example:
 
 ```javascript
 var scenario = {
-  "referrer_policy": "origin-when-crossorigin",
+  "referrer_policy": "origin-when-cross-origin",
   "delivery_method": "meta-referrer",
   "redirection": "no-redirect",
   "origin": "cross-origin",
   "source_protocol": "http",
   "target_protocol": "http",
   "subresource": "iframe-tag",
   "subresource_path": "/referrer-policy/generic/subresource/document.py",
   "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the attr-referrer
                                  delivery method with keep-origin-redirect and when
                                  the target request is cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the attr-referrer
                                  delivery method with no-redirect and when
                                  the target request is cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the attr-referrer
                                  delivery method with swap-origin-redirect and when
                                  the target request is cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the attr-referrer
                                  delivery method with keep-origin-redirect and when
                                  the target request is cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the attr-referrer
                                  delivery method with no-redirect and when
                                  the target request is cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the attr-referrer
                                  delivery method with swap-origin-redirect and when
                                  the target request is cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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 cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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 cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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 cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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 cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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 cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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 cross-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the attr-referrer
                                  delivery method with keep-origin-redirect and when
                                  the target request is same-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "keep-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the attr-referrer
                                  delivery method with no-redirect and when
                                  the target request is same-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "no-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the attr-referrer
                                  delivery method with swap-origin-redirect and when
                                  the target request is same-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the attr-referrer
                                  delivery method with keep-origin-redirect and when
                                  the target request is same-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "keep-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the attr-referrer
                                  delivery method with no-redirect and when
                                  the target request is same-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "no-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the attr-referrer
                                  delivery method with swap-origin-redirect and when
                                  the target request is same-origin.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "attr-referrer",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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/specs/referrer-policy/#referrer-policy-state-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.">
@@ -16,17 +16,17 @@
     <!-- 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-crossorigin",
+          "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via fetch-request using the http-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "fetch-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via fetch-request using the http-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "fetch-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via fetch-request using the http-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "fetch-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the http-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the http-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the http-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the http-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the http-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the http-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via script-tag using the http-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "script-tag",
           "subresource_path": "/referrer-policy/generic/subresource/script.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via script-tag using the http-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "script-tag",
           "subresource_path": "/referrer-policy/generic/subresource/script.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via script-tag using the http-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "script-tag",
           "subresource_path": "/referrer-policy/generic/subresource/script.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via xhr-request using the http-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "xhr-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via xhr-request using the http-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "xhr-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via xhr-request using the http-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "xhr-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "fetch-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "fetch-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "fetch-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "script-tag",
           "subresource_path": "/referrer-policy/generic/subresource/script.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "script-tag",
           "subresource_path": "/referrer-policy/generic/subresource/script.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "script-tag",
           "subresource_path": "/referrer-policy/generic/subresource/script.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "xhr-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "xhr-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "cross-origin",
           "source_protocol": "http",
           "target_protocol": "https",
           "subresource": "xhr-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/cross-origin/http-https/xhr-request/cross-origin.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via fetch-request using the http-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "fetch-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via fetch-request using the http-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "fetch-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via fetch-request using the http-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "fetch-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the http-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the http-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via iframe-tag using the http-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "iframe-tag",
           "subresource_path": "/referrer-policy/generic/subresource/document.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the http-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the http-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via img-tag using the http-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "img-tag",
           "subresource_path": "/referrer-policy/generic/subresource/image.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via script-tag using the http-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "script-tag",
           "subresource_path": "/referrer-policy/generic/subresource/script.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via script-tag using the http-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "script-tag",
           "subresource_path": "/referrer-policy/generic/subresource/script.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via script-tag using the http-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "script-tag",
           "subresource_path": "/referrer-policy/generic/subresource/script.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via xhr-request using the http-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "keep-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "xhr-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is stripped-referrer when a
                                  document served over http requires an http
                                  sub-resource via xhr-request using the http-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "no-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "xhr-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "stripped-referrer"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin-when-cross-origin">
     <meta name="assert" content="The referrer URL is origin when a
                                  document served over http requires an http
                                  sub-resource via xhr-request using the http-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "source_protocol": "http",
           "target_protocol": "http",
           "subresource": "xhr-request",
           "subresource_path": "/referrer-policy/generic/subresource/xhr.py",
           "referrer_url": "origin"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with keep-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with no-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-crossorigin
+Content-Security-Policy: referrer origin-when-cross-origin
 Access-Control-Allow-Origin: *
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html
@@ -1,13 +1,13 @@
 <!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-crossorigin'</title>
+    <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: CSP delivered via HTTP headers. -->
     <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
     <link rel="help" href="https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-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-csp
                                  delivery method with swap-origin-redirect and when
@@ -17,17 +17,17 @@
     <!-- 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-crossorigin",
+          "referrer_policy": "origin-when-cross-origin",
           "delivery_method": "http-csp",
           "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"
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html.headers
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-csp/same-origin/http-https/fetch-request/same-origin-dow