Backed out changeset d67e5ce76bf5 (bug 1270050) for somehow causing timeouts in browser_animation_animated_properties_displayed.js
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 25 May 2016 08:39:47 +0200
changeset 298904 2adb4dd6324d3d20bdbf3a153feb70149a0dfad9
parent 298903 51b49963769764c362e543fe4969c1d08eb69bb1
child 298905 484c1b1957f54397da35a38e311cdd0613c5ca3f
push id30285
push usercbook@mozilla.com
push dateWed, 25 May 2016 13:06:07 +0000
treeherdermozilla-central@d6d4e8417d2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1270050
milestone49.0a1
backs outd67e5ce76bf59714d57fe921107c5f82e162a72c
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
Backed out changeset d67e5ce76bf5 (bug 1270050) for somehow causing timeouts in browser_animation_animated_properties_displayed.js
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-cross-origin",
+  "referrer_policy": "origin-when-crossorigin",
   "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-downgrade.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-insecure.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-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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-insecure.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-insecure.swap-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-upgrade.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-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-cross-origin'</title>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-crossorigin'</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-cross-origin",
+          "referrer_policy": "origin-when-crossorigin",
           "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-upgrade.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-upgrade.keep-origin-redirect.http.html.headers
@@ -1,2 +1,2 @@
-Content-Security-Policy: referrer origin-when-cross-origin
+Content-Security-Policy: referrer origin-when-crossorigin
 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-upgrade.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-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-cross-origin'</title>