From 503ee7050b44f0267ba6fd4a4e48f2955254cec8 Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Mon, 13 Jul 2015 13:07:14 +0100
Subject: [PATCH] Bug 1183628 - Update web-platform-tests expected data to
 revision 593fd27931d7e9d573d2796fe10df9fff778d56f, a=testonly

---
 .../meta/FileAPI/progress.html.ini            |   6 -
 .../form-action-src-blocked.sub.html.ini      |   3 +
 .../form-action-src-get-blocked.sub.html.ini  |   3 +
 ...action-src-javascript-blocked.sub.html.ini |   5 +
 ...m-action-src-redirect-blocked.sub.html.ini |   3 +
 .../plugintypes-notype-data.sub.html.ini      |   9 ++
 .../plugintypes-notype-url.sub.html.ini       |   5 +
 .../plugintypes-nourl-blocked.sub.html.ini    |   5 +
 .../scripthash-allowed.sub.html.ini           |   9 ++
 .../scripthash-basic-blocked.sub.html.ini     |   5 +
 ...cripthash-ignore-unsafeinline.sub.html.ini |   5 +
 ...ipthash-unicode-normalization.sub.html.ini |   9 ++
 .../scriptnonce-allowed.sub.html.ini          |   5 +
 .../scriptnonce-basic-blocked.sub.html.ini    |   6 +
 .../scriptnonce-redirect.sub.html.ini         |   5 +
 .../stylehash-allowed.sub.html.ini            |   8 ++
 .../stylehash-basic-blocked.sub.html.ini      |   5 +
 .../combine-multiple-policies.sub.html.ini    |   5 +
 ...nnect-src-eventsource-blocked.sub.html.ini |   5 +
 ...entsource-redirect-to-blocked.sub.html.ini |   8 ++
 ...tprequest-redirect-to-blocked.sub.html.ini |   5 +
 ...system-urls-do-not-match-self.sub.html.ini |   6 +
 ...esystem-urls-match-filesystem.sub.html.ini |   6 +
 .../frame-src-cross-origin-load.sub.html.ini  |   6 +
 ...njected-inline-script-allowed.sub.html.ini |   6 +
 .../media-src-track-block.sub.html.ini        |   9 ++
 ...t-src-applet-archive-codebase.sub.html.ini |  11 ++
 .../object-src-applet-archive.sub.html.ini    |  11 ++
 ...ject-src-applet-code-codebase.sub.html.ini |  11 ++
 .../object-src-applet-code.sub.html.ini       |  11 ++
 .../object-src-no-url-blocked.sub.html.ini    |   5 +
 ...object-src-param-code-blocked.sub.html.ini |   5 +
 ...bject-src-param-movie-blocked.sub.html.ini |   5 +
 .../object-src-param-src-blocked.sub.html.ini |   5 +
 .../object-src-param-url-blocked.sub.html.ini |   5 +
 ...ed-worker-connect-src-blocked.sub.html.ini |   5 +
 .../worker-connect-src-allowed.sub.html.ini   |   8 ++
 .../worker-connect-src-blocked.sub.html.ini   |   5 +
 .../worker-eval-blocked.sub.html.ini          |   5 +
 ...ker-function-function-blocked.sub.html.ini |   5 +
 .../worker-importscripts-blocked.sub.html.ini |   8 ++
 .../worker-set-timeout-blocked.sub.html.ini   |   5 +
 .../meta/dom/nodes/ChildNode-after.html.ini   | 110 ++++++++++++++++++
 .../meta/dom/nodes/ChildNode-before.html.ini  | 110 ++++++++++++++++++
 .../dom/nodes/ChildNode-replaceWith.html.ini  | 101 ++++++++++++++++
 .../meta/dom/nodes/ParentNode-append.html.ini |  44 +++++++
 .../dom/nodes/ParentNode-prepend.html.ini     |  44 +++++++
 .../dom/nodes/append-on-Document.html.ini     |  17 +++
 .../dom/nodes/prepend-on-Document.html.ini    |  17 +++
 .../web-platform/meta/hr-time/basic.html.ini  |   1 +
 .../terminology-0/document-base-url.html.ini  |   5 +
 ...mplate-is-a-foster-parent-element.html.ini |   8 --
 ...te-is-not-a-foster-parent-element.html.ini |   8 --
 .../generating-of-implied-end-tags.html.ini   |  15 ---
 .../ignore-body-token.html.ini                |  18 ---
 .../ignore-frameset-token.html.ini            |  15 ---
 .../ignore-head-token.html.ini                |  18 ---
 .../ignore-html-token.html.ini                |  24 ----
 .../start-tag-body.html.ini                   |  14 ---
 ...emplate-end-tag-without-start-one.html.ini |  18 ---
 .../end-tag-frameset.html.ini                 |   4 +-
 .../generating-of-implied-end-tags.html.ini   |  15 ---
 ...emplate-end-tag-without-start-one.html.ini |  18 ---
 .../end-tag-table.html.ini                    |   5 -
 .../template-child-nodes.html.ini             |   9 --
 ...tack-back-to-a-table-body-context.html.ini |   3 -
 ...ing-stack-back-to-a-table-context.html.ini |   3 -
 ...stack-back-to-a-table-row-context.html.ini |   3 -
 .../template-owner-document.html.ini          |  15 +--
 .../allowed.https.html.ini                    |  16 +++
 .../no-redirect/allowed.https.html.ini        |  14 +++
 .../no-redirect/allowed.https.html.ini        |   6 +
 .../allowed.https.html.ini                    |  14 +++
 .../no-redirect/allowed.https.html.ini        |  14 +++
 .../allowed.https.html.ini                    |   5 +
 .../no-redirect/allowed.https.html.ini        |   5 +
 .../allowed.https.html.ini                    |  14 +++
 .../no-redirect/allowed.https.html.ini        |  14 +++
 .../allowed.https.html.ini                    |  18 +++
 .../no-redirect/allowed.https.html.ini        |  18 +++
 .../no-redirect/allowed.https.html.ini        |  14 +++
 .../no-redirect/allowed.https.html.ini        |  14 +++
 .../no-redirect/allowed.https.html.ini        |   5 +
 .../no-redirect/allowed.https.html.ini        |  14 +++
 .../no-redirect/allowed.https.html.ini        |  18 +++
 .../allowed.https.html.ini                    |  14 +++
 .../no-redirect/allowed.https.html.ini        |  14 +++
 .../allowed.https.html.ini                    |  14 +++
 .../no-redirect/allowed.https.html.ini        |  14 +++
 .../allowed.https.html.ini                    |   5 +
 .../no-redirect/allowed.https.html.ini        |   5 +
 .../allowed.https.html.ini                    |  14 +++
 .../no-redirect/allowed.https.html.ini        |  14 +++
 .../allowed.https.html.ini                    |  18 +++
 .../no-redirect/allowed.https.html.ini        |  18 +++
 .../opt-in-blocks.https.html.ini}             |   2 +-
 .../no-redirect/opt-in-blocks.https.html.ini  |   3 +
 .../opt-in-blocks.https.html.ini              |   3 +
 .../opt-in-blocks.https.html.ini              |   6 +
 .../no-redirect/opt-in-blocks.https.html.ini  |  19 +++
 .../opt-in-blocks.https.html.ini              |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../opt-in-blocks.https.html.ini              |   3 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   3 +
 .../opt-in-blocks.https.html.ini              |   3 +
 .../opt-in-blocks.https.html.ini              |   6 +
 .../no-redirect/opt-in-blocks.https.html.ini  |  19 +++
 .../opt-in-blocks.https.html.ini              |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   3 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   6 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   6 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   3 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   6 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   6 +
 .../no-opt-in-blocks.https.html.ini           |   3 +
 .../no-opt-in-blocks.https.html.ini           |   3 +
 .../no-opt-in-blocks.https.html.ini           |   3 +
 .../no-opt-in-blocks.https.html.ini           |   6 +
 .../no-opt-in-blocks.https.html.ini           |   6 +
 .../no-opt-in-blocks.https.html.ini           |   5 +
 .../no-opt-in-blocks.https.html.ini           |   5 +
 .../no-opt-in-blocks.https.html.ini           |   5 +
 .../no-opt-in-blocks.https.html.ini           |   5 +
 .../no-opt-in-blocks.https.html.ini           |   3 +
 .../no-opt-in-blocks.https.html.ini           |   3 +
 .../no-opt-in-blocks.https.html.ini           |   3 +
 .../no-opt-in-blocks.https.html.ini           |   6 +
 .../no-opt-in-blocks.https.html.ini           |  18 +++
 .../no-opt-in-blocks.https.html.ini           |   5 +
 .../no-opt-in-blocks.https.html.ini           |   5 +
 .../no-opt-in-blocks.https.html.ini           |   5 +
 .../no-opt-in-blocks.https.html.ini           |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../opt-in-blocks.https.html.ini              |  17 +++
 .../no-redirect/opt-in-blocks.https.html.ini  |  17 +++
 .../opt-in-blocks.https.html.ini              |  17 +++
 .../opt-in-blocks.https.html.ini              |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../opt-in-blocks.https.html.ini              |   5 +
 .../opt-in-blocks.https.html.ini              |  17 +++
 .../no-redirect/opt-in-blocks.https.html.ini  |  17 +++
 .../opt-in-blocks.https.html.ini              |  17 +++
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |  17 +++
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |   5 +
 .../no-redirect/opt-in-blocks.https.html.ini  |  17 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |   5 +
 .../no-opt-in-allows.https.html.ini           |   5 +
 .../no-opt-in-allows.https.html.ini           |   5 +
 .../no-opt-in-allows.https.html.ini           |  18 +++
 .../no-opt-in-allows.https.html.ini           |  18 +++
 .../no-opt-in-allows.https.html.ini           |  18 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |  14 +++
 .../no-opt-in-allows.https.html.ini           |   5 +
 .../no-opt-in-allows.https.html.ini           |   5 +
 .../no-opt-in-allows.https.html.ini           |   5 +
 .../no-opt-in-allows.https.html.ini           |  18 +++
 .../no-opt-in-allows.https.html.ini           |  18 +++
 .../no-opt-in-allows.https.html.ini           |  18 +++
 .../test_timing_xserver_redirect.html.ini     |   2 -
 .../dom-tree-accessors-001.html.ini           |   5 -
 .../webstorage/event_body_attribute.html.ini  |   5 +
 .../webstorage/event_setattribute.html.ini    |   5 +
 .../storage_local_window_open_second.html.ini |   5 -
 ...torage_session_window_open_second.html.ini |   5 -
 .../claim-using-registration.https.html.ini   |   6 -
 .../registration.https.html.ini               |   3 -
 .../resource-timing.https.html.ini            |   3 +-
 202 files changed, 1848 insertions(+), 241 deletions(-)
 delete mode 100644 testing/web-platform/meta/FileAPI/progress.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/combine-multiple-policies.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/media-src-track-block.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-archive-codebase.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-archive.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-code-codebase.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-code.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-code-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-movie-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-src-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-url-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/worker-eval-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html.ini
 create mode 100644 testing/web-platform/meta/dom/nodes/ChildNode-after.html.ini
 create mode 100644 testing/web-platform/meta/dom/nodes/ChildNode-before.html.ini
 create mode 100644 testing/web-platform/meta/dom/nodes/ChildNode-replaceWith.html.ini
 create mode 100644 testing/web-platform/meta/dom/nodes/ParentNode-append.html.ini
 create mode 100644 testing/web-platform/meta/dom/nodes/ParentNode-prepend.html.ini
 create mode 100644 testing/web-platform/meta/dom/nodes/append-on-Document.html.ini
 create mode 100644 testing/web-platform/meta/dom/nodes/prepend-on-Document.html.ini
 create mode 100644 testing/web-platform/meta/html/infrastructure/urls/terminology-0/document-base-url.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html.ini
 delete mode 100644 testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini
 rename testing/web-platform/meta/{html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html.ini => mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini} (58%)
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
 create mode 100644 testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
 delete mode 100644 testing/web-platform/meta/shadow-dom/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html.ini
 create mode 100644 testing/web-platform/meta/webstorage/event_body_attribute.html.ini
 create mode 100644 testing/web-platform/meta/webstorage/event_setattribute.html.ini
 delete mode 100644 testing/web-platform/meta/webstorage/storage_local_window_open_second.html.ini
 delete mode 100644 testing/web-platform/meta/webstorage/storage_session_window_open_second.html.ini
 delete mode 100644 testing/web-platform/mozilla/meta/service-workers/service-worker/claim-using-registration.https.html.ini

diff --git a/testing/web-platform/meta/FileAPI/progress.html.ini b/testing/web-platform/meta/FileAPI/progress.html.ini
deleted file mode 100644
index 4d2679717ffa..000000000000
--- a/testing/web-platform/meta/FileAPI/progress.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[progress.html]
-  type: testharness
-  expected: TIMEOUT
-  [FileReader progress events.]
-    expected: NOTRUN
-
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html.ini
new file mode 100644
index 000000000000..be670beaf45d
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[form-action-src-blocked.sub.html]
+  type: testharness
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html.ini
new file mode 100644
index 000000000000..3675ee0f7f63
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-get-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[form-action-src-get-blocked.sub.html]
+  type: testharness
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html.ini
new file mode 100644
index 000000000000..bc27ea246d2e
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-javascript-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[form-action-src-javascript-blocked.sub.html]
+  type: testharness
+  [form-action-src-javascript-blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html.ini
new file mode 100644
index 000000000000..3c835e8a6cfe
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/form-action-src-redirect-blocked.sub.html.ini
@@ -0,0 +1,3 @@
+[form-action-src-redirect-blocked.sub.html]
+  type: testharness
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html.ini
new file mode 100644
index 000000000000..1614a0be7fc6
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-notype-data.sub.html.ini
@@ -0,0 +1,9 @@
+[plugintypes-notype-data.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [Expecting logs: ["PASS"\]]
+    expected: NOTRUN
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html.ini
new file mode 100644
index 000000000000..39ce507e22a0
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-notype-url.sub.html.ini
@@ -0,0 +1,5 @@
+[plugintypes-notype-url.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html.ini
new file mode 100644
index 000000000000..eb5adf9b6ddf
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/plugintypes-nourl-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[plugintypes-nourl-blocked.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.ini
new file mode 100644
index 000000000000..5faa503c7648
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.ini
@@ -0,0 +1,9 @@
+[scripthash-allowed.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [Expecting alerts: ["PASS (1/4)","PASS (2/4)","PASS (3/4)","PASS (4/4)"\]]
+    expected: NOTRUN
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html.ini
new file mode 100644
index 000000000000..99ad24b104e1
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-basic-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[scripthash-basic-blocked.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html.ini
new file mode 100644
index 000000000000..d18866c04dc3
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-ignore-unsafeinline.sub.html.ini
@@ -0,0 +1,5 @@
+[scripthash-ignore-unsafeinline.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.ini
new file mode 100644
index 000000000000..c41d07acf54a
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.ini
@@ -0,0 +1,9 @@
+[scripthash-unicode-normalization.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [Expecting alerts: ["PASS","PASS"\]]
+    expected: NOTRUN
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html.ini
new file mode 100644
index 000000000000..a422af7a02fe
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-allowed.sub.html.ini
@@ -0,0 +1,5 @@
+[scriptnonce-allowed.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html.ini
new file mode 100644
index 000000000000..900d654f87e2
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-basic-blocked.sub.html.ini
@@ -0,0 +1,6 @@
+[scriptnonce-basic-blocked.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [Expecting alerts: ["PASS (1/2)","PASS (2/2)"\]]
+    expected: TIMEOUT
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html.ini
new file mode 100644
index 000000000000..c568793517bd
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scriptnonce-redirect.sub.html.ini
@@ -0,0 +1,5 @@
+[scriptnonce-redirect.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.ini
new file mode 100644
index 000000000000..172ebfb1b64b
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/stylehash-allowed.sub.html.ini
@@ -0,0 +1,8 @@
+[stylehash-allowed.sub.html]
+  type: testharness
+  [Expecting alerts: ["PASS (1/4): The '#p1' element's text is green, which means the style was correctly applied.","PASS (2/4): The '#p2' element's text is green, which means the style was correctly applied.","PASS (3/4): The '#p3' element's text is green, which means the style was correctly applied.","PASS (4/4): The '#p4' element's text is green, which means the style was correctly applied."\]]
+    expected: FAIL
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html.ini
new file mode 100644
index 000000000000..6f72d4eae446
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/stylehash-basic-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[stylehash-basic-blocked.sub.html]
+  type: testharness
+  [Expecting alerts: ["PASS: The 'p' element's text is green, which means the style was correctly applied."\]]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/combine-multiple-policies.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/combine-multiple-policies.sub.html.ini
new file mode 100644
index 000000000000..8cca637bad27
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/combine-multiple-policies.sub.html.ini
@@ -0,0 +1,5 @@
+[combine-multiple-policies.sub.html]
+  type: testharness
+  [Expecting logs: ["TEST COMPLETE"\]]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html.ini
new file mode 100644
index 000000000000..99c074c3911c
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-eventsource-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[connect-src-eventsource-blocked.sub.html]
+  type: testharness
+  [Expecting logs: ["Pass"\]]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html.ini
new file mode 100644
index 000000000000..6cbf726bcf6b
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-eventsource-redirect-to-blocked.sub.html.ini
@@ -0,0 +1,8 @@
+[connect-src-eventsource-redirect-to-blocked.sub.html]
+  type: testharness
+  [Expecting logs: ["PASS EventSource() did not follow the disallowed redirect.","PASS successfullyParsed is true","TEST COMPLETE"\]]
+    expected: FAIL
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.ini
new file mode 100644
index 000000000000..e62b70b02619
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/connect-src-xmlhttprequest-redirect-to-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[connect-src-xmlhttprequest-redirect-to-blocked.sub.html]
+  type: testharness
+  [Expecting logs: ["PASS XMLHttpRequest.send() did not follow the disallowed redirect.","TEST COMPLETE"\]]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html.ini
new file mode 100644
index 000000000000..9b6d2d509e3c
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/filesystem-urls-do-not-match-self.sub.html.ini
@@ -0,0 +1,6 @@
+[filesystem-urls-do-not-match-self.sub.html]
+  type: testharness
+  expected: ERROR
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html.ini
new file mode 100644
index 000000000000..6a79985b85e4
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/filesystem-urls-match-filesystem.sub.html.ini
@@ -0,0 +1,6 @@
+[filesystem-urls-match-filesystem.sub.html]
+  type: testharness
+  expected: ERROR
+  [Expecting logs: ["PASS (1/1)"\]]
+    expected: NOTRUN
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html.ini
new file mode 100644
index 000000000000..b541478818ab
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/frame-src-cross-origin-load.sub.html.ini
@@ -0,0 +1,6 @@
+[frame-src-cross-origin-load.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event."\]]
+    expected: TIMEOUT
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.ini
new file mode 100644
index 000000000000..67b8429b2636
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.ini
@@ -0,0 +1,6 @@
+[injected-inline-script-allowed.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [Expecting alerts: ["Pass 1 of 2","Pass 2 of 2"\]]
+    expected: TIMEOUT
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/media-src-track-block.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/media-src-track-block.sub.html.ini
new file mode 100644
index 000000000000..72a4e7534f08
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/media-src-track-block.sub.html.ini
@@ -0,0 +1,9 @@
+[media-src-track-block.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [Expecting alerts: ["PASS"\]]
+    expected: NOTRUN
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-archive-codebase.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-archive-codebase.sub.html.ini
new file mode 100644
index 000000000000..3fd4d6eb23f8
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-archive-codebase.sub.html.ini
@@ -0,0 +1,11 @@
+[object-src-applet-archive-codebase.sub.html]
+  type: testharness
+  expected:
+    if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+  [Expecting logs: ["PASS"\]]
+    expected: NOTRUN
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-archive.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-archive.sub.html.ini
new file mode 100644
index 000000000000..bbbfb43a431f
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-archive.sub.html.ini
@@ -0,0 +1,11 @@
+[object-src-applet-archive.sub.html]
+  type: testharness
+  expected:
+    if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+  [Expecting logs: ["PASS"\]]
+    expected: NOTRUN
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-code-codebase.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-code-codebase.sub.html.ini
new file mode 100644
index 000000000000..4c63ee29b96c
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-code-codebase.sub.html.ini
@@ -0,0 +1,11 @@
+[object-src-applet-code-codebase.sub.html]
+  type: testharness
+  expected:
+    if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+  [Expecting logs: ["PASS"\]]
+    expected: NOTRUN
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-code.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-code.sub.html.ini
new file mode 100644
index 000000000000..8ff7fcb453d2
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-applet-code.sub.html.ini
@@ -0,0 +1,11 @@
+[object-src-applet-code.sub.html]
+  type: testharness
+  expected:
+    if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+  [Expecting logs: ["PASS"\]]
+    expected: NOTRUN
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html.ini
new file mode 100644
index 000000000000..b81478a41898
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-no-url-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[object-src-no-url-blocked.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-code-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-code-blocked.sub.html.ini
new file mode 100644
index 000000000000..7550923a0bdb
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-code-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[object-src-param-code-blocked.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-movie-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-movie-blocked.sub.html.ini
new file mode 100644
index 000000000000..0cabaab92681
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-movie-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[object-src-param-movie-blocked.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-src-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-src-blocked.sub.html.ini
new file mode 100644
index 000000000000..bcc5927c4f33
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-src-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[object-src-param-src-blocked.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-url-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-url-blocked.sub.html.ini
new file mode 100644
index 000000000000..10d95d6dbbfc
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/object-src-param-url-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[object-src-param-url-blocked.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.ini
new file mode 100644
index 000000000000..70ff3319a770
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[shared-worker-connect-src-blocked.sub.html]
+  type: testharness
+  [Expecting alerts: ["xhr blocked"\]]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html.ini
new file mode 100644
index 000000000000..c59602e23b8f
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-allowed.sub.html.ini
@@ -0,0 +1,8 @@
+[worker-connect-src-allowed.sub.html]
+  type: testharness
+  [Expecting alerts: ["xhr allowed"\]]
+    expected: FAIL
+
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.ini
new file mode 100644
index 000000000000..3dea60a292e3
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[worker-connect-src-blocked.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/worker-eval-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-eval-blocked.sub.html.ini
new file mode 100644
index 000000000000..1e55d5617f9e
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-eval-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[worker-eval-blocked.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html.ini
new file mode 100644
index 000000000000..07dc5236c9c1
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-function-function-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[worker-function-function-blocked.sub.html]
+  type: testharness
+  [Violation report status OK.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html.ini
new file mode 100644
index 000000000000..4f0bccdf4222
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-importscripts-blocked.sub.html.ini
@@ -0,0 +1,8 @@
+[worker-importscripts-blocked.sub.html]
+  type: testharness
+  [worker-importscripts-blocked]
+    expected: FAIL
+
+  [worker-importscripts-blocked 1]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html.ini
new file mode 100644
index 000000000000..36e6bb1f62a5
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-set-timeout-blocked.sub.html.ini
@@ -0,0 +1,5 @@
+[worker-set-timeout-blocked.sub.html]
+  type: testharness
+  [Expecting alerts: ["setTimeout blocked"\]]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/dom/nodes/ChildNode-after.html.ini b/testing/web-platform/meta/dom/nodes/ChildNode-after.html.ini
new file mode 100644
index 000000000000..823563b9f344
--- /dev/null
+++ b/testing/web-platform/meta/dom/nodes/ChildNode-after.html.ini
@@ -0,0 +1,110 @@
+[ChildNode-after.html]
+  type: testharness
+  [Comment.after() without any argument.]
+    expected: FAIL
+
+  [Comment.after() with null as an argument.]
+    expected: FAIL
+
+  [Comment.after() with undefined as an argument.]
+    expected: FAIL
+
+  [Comment.after() with the empty string as an argument.]
+    expected: FAIL
+
+  [Comment.after() with only text as an argument.]
+    expected: FAIL
+
+  [Comment.after() with only one element as an argument.]
+    expected: FAIL
+
+  [Comment.after() with one element and text as arguments.]
+    expected: FAIL
+
+  [Comment.after() with context object itself as the argument.]
+    expected: FAIL
+
+  [Comment.after() with all siblings of child as arguments.]
+    expected: FAIL
+
+  [Comment.after() when pre-insert behaves like append.]
+    expected: FAIL
+
+  [Comment.after() with one sibling of child and text as arguments.]
+    expected: FAIL
+
+  [Comment.after() on a child without any parent.]
+    expected: FAIL
+
+  [Element.after() without any argument.]
+    expected: FAIL
+
+  [Element.after() with null as an argument.]
+    expected: FAIL
+
+  [Element.after() with undefined as an argument.]
+    expected: FAIL
+
+  [Element.after() with the empty string as an argument.]
+    expected: FAIL
+
+  [Element.after() with only text as an argument.]
+    expected: FAIL
+
+  [Element.after() with only one element as an argument.]
+    expected: FAIL
+
+  [Element.after() with one element and text as arguments.]
+    expected: FAIL
+
+  [Element.after() with context object itself as the argument.]
+    expected: FAIL
+
+  [Element.after() with all siblings of child as arguments.]
+    expected: FAIL
+
+  [Element.after() when pre-insert behaves like append.]
+    expected: FAIL
+
+  [Element.after() with one sibling of child and text as arguments.]
+    expected: FAIL
+
+  [Element.after() on a child without any parent.]
+    expected: FAIL
+
+  [Text.after() without any argument.]
+    expected: FAIL
+
+  [Text.after() with null as an argument.]
+    expected: FAIL
+
+  [Text.after() with undefined as an argument.]
+    expected: FAIL
+
+  [Text.after() with the empty string as an argument.]
+    expected: FAIL
+
+  [Text.after() with only text as an argument.]
+    expected: FAIL
+
+  [Text.after() with only one element as an argument.]
+    expected: FAIL
+
+  [Text.after() with one element and text as arguments.]
+    expected: FAIL
+
+  [Text.after() with context object itself as the argument.]
+    expected: FAIL
+
+  [Text.after() with all siblings of child as arguments.]
+    expected: FAIL
+
+  [Text.after() when pre-insert behaves like append.]
+    expected: FAIL
+
+  [Text.after() with one sibling of child and text as arguments.]
+    expected: FAIL
+
+  [Text.after() on a child without any parent.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/dom/nodes/ChildNode-before.html.ini b/testing/web-platform/meta/dom/nodes/ChildNode-before.html.ini
new file mode 100644
index 000000000000..0bb00ec58894
--- /dev/null
+++ b/testing/web-platform/meta/dom/nodes/ChildNode-before.html.ini
@@ -0,0 +1,110 @@
+[ChildNode-before.html]
+  type: testharness
+  [Comment.before() without any argument.]
+    expected: FAIL
+
+  [Comment.before() with null as an argument.]
+    expected: FAIL
+
+  [Comment.before() with undefined as an argument.]
+    expected: FAIL
+
+  [Comment.before() with the empty string as an argument.]
+    expected: FAIL
+
+  [Comment.before() with only text as an argument.]
+    expected: FAIL
+
+  [Comment.before() with only one element as an argument.]
+    expected: FAIL
+
+  [Comment.before() with one element and text as arguments.]
+    expected: FAIL
+
+  [Comment.before() with context object itself as the argument.]
+    expected: FAIL
+
+  [Comment.before() with all siblings of child as arguments.]
+    expected: FAIL
+
+  [Comment.before() when pre-insert behaves like prepend.]
+    expected: FAIL
+
+  [Comment.before() with one sibling of child and text as arguments.]
+    expected: FAIL
+
+  [Comment.before() on a child without any parent.]
+    expected: FAIL
+
+  [Element.before() without any argument.]
+    expected: FAIL
+
+  [Element.before() with null as an argument.]
+    expected: FAIL
+
+  [Element.before() with undefined as an argument.]
+    expected: FAIL
+
+  [Element.before() with the empty string as an argument.]
+    expected: FAIL
+
+  [Element.before() with only text as an argument.]
+    expected: FAIL
+
+  [Element.before() with only one element as an argument.]
+    expected: FAIL
+
+  [Element.before() with one element and text as arguments.]
+    expected: FAIL
+
+  [Element.before() with context object itself as the argument.]
+    expected: FAIL
+
+  [Element.before() with all siblings of child as arguments.]
+    expected: FAIL
+
+  [Element.before() when pre-insert behaves like prepend.]
+    expected: FAIL
+
+  [Element.before() with one sibling of child and text as arguments.]
+    expected: FAIL
+
+  [Element.before() on a child without any parent.]
+    expected: FAIL
+
+  [Text.before() without any argument.]
+    expected: FAIL
+
+  [Text.before() with null as an argument.]
+    expected: FAIL
+
+  [Text.before() with undefined as an argument.]
+    expected: FAIL
+
+  [Text.before() with the empty string as an argument.]
+    expected: FAIL
+
+  [Text.before() with only text as an argument.]
+    expected: FAIL
+
+  [Text.before() with only one element as an argument.]
+    expected: FAIL
+
+  [Text.before() with one element and text as arguments.]
+    expected: FAIL
+
+  [Text.before() with context object itself as the argument.]
+    expected: FAIL
+
+  [Text.before() with all siblings of child as arguments.]
+    expected: FAIL
+
+  [Text.before() when pre-insert behaves like prepend.]
+    expected: FAIL
+
+  [Text.before() with one sibling of child and text as arguments.]
+    expected: FAIL
+
+  [Text.before() on a child without any parent.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/dom/nodes/ChildNode-replaceWith.html.ini b/testing/web-platform/meta/dom/nodes/ChildNode-replaceWith.html.ini
new file mode 100644
index 000000000000..d122b067a74d
--- /dev/null
+++ b/testing/web-platform/meta/dom/nodes/ChildNode-replaceWith.html.ini
@@ -0,0 +1,101 @@
+[ChildNode-replaceWith.html]
+  type: testharness
+  [Comment.replaceWith() without any argument.]
+    expected: FAIL
+
+  [Comment.replaceWith() with null as an argument.]
+    expected: FAIL
+
+  [Comment.replaceWith() with undefined as an argument.]
+    expected: FAIL
+
+  [Comment.replaceWith() with empty string as an argument.]
+    expected: FAIL
+
+  [Comment.replaceWith() with only text as an argument.]
+    expected: FAIL
+
+  [Comment.replaceWith() with only one element as an argument.]
+    expected: FAIL
+
+  [Comment.replaceWith() with sibling of child as arguments.]
+    expected: FAIL
+
+  [Comment.replaceWith() with one sibling of child and text as arguments.]
+    expected: FAIL
+
+  [Comment.replaceWith() with one sibling of child and child itself as arguments.]
+    expected: FAIL
+
+  [Comment.replaceWith() with one element and text as arguments.]
+    expected: FAIL
+
+  [Comment.replaceWith() on a parentless child with two elements as arguments.]
+    expected: FAIL
+
+  [Element.replaceWith() without any argument.]
+    expected: FAIL
+
+  [Element.replaceWith() with null as an argument.]
+    expected: FAIL
+
+  [Element.replaceWith() with undefined as an argument.]
+    expected: FAIL
+
+  [Element.replaceWith() with empty string as an argument.]
+    expected: FAIL
+
+  [Element.replaceWith() with only text as an argument.]
+    expected: FAIL
+
+  [Element.replaceWith() with only one element as an argument.]
+    expected: FAIL
+
+  [Element.replaceWith() with sibling of child as arguments.]
+    expected: FAIL
+
+  [Element.replaceWith() with one sibling of child and text as arguments.]
+    expected: FAIL
+
+  [Element.replaceWith() with one sibling of child and child itself as arguments.]
+    expected: FAIL
+
+  [Element.replaceWith() with one element and text as arguments.]
+    expected: FAIL
+
+  [Element.replaceWith() on a parentless child with two elements as arguments.]
+    expected: FAIL
+
+  [Text.replaceWith() without any argument.]
+    expected: FAIL
+
+  [Text.replaceWith() with null as an argument.]
+    expected: FAIL
+
+  [Text.replaceWith() with undefined as an argument.]
+    expected: FAIL
+
+  [Text.replaceWith() with empty string as an argument.]
+    expected: FAIL
+
+  [Text.replaceWith() with only text as an argument.]
+    expected: FAIL
+
+  [Text.replaceWith() with only one element as an argument.]
+    expected: FAIL
+
+  [Text.replaceWith() with sibling of child as arguments.]
+    expected: FAIL
+
+  [Text.replaceWith() with one sibling of child and text as arguments.]
+    expected: FAIL
+
+  [Text.replaceWith() with one sibling of child and child itself as arguments.]
+    expected: FAIL
+
+  [Text.replaceWith() with one element and text as arguments.]
+    expected: FAIL
+
+  [Text.replaceWith() on a parentless child with two elements as arguments.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/dom/nodes/ParentNode-append.html.ini b/testing/web-platform/meta/dom/nodes/ParentNode-append.html.ini
new file mode 100644
index 000000000000..4c12bc9bb7b0
--- /dev/null
+++ b/testing/web-platform/meta/dom/nodes/ParentNode-append.html.ini
@@ -0,0 +1,44 @@
+[ParentNode-append.html]
+  type: testharness
+  [Element.append() without any argument, on a parent having no child.]
+    expected: FAIL
+
+  [Element.append() with null as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [Element.append() with undefined as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [Element.append() with only text as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [Element.append() with only one element as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [Element.append() with null as an argument, on a parent having a child.]
+    expected: FAIL
+
+  [Element.append() with one element and text as argument, on a parent having a child.]
+    expected: FAIL
+
+  [DocumentFrgment.append() without any argument, on a parent having no child.]
+    expected: FAIL
+
+  [DocumentFrgment.append() with null as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [DocumentFrgment.append() with undefined as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [DocumentFrgment.append() with only text as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [DocumentFrgment.append() with only one element as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [DocumentFrgment.append() with null as an argument, on a parent having a child.]
+    expected: FAIL
+
+  [DocumentFrgment.append() with one element and text as argument, on a parent having a child.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/dom/nodes/ParentNode-prepend.html.ini b/testing/web-platform/meta/dom/nodes/ParentNode-prepend.html.ini
new file mode 100644
index 000000000000..07dd8dfd38dd
--- /dev/null
+++ b/testing/web-platform/meta/dom/nodes/ParentNode-prepend.html.ini
@@ -0,0 +1,44 @@
+[ParentNode-prepend.html]
+  type: testharness
+  [Element.prepend() without any argument, on a parent having no child.]
+    expected: FAIL
+
+  [Element.prepend() with null as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [Element.prepend() with undefined as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [Element.prepend() with only text as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [Element.prepend() with only one element as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [Element.prepend() with null as an argument, on a parent having a child.]
+    expected: FAIL
+
+  [Element.prepend() with one element and text as argument, on a parent having a child.]
+    expected: FAIL
+
+  [DocumentFrgment.prepend() without any argument, on a parent having no child.]
+    expected: FAIL
+
+  [DocumentFrgment.prepend() with null as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [DocumentFrgment.prepend() with undefined as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [DocumentFrgment.prepend() with only text as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [DocumentFrgment.prepend() with only one element as an argument, on a parent having no child.]
+    expected: FAIL
+
+  [DocumentFrgment.prepend() with null as an argument, on a parent having a child.]
+    expected: FAIL
+
+  [DocumentFrgment.prepend() with one element and text as argument, on a parent having a child.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/dom/nodes/append-on-Document.html.ini b/testing/web-platform/meta/dom/nodes/append-on-Document.html.ini
new file mode 100644
index 000000000000..5eef64bf52cb
--- /dev/null
+++ b/testing/web-platform/meta/dom/nodes/append-on-Document.html.ini
@@ -0,0 +1,17 @@
+[append-on-Document.html]
+  type: testharness
+  [Document.append() without any argument, on a Document having no child.]
+    expected: FAIL
+
+  [Document.append() with only one element as an argument, on a Document having no child.]
+    expected: FAIL
+
+  [Document.append() with only one element as an argument, on a Document having one child.]
+    expected: FAIL
+
+  [Document.append() with text as an argument, on a Document having no child.]
+    expected: FAIL
+
+  [Document.append() with two elements as the argument, on a Document having no child.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/dom/nodes/prepend-on-Document.html.ini b/testing/web-platform/meta/dom/nodes/prepend-on-Document.html.ini
new file mode 100644
index 000000000000..c72c3ef26777
--- /dev/null
+++ b/testing/web-platform/meta/dom/nodes/prepend-on-Document.html.ini
@@ -0,0 +1,17 @@
+[prepend-on-Document.html]
+  type: testharness
+  [Document.prepend() without any argument, on a Document having no child.]
+    expected: FAIL
+
+  [Document.prepend() with only one element as an argument, on a Document having no child.]
+    expected: FAIL
+
+  [Document.append() with only one element as an argument, on a Document having one child.]
+    expected: FAIL
+
+  [Document.prepend() with text as an argument, on a Document having no child.]
+    expected: FAIL
+
+  [Document.prepend() with two elements as the argument, on a Document having no child.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/hr-time/basic.html.ini b/testing/web-platform/meta/hr-time/basic.html.ini
index 0ea310612a0e..2b73f1638ced 100644
--- a/testing/web-platform/meta/hr-time/basic.html.ini
+++ b/testing/web-platform/meta/hr-time/basic.html.ini
@@ -3,3 +3,4 @@
   [High resolution time has approximately the right relative magnitude]
     disabled:
       if os == "win": inaccurate clock on Windows
+
diff --git a/testing/web-platform/meta/html/infrastructure/urls/terminology-0/document-base-url.html.ini b/testing/web-platform/meta/html/infrastructure/urls/terminology-0/document-base-url.html.ini
new file mode 100644
index 000000000000..c54a1cfdafe5
--- /dev/null
+++ b/testing/web-platform/meta/html/infrastructure/urls/terminology-0/document-base-url.html.ini
@@ -0,0 +1,5 @@
+[document-base-url.html]
+  type: testharness
+  [about:blank with a base element.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html.ini
deleted file mode 100644
index 7dbc42b0f1be..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[template-is-a-foster-parent-element.html]
-  type: testharness
-  [Template is a foster parent element. Test <table> immediately below <template>]
-    expected: FAIL
-
-  [Template is a foster parent element. Test <template> element without <table>]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html.ini
deleted file mode 100644
index f8352b89e898..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[template-is-not-a-foster-parent-element.html]
-  type: testharness
-  [Template is not a foster parent element. Test the case when <template> is higher in stack of open elements]
-    expected: FAIL
-
-  [Template is not a foster parent element. Test the case when <template> is lower in stack of open elements]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html.ini
deleted file mode 100644
index e90770378499..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[generating-of-implied-end-tags.html]
-  type: testharness
-  expected: ERROR
-  [Generating of implied end tags. Test table elements]
-    expected: FAIL
-
-  [Generating of implied end tags. Test div element]
-    expected: FAIL
-
-  [Generating of implied end tags. Test some text and DIV element]
-    expected: FAIL
-
-  [Generating of implied end tags. Test wrong end tag]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html.ini
deleted file mode 100644
index 1d4cb3d62edb..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[ignore-body-token.html]
-  type: testharness
-  expected: ERROR
-  [Ignore BODY token. Test empty BODY element assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore BODY token. Test not empty BODY element assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore BODY token. Test BODY element and some valid element after BODY tag assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore BODY token. Test BODY element and some valid element before BODY tag assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore BODY token. Test template with not empty BODY element inside assigned to another template's innerHTML]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html.ini
deleted file mode 100644
index 535fd373c5b3..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[ignore-frameset-token.html]
-  type: testharness
-  expected: ERROR
-  [Ignore frameset token. Test FRAMESET element assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore frameset token. Test FRAMESET element and some valid element before it, assigned to the template's innerHTML]
-    expected: FAIL
-
-  [Ignore frameset token. Test FRAMESET element and some valid element after it, assigned to the template's innerHTML]
-    expected: FAIL
-
-  [Ignore frameset token. Test FRAMESET tag inside template tag assigned to another template's innerHTML]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html.ini
deleted file mode 100644
index 508d1a5b5ad7..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[ignore-head-token.html]
-  type: testharness
-  expected: ERROR
-  [Ignore HEAD token. Test empty HEAD element assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore HEAD token. Test not empty HEAD element assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore HEAD token. Test HEAD element and some valid element before it, assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore HEAD token. Test HEAD element and some valid element after it, assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore HEAD token. Test HEAD tag inside template tag assigned to another template's innerHTML]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html.ini
deleted file mode 100644
index 0d5d3237dc5b..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[ignore-html-token.html]
-  type: testharness
-  expected: ERROR
-  [Ignore HTML token. Test HTML element assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore HTML token.Test HTML element and some valid element before it, assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore HTML token. Test HEAD element and some valid element after it, assigned to template innerHTML]
-    expected: FAIL
-
-  [Ignore HTML token. Test HTML tag inside template tag assigned to another template's innerHTML]
-    expected: FAIL
-
-  [Ignore HTML token. Test some valid element inside HTML element]
-    expected: FAIL
-
-  [Ignore HTML token. Test valid element inside HTML and BODY elements]
-    expected: FAIL
-
-  [Ignore HTML token. Test valid element inside and between HTML and BODY elements]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html.ini
deleted file mode 100644
index b6effb9d4ee2..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[start-tag-body.html]
-  type: testharness
-  [In body insertion mode: Template contains a start tag whose tag name is body.Test <body> tag only]
-    expected: FAIL
-
-  [In body insertion mode: Template contains a start tag whose tag name is body. Test <body> tag containing some text]
-    expected: FAIL
-
-  [In body insertion mode: Template contains a start tag whose tag name is body. Test <body> tag containing some other elements]
-    expected: FAIL
-
-  [In body insertion mode: Template contains a start tag whose tag name is body. Test nested template tag containing <body> tag with some other elements]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html.ini
deleted file mode 100644
index 57e67ee6e762..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[template-end-tag-without-start-one.html]
-  type: testharness
-  expected: ERROR
-  [</template> tag in HTML body without start one should be ignored]
-    expected: FAIL
-
-  [</template> tag in HTML body without start one should be ignored. Test valid <template> element and </template> tag after it]
-    expected: FAIL
-
-  [</template> tag in HTML body without start one should be ignored. Test valid <template> element and </template> tag before it]
-    expected: FAIL
-
-  [</template> tag in HTML body without start one should be ignored. Test valid <template> element, <title> element and </template> tag before them]
-    expected: FAIL
-
-  [</template> tag in HTML body without start one should be ignored. Test valid <template> element, <title> element and </template> tag after them]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html.ini
index 722a15c80b07..6b4334ca5a03 100644
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html.ini
+++ b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html.ini
@@ -1,3 +1,5 @@
 [end-tag-frameset.html]
   type: testharness
-  expected: ERROR
+  [</frameset> tag should be ignored if there's TEMPLATE element in the stack of open elements]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html.ini
deleted file mode 100644
index 1ec93ea63bd6..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[generating-of-implied-end-tags.html]
-  type: testharness
-  expected: ERROR
-  [Generating of implied end tags. Test table elements]
-    expected: FAIL
-
-  [Generating of implied end tags. Test DIV element]
-    expected: FAIL
-
-  [Generating of implied end tags. Test some text and DIV element]
-    expected: FAIL
-
-  [Generating of implied end tags. Test wrong end tag]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html.ini
deleted file mode 100644
index 5d77eb52caf1..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[template-end-tag-without-start-one.html]
-  type: testharness
-  expected: ERROR
-  [</template> tag in HTML head without start one should be ignored]
-    expected: FAIL
-
-  [</template> tag in HTML head without start one should be ignored. Test valid <template> element and </template> tag after it]
-    expected: FAIL
-
-  [</template> tag in HTML head without start one should be ignored. Test valid <template> element and </template> tag before it]
-    expected: FAIL
-
-  [</template> tag in HTML head without start one should be ignored. Test valid <template> element, <title> element and </template> tag before them]
-    expected: FAIL
-
-  [</template> tag in HTML head without start one should be ignored. Test valid <template> element, <title> element and </template> tag after them]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html.ini
deleted file mode 100644
index e3c16630edd2..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[end-tag-table.html]
-  type: testharness
-  [In table insertion mode. Ignore </table> token]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html.ini
deleted file mode 100644
index 9fe9bb045138..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[template-child-nodes.html]
-  type: testharness
-  expected: ERROR
-  [Template child nodes must be appended to template content node]
-    expected: FAIL
-
-  [Template child nodes must be appended to template content. Test nested template]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html.ini
deleted file mode 100644
index 31fdb23c1bf9..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearing-stack-back-to-a-table-body-context.html]
-  type: testharness
-  expected: ERROR
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html.ini
deleted file mode 100644
index 683519bb0ded..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearing-stack-back-to-a-table-context.html]
-  type: testharness
-  expected: ERROR
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html.ini
deleted file mode 100644
index dc24906ab74a..000000000000
--- a/testing/web-platform/meta/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clearing-stack-back-to-a-table-row-context.html]
-  type: testharness
-  expected: ERROR
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html.ini b/testing/web-platform/meta/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html.ini
index 01b3f2944180..4f4042e357c6 100644
--- a/testing/web-platform/meta/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html.ini
+++ b/testing/web-platform/meta/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html.ini
@@ -1,18 +1,11 @@
 [template-owner-document.html]
   type: testharness
-  expected: ERROR
-  [Test ownerDocument property of the element in a template. Current DOCUMENT has no browsing context. Test template element inside the div]
-    expected: FAIL
-
-  [Test ownerDocument property of the element in a template. Current DOCUMENT has no browsing context. Test template element in the root of the body]
-    expected: FAIL
-
-  [Test ownerDocument property of the element in a template. Current DOCUMENT has no browsing context. Test template element in the root of the head]
-    expected: FAIL
-
   [Test ownerDocument property of the element in a template. Current DOCUMENT has no browsing context. Test template element in the root of the frameset]
     expected: FAIL
 
-  [Test ownerDocument property of the element in a nested template]
+  [Test ownerDocument for the element keygen in the template]
+    expected: FAIL
+
+  [Test ownerDocument for the element keygen in the template. Document has browsing context]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..1dfdae7ec0ae
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
@@ -0,0 +1,16 @@
+[allowed.https.html]
+  type: testharness
+  expected:
+    if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): ERROR
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..5a08712e3b70
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..e9f49f042f06
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,6 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: form-tag\n                                 expectation: allowed]
+    expected:
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..a2ab46938803
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..00c44bbe812d
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..f47a315f391c
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
@@ -0,0 +1,5 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..8d87d8dae975
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,5 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..f6d38bf68ecc
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: picture-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..576feb8ac538
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: picture-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..a62641bdfe57
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
@@ -0,0 +1,18 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..313e9d7d3fb2
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,18 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..f0717a053cd4
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..046763b00859
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..a1e1be9a67b9
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,5 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..8df25c3717af
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: picture-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..1895bd0b300b
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,18 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..1b37ec40dbeb
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..70ba988b541f
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..d6f731a83dfc
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..502a888dd12e
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/img-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..141ae59c95cb
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
@@ -0,0 +1,5 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..f7cc21a7f43b
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,5 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..2bde3eeeb580
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: picture-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..9b0912ade380
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/picture-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,14 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: picture-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..5b9cd9fcb987
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
@@ -0,0 +1,18 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini
new file mode 100644
index 000000000000..3faf91334aeb
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/video-tag/top-level/no-redirect/allowed.https.html.ini
@@ -0,0 +1,18 @@
+[allowed.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
similarity index 58%
rename from testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html.ini
rename to testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
index 5ea5def51edf..fdf13871be59 100644
--- a/testing/web-platform/meta/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html.ini
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -1,3 +1,3 @@
-[start-tag-html.html]
+[opt-in-blocks.https.html]
   type: testharness
   expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..fdf13871be59
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..fdf13871be59
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..f327a0fcaf3a
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: NOTRUN
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..2352caf72d02
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,19 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected:
+    if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): TIMEOUT
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..f9b9e3c5ec13
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..545a790a1e12
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..ccc18194f0bb
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..bd5170cc15f7
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..fdf13871be59
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..fdf13871be59
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..fdf13871be59
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/form-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..f0060c24fdae
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: NOTRUN
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..a9cec1710d4e
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,19 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected:
+    if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): TIMEOUT
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..d35b59ea5565
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/link-css-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..bf55c23a15bd
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..839f66ae6f10
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..165b44606f30
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..fdf13871be59
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..d25eca1f3577
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [opt_in_method: meta-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: NOTRUN
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..972cec9ea16e
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/meta-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [opt_in_method: meta-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..fdf13871be59
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/form-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..c9316f207137
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/link-css-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [opt_in_method: meta-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: NOTRUN
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..04898ba97812
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [opt_in_method: meta-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..9d7e2ef67e7c
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..9d7e2ef67e7c
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..9d7e2ef67e7c
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..0f23b549af64
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: NOTRUN
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..2f2407fa90ca
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..a722bde69eef
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..bc4a0a6320cd
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..106ee7a41443
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..1edcdd158d6b
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..9d7e2ef67e7c
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..9d7e2ef67e7c
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..9d7e2ef67e7c
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/form-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,3 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..4189c96b6076
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,6 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: NOTRUN
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..0f3f843587a8
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,18 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  expected:
+    if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): TIMEOUT
+    if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): TIMEOUT
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..ef5ff3c30129
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/link-css-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..68d74d2b56c8
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/keep-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..2b6fa63b5b4f
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..5611cc12062f
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/object-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..026d404f6f3a
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: audio-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..b08dcb7d98c8
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: audio-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..2a03ca28ddff
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: audio-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..5fa0a6bee500
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: img-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..bd24846dbc5e
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: img-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..c3848817567c
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: img-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..6e4ccd3d544b
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..3db9b075fcbf
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..22724cc68eb6
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..37eb76f20e3a
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,17 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: video-tag\n                                 expectation: blocked]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..ab52c1a7735e
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,17 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: video-tag\n                                 expectation: blocked]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..8e91a092cf31
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/cross-origin-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,17 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: video-tag\n                                 expectation: blocked]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..8f78f3e3ad9e
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: audio-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..11d9b8bdf9e2
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: audio-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..b4c80d740896
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/audio-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: audio-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..50d49fbe9299
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: img-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..d66c43aaecbf
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: img-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..1178ae0c2d65
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/img-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: img-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..6c72606cde8b
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..0747448661bd
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..2ebe8cc8001e
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..0c618a5c700f
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/keep-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,17 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: video-tag\n                                 expectation: blocked]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..bd5deb03e851
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,17 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: video-tag\n                                 expectation: blocked]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..7c65b35d3349
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/http-csp/same-host-http/video-tag/top-level/swap-scheme-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,17 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: video-tag\n                                 expectation: blocked]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..24f35bc8a047
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: audio-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..c146030eecf6
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: img-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..4599c2986d7f
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..b586ed35bc05
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/cross-origin-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,17 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: video-tag\n                                 expectation: blocked]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..4a1899d3c907
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/audio-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: audio-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..dadfbe9e39c3
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/img-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: img-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..133d1b94f3a6
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/link-prefetch-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,5 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
new file mode 100644
index 000000000000..2c6747a12567
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/meta-csp/same-host-http/video-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,17 @@
+[opt-in-blocks.https.html]
+  type: testharness
+  [opt_in_method: meta-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: video-tag\n                                 expectation: blocked]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..3b3d36ea356b
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..519ef4eb4d2c
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..cded52d92c15
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..32236f751e9a
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..9bb037412671
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..3ee32bce81e3
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..6c7f9bdae96e
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..cd36fda79099
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..7635cf60ae71
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..81987af6094a
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,18 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..425088bab976
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,18 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..75ea232f09ce
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/cross-origin-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,18 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..7ac8ae7392f9
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..70a821c96e39
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..005e24e99714
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/audio-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: audio-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..fb414f41ee7c
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..efd80b858007
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..d4c65df37b7a
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/img-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,14 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: img-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..985fea2a7a5f
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..8db20a207c08
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..689dad3e2027
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/link-prefetch-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,5 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..095b4ff36a83
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/keep-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,18 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..749318d31fc5
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/no-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,18 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
new file mode 100644
index 000000000000..06b8e25fef42
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/optionally-blockable/no-opt-in/same-host-http/video-tag/top-level/swap-scheme-redirect/no-opt-in-allows.https.html.ini
@@ -0,0 +1,18 @@
+[no-opt-in-allows.https.html]
+  type: testharness
+  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: video-tag\n                                 expectation: allowed]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): PASS
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+      FAIL
+
diff --git a/testing/web-platform/meta/navigation-timing/test_timing_xserver_redirect.html.ini b/testing/web-platform/meta/navigation-timing/test_timing_xserver_redirect.html.ini
index ce4da89accd1..fba9bfef48d7 100644
--- a/testing/web-platform/meta/navigation-timing/test_timing_xserver_redirect.html.ini
+++ b/testing/web-platform/meta/navigation-timing/test_timing_xserver_redirect.html.ini
@@ -2,5 +2,3 @@
   type: testharness
   disabled:
     if (os == "mac") and (version == "OS X 10.10"): https://bugzilla.mozilla.org/show_bug.cgi?id=1172135
-  expected:
-    if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): TIMEOUT
diff --git a/testing/web-platform/meta/shadow-dom/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html.ini b/testing/web-platform/meta/shadow-dom/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html.ini
deleted file mode 100644
index 19c940434bc4..000000000000
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[dom-tree-accessors-001.html]
-  type: testharness
-  [The content of title element in a shadow tree should not be accessible from owner document's "title" attribute.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/webstorage/event_body_attribute.html.ini b/testing/web-platform/meta/webstorage/event_body_attribute.html.ini
new file mode 100644
index 000000000000..c31f01135494
--- /dev/null
+++ b/testing/web-platform/meta/webstorage/event_body_attribute.html.ini
@@ -0,0 +1,5 @@
+[event_body_attribute.html]
+  type: testharness
+  [localStorage mutations fire StorageEvents that are caught by the event listener specified as an attribute on the body.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webstorage/event_setattribute.html.ini b/testing/web-platform/meta/webstorage/event_setattribute.html.ini
new file mode 100644
index 000000000000..8d1c6811fe7d
--- /dev/null
+++ b/testing/web-platform/meta/webstorage/event_setattribute.html.ini
@@ -0,0 +1,5 @@
+[event_setattribute.html]
+  type: testharness
+  [localStorage mutations fire StorageEvents that are caught by the event listener attached via setattribute.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webstorage/storage_local_window_open_second.html.ini b/testing/web-platform/meta/webstorage/storage_local_window_open_second.html.ini
deleted file mode 100644
index d174c62a22b8..000000000000
--- a/testing/web-platform/meta/webstorage/storage_local_window_open_second.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[storage_local_window_open_second.html]
-  type: testharness
-  [A new window to make sure there is a copy of the previous window's localStorage, and that they diverge after a change]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/webstorage/storage_session_window_open_second.html.ini b/testing/web-platform/meta/webstorage/storage_session_window_open_second.html.ini
deleted file mode 100644
index 46bffcd7fb03..000000000000
--- a/testing/web-platform/meta/webstorage/storage_session_window_open_second.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[storage_session_window_open_second.html]
-  type: testharness
-  [A new window to make sure there is a copy of the previous window's sessionStorage, and that they diverge after a change]
-    expected: FAIL
-
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/claim-using-registration.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/claim-using-registration.https.html.ini
deleted file mode 100644
index edfa23a9cb5a..000000000000
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/claim-using-registration.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[claim-using-registration.https.html]
-  type: testharness
-  expected: TIMEOUT
-  [Test worker claims client which is using another registration]
-    expected: TIMEOUT
-
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/registration.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/registration.https.html.ini
index ff7cb5bd5c05..9a10751eb999 100644
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/registration.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/registration.https.html.ini
@@ -48,6 +48,3 @@
   [Scope including URL-encoded backslash]
     expected: FAIL
 
-  [Script URL including parent-reference]
-    expected: FAIL
-
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/resource-timing.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/resource-timing.https.html.ini
index 27681d606e16..b399d5f386aa 100644
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/resource-timing.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/resource-timing.https.html.ini
@@ -2,8 +2,7 @@
   type: testharness
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1178713
   [Controlled resource loads]
-    expected:
-      FAIL
+    expected: FAIL
 
   [Non-controlled resource loads]
     expected: FAIL