Bug 1187720 - Update web-platform-tests expected data to revision 4bc69f287365a67585d470300a2ef109689cf465, a=testonly
authorJames Graham <james@hoppipolla.co.uk>
Fri, 24 Jul 2015 19:14:55 +0100
changeset 254617 a3218dcdc2a1d7a9ecb7eecbf815e52236123802
parent 254616 0a00ee27eec742595157b1a73b92f6865c99a1b7
child 254618 6150fa09d51f36af7afa9ccf2c0ed4c183daf95d
push id29108
push userryanvm@gmail.com
push dateMon, 27 Jul 2015 14:12:01 +0000
treeherdermozilla-central@27ae736ef960 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1187720
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1187720 - Update web-platform-tests expected data to revision 4bc69f287365a67585d470300a2ef109689cf465, a=testonly
testing/web-platform/meta/FileAPI/blob/Blob-constructor.html.ini
testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
testing/web-platform/meta/dom/nodes/Node-lookupNamespaceURI.html.ini
testing/web-platform/meta/hr-time/basic.html.ini
testing/web-platform/meta/html/rendering/non-replaced-elements/the-fieldset-element-0/min-width-not-important.html.ini
testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/audio-tag/top-level/no-redirect/allowed.https.html.ini
testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html.ini
testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/keep-scheme-redirect/allowed.https.html.ini
testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
testing/web-platform/meta/mixed-content/allowed/meta-csp/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
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
testing/web-platform/meta/mixed-content/allowed/no-opt-in/same-host-https/link-prefetch-tag/top-level/no-redirect/allowed.https.html.ini
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
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
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
testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
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
testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
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
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
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
testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
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
testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
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
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
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
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
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
testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
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
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
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
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
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
testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
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
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
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
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
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
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
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
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
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
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
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
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
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
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
testing/web-platform/meta/notifications/constructor-basic.html.ini
testing/web-platform/meta/notifications/constructor-invalid.html.ini
testing/web-platform/meta/notifications/event-onclose.html.ini
testing/web-platform/meta/notifications/event-onshow.html.ini
testing/web-platform/meta/notifications/instance.html.ini
testing/web-platform/meta/notifications/lang.html.ini
testing/web-platform/meta/notifications/notification-lang.html.ini
testing/web-platform/meta/old-tests/submission/Opera/script_scheduling/111.html.ini
testing/web-platform/meta/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html.ini
testing/web-platform/meta/shadow-dom/shadow-trees/text-decoration-001.html.ini
testing/web-platform/meta/shadow-dom/styles/test-002.html.ini
testing/web-platform/meta/subresource-integrity/subresource-integrity.html.ini
testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-csp.https.html.ini
testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-event-async-respond-with.https.html.ini
testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html.ini
testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-frame-resource.https.html.ini
testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-request-xhr.https.html.ini
testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-response-xhr.https.html.ini
testing/web-platform/mozilla/meta/service-workers/service-worker/invalid-blobtype.https.html.ini
testing/web-platform/mozilla/meta/service-workers/service-worker/invalid-header.https.html.ini
testing/web-platform/mozilla/meta/service-workers/service-worker/referer.https.html.ini
--- a/testing/web-platform/meta/FileAPI/blob/Blob-constructor.html.ini
+++ b/testing/web-platform/meta/FileAPI/blob/Blob-constructor.html.ini
@@ -1,13 +1,10 @@
 [Blob-constructor.html]
   type: testharness
-  [no-argument Blob constructor without 'new']
-    expected: FAIL
-
   [A plain object should be treated as a sequence for the blobParts argument.]
     expected: FAIL
 
   [A plain object with a length property should be treated as a sequence for the blobParts argument.]
     expected: FAIL
 
   [The length getter should be invoked and any exceptions should be propagated.]
     expected: FAIL
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
@@ -0,0 +1,176 @@
+[idlharness.worker]
+  type: testharness
+  [URL interface: operation createFor(Blob)]
+    expected: FAIL
+
+  [Blob interface: attribute isClosed]
+    expected: FAIL
+
+  [Blob interface: operation close()]
+    expected: FAIL
+
+  [Blob interface: new Blob(["TEST"\]) must inherit property "isClosed" with the proper type (2)]
+    expected: FAIL
+
+  [Blob interface: new Blob(["TEST"\]) must inherit property "close" with the proper type (4)]
+    expected: FAIL
+
+  [File interface object length]
+    expected: FAIL
+
+  [Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "isClosed" with the proper type (2)]
+    expected: FAIL
+
+  [Blob interface: new File(["myFileBits"\], "myFileName") must inherit property "close" with the proper type (4)]
+    expected: FAIL
+
+  [FileList interface: existence and properties of interface object]
+    expected: FAIL
+
+  [FileList interface object length]
+    expected: FAIL
+
+  [FileList interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [FileList interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [FileList interface: operation item(unsigned long)]
+    expected: FAIL
+
+  [FileList interface: attribute length]
+    expected: FAIL
+
+  [FileReader interface: existence and properties of interface object]
+    expected: FAIL
+
+  [FileReader interface object length]
+    expected: FAIL
+
+  [FileReader interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [FileReader interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [FileReader interface: operation readAsArrayBuffer(Blob)]
+    expected: FAIL
+
+  [FileReader interface: operation readAsText(Blob,DOMString)]
+    expected: FAIL
+
+  [FileReader interface: operation readAsDataURL(Blob)]
+    expected: FAIL
+
+  [FileReader interface: operation abort()]
+    expected: FAIL
+
+  [FileReader interface: constant EMPTY on interface object]
+    expected: FAIL
+
+  [FileReader interface: constant EMPTY on interface prototype object]
+    expected: FAIL
+
+  [FileReader interface: constant LOADING on interface object]
+    expected: FAIL
+
+  [FileReader interface: constant LOADING on interface prototype object]
+    expected: FAIL
+
+  [FileReader interface: constant DONE on interface object]
+    expected: FAIL
+
+  [FileReader interface: constant DONE on interface prototype object]
+    expected: FAIL
+
+  [FileReader interface: attribute readyState]
+    expected: FAIL
+
+  [FileReader interface: attribute result]
+    expected: FAIL
+
+  [FileReader interface: attribute error]
+    expected: FAIL
+
+  [FileReader interface: attribute onloadstart]
+    expected: FAIL
+
+  [FileReader interface: attribute onprogress]
+    expected: FAIL
+
+  [FileReader interface: attribute onload]
+    expected: FAIL
+
+  [FileReader interface: attribute onabort]
+    expected: FAIL
+
+  [FileReader interface: attribute onerror]
+    expected: FAIL
+
+  [FileReader interface: attribute onloadend]
+    expected: FAIL
+
+  [FileReader must be primary interface of new FileReader()]
+    expected: FAIL
+
+  [Stringification of new FileReader()]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "readAsArrayBuffer" with the proper type (0)]
+    expected: FAIL
+
+  [FileReader interface: calling readAsArrayBuffer(Blob) on new FileReader() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "readAsText" with the proper type (1)]
+    expected: FAIL
+
+  [FileReader interface: calling readAsText(Blob,DOMString) on new FileReader() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "readAsDataURL" with the proper type (2)]
+    expected: FAIL
+
+  [FileReader interface: calling readAsDataURL(Blob) on new FileReader() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "abort" with the proper type (3)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "EMPTY" with the proper type (4)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "LOADING" with the proper type (5)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "DONE" with the proper type (6)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "readyState" with the proper type (7)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "result" with the proper type (8)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "error" with the proper type (9)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onloadstart" with the proper type (10)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onprogress" with the proper type (11)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onload" with the proper type (12)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onabort" with the proper type (13)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onerror" with the proper type (14)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onloadend" with the proper type (15)]
+    expected: FAIL
+
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/dom/nodes/Node-lookupNamespaceURI.html.ini
@@ -0,0 +1,41 @@
+[Node-lookupNamespaceURI.html]
+  type: testharness
+  [Element should not have XMLNS namespace]
+    expected: FAIL
+
+  [Element has namespace URI matching prefix]
+    expected: FAIL
+
+  [Element does not has namespace with xlmns prefix]
+    expected: FAIL
+
+  [Comment should inherit namespace URI matching prefix]
+    expected: FAIL
+
+  [Child element should inherit baz namespace]
+    expected: FAIL
+
+  [Child element should have null namespace]
+    expected: FAIL
+
+  [Child element should not have XMLNS namespace]
+    expected: FAIL
+
+  [Child element has namespace URI matching prefix]
+    expected: FAIL
+
+  [baz namespace is default for child]
+    expected: FAIL
+
+  [childNamespace is default for child]
+    expected: FAIL
+
+  [Document should have xhtml namespace]
+    expected: FAIL
+
+  [For document, baz namespace is not default]
+    expected: FAIL
+
+  [For document, xhtml namespace is default]
+    expected: FAIL
+
--- a/testing/web-platform/meta/hr-time/basic.html.ini
+++ b/testing/web-platform/meta/hr-time/basic.html.ini
@@ -1,7 +1,6 @@
 [basic.html]
   type: testharness
   [High resolution time has approximately the right relative magnitude]
     disabled:
       if os == "win": inaccurate clock on Windows
 
-
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/html/rendering/non-replaced-elements/the-fieldset-element-0/min-width-not-important.html.ini
@@ -0,0 +1,3 @@
+[min-width-not-important.html]
+  type: reftest
+  expected: FAIL
--- 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
@@ -1,12 +1,13 @@
 [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
+    if 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
--- 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
@@ -1,10 +1,12 @@
 [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: 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
deleted file mode 100644
--- a/testing/web-platform/meta/mixed-content/allowed/http-csp/same-host-https/form-tag/top-level/no-redirect/allowed.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[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
-
--- 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
@@ -1,5 +1,6 @@
 [allowed.https.html]
   type: testharness
+  expected: TIMEOUT
   [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
+    expected: NOTRUN
 
--- 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
@@ -1,5 +1,6 @@
 [allowed.https.html]
   type: testharness
+  expected: TIMEOUT
   [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
+    expected: NOTRUN
 
--- 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
@@ -1,5 +1,6 @@
 [allowed.https.html]
   type: testharness
+  expected: TIMEOUT
   [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
+    expected: NOTRUN
 
--- 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
@@ -1,5 +1,6 @@
 [allowed.https.html]
   type: testharness
+  expected: TIMEOUT
   [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
+    expected: NOTRUN
 
--- 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
@@ -1,5 +1,6 @@
 [allowed.https.html]
   type: testharness
+  expected: TIMEOUT
   [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
+    expected: NOTRUN
 
--- 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
@@ -9,11 +9,12 @@
     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
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") 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
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: swap-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: no-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: swap-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,9 @@
+[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: picture-tag\n                                 expectation: blocked]
+    expected:
+      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 == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+
--- 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
@@ -9,11 +9,12 @@
     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
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") 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
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: swap-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: no-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: swap-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -0,0 +1,9 @@
+[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: picture-tag\n                                 expectation: blocked]
+    expected:
+      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 == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+
--- 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
@@ -1,6 +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
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: swap-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: swap-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,9 @@
+[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: picture-tag\n                                 expectation: blocked]
+    expected:
+      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 == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+
--- 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
@@ -8,11 +8,13 @@
     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
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): 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
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: swap-scheme-redirect\n                                 subresource: link-css-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: no-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: swap-scheme-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -0,0 +1,9 @@
+[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: picture-tag\n                                 expectation: blocked]
+    expected:
+      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 == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+
--- 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
@@ -1,5 +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-prefetch-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: swap-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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-prefetch-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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: swap-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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-prefetch-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +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-prefetch-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +1,6 @@
 [no-opt-in-allows.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-prefetch-tag\n                                 expectation: allowed]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +1,6 @@
 [no-opt-in-allows.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-prefetch-tag\n                                 expectation: allowed]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +1,6 @@
 [no-opt-in-allows.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: swap-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +1,6 @@
 [no-opt-in-allows.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-prefetch-tag\n                                 expectation: allowed]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +1,6 @@
 [no-opt-in-allows.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: no-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
-    expected: FAIL
+    expected: NOTRUN
 
--- 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
@@ -1,5 +1,6 @@
 [no-opt-in-allows.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: swap-scheme-redirect\n                                 subresource: link-prefetch-tag\n                                 expectation: allowed]
-    expected: FAIL
+    expected: NOTRUN
 
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/notifications/constructor-basic.html.ini
@@ -0,0 +1,6 @@
+[constructor-basic.html]
+  type: testharness
+  expected: TIMEOUT
+  [Called the notification constructor with one argument.]
+    expected: NOTRUN
+
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/notifications/constructor-invalid.html.ini
@@ -0,0 +1,6 @@
+[constructor-invalid.html]
+  type: testharness
+  expected: TIMEOUT
+  [Called the notification constructor with no arguments.]
+    expected: NOTRUN
+
--- a/testing/web-platform/meta/notifications/event-onclose.html.ini
+++ b/testing/web-platform/meta/notifications/event-onclose.html.ini
@@ -1,6 +1,9 @@
 [event-onclose.html]
   type: testharness
   expected: TIMEOUT
   [the notification.onclose event can be invoked]
     expected: NOTRUN
 
+  [Checked test prerequisites.]
+    expected: NOTRUN
+
--- a/testing/web-platform/meta/notifications/event-onshow.html.ini
+++ b/testing/web-platform/meta/notifications/event-onshow.html.ini
@@ -1,6 +1,9 @@
 [event-onshow.html]
   type: testharness
   expected: TIMEOUT
   [the notification.onshow event can be invoked]
     expected: NOTRUN
 
+  [Checked test prerequisites.]
+    expected: NOTRUN
+
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/notifications/instance.html.ini
@@ -0,0 +1,6 @@
+[instance.html]
+  type: testharness
+  expected: TIMEOUT
+  [Notification instance basic tests]
+    expected: NOTRUN
+
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/notifications/lang.html.ini
@@ -0,0 +1,114 @@
+[lang.html]
+  type: testharness
+  expected: TIMEOUT
+  [Roundtripping lang "". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "en". Expecting "en".]
+    expected: NOTRUN
+
+  [Roundtripping lang "en-US-x-hixie". Expecting "en-US-x-hixie".]
+    expected: NOTRUN
+
+  [Roundtripping lang "de-DE". Expecting "de-DE".]
+    expected: NOTRUN
+
+  [Roundtripping lang "de-de". Expecting "de-de".]
+    expected: NOTRUN
+
+  [Roundtripping lang "de-De". Expecting "de-De".]
+    expected: NOTRUN
+
+  [Roundtripping lang "de-dE". Expecting "de-dE".]
+    expected: NOTRUN
+
+  [Roundtripping lang "de-DE-1996". Expecting "de-DE-1996".]
+    expected: NOTRUN
+
+  [Roundtripping lang "de-Latn-DE". Expecting "de-Latn-DE".]
+    expected: NOTRUN
+
+  [Roundtripping lang "de-Latf-DE". Expecting "de-Latf-DE".]
+    expected: NOTRUN
+
+  [Roundtripping lang "de-Latn-DE-1996". Expecting "de-Latn-DE-1996".]
+    expected: NOTRUN
+
+  [Roundtripping lang "de-CH". Expecting "de-CH".]
+    expected: NOTRUN
+
+  [Roundtripping lang "it-CH". Expecting "it-CH".]
+    expected: NOTRUN
+
+  [Roundtripping lang "fr-CH". Expecting "fr-CH".]
+    expected: NOTRUN
+
+  [Roundtripping lang "rm-CH". Expecting "rm-CH".]
+    expected: NOTRUN
+
+  [Roundtripping lang "es-CH". Expecting "es-CH".]
+    expected: NOTRUN
+
+  [Roundtripping lang "Latn-de". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "Latf-de". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "tic-tac-tac-toe". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "cocoa-1-bar". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "cocoa-a-bar". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "en-". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "en--". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "foo--bar". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "id---Java". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "fr-x". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "fr-xenomorph". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "fr-x-xenomorph". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "a". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "a-fr-lang". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "b-fr-lang". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "es1-KK-aa-bb-cc-dd". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "es2-KL-aa-bb-cc-dd". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "es3-KM-aa-bb-cc-dd". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "fooÉ". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "foöÉ-bÁr". Expecting "".]
+    expected: NOTRUN
+
+  [Roundtripping lang "foöÉbÁr". Expecting "".]
+    expected: NOTRUN
+
deleted file mode 100644
--- a/testing/web-platform/meta/notifications/notification-lang.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[notification-lang.html]
-  type: testharness
-  expected: TIMEOUT
-  [We have permission to use the notifications API.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/old-tests/submission/Opera/script_scheduling/111.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[111.html]
-  type: testharness
-  [ scheduler: removing async attribute at runtime]
-    expected:
-      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html.ini
@@ -0,0 +1,5 @@
+[test-006.html]
+  type: testharness
+  [A_10_01_02_06_01_T02]
+    expected: FAIL
+
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hosting-multiple-shadow-trees-002.html]
-  type: reftest
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hosting-multiple-shadow-trees-003.html]
-  type: reftest
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-001.html]
-  type: testharness
-  [A_04_05_01_T02]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-002.html]
-  type: testharness
-  [A_04_05_02_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-003.html]
-  type: testharness
-  [A_04_05_03_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-006.html]
-  type: testharness
-  [A_04_03_06_01_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-007.html]
-  type: testharness
-  [A_04_03_06_03_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-008.html]
-  type: testharness
-  [A_04_03_06_04_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-009.html]
-  type: testharness
-  [A_04_03_06_05_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-010.html]
-  type: testharness
-  [A_04_03_06_06_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-011.html]
-  type: testharness
-  [A_04_03_06_07_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-012.html]
-  type: testharness
-  [A_04_03_06_08_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-013.html]
-  type: testharness
-  [A_04_03_06_09_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-014.html]
-  type: testharness
-  [A_04_03_06_10_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-015.html]
-  type: testharness
-  [A_04_03_06_11_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-016.html]
-  type: testharness
-  [A_04_03_06_12_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-017.html]
-  type: testharness
-  [A_04_03_06_13_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-018.html]
-  type: testharness
-  [A_04_03_06_14_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-019.html]
-  type: testharness
-  [A_04_03_06_15_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-020.html]
-  type: testharness
-  [A_04_03_06_16_T01]
-    expected: FAIL
-
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/shadow-trees/text-decoration-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[text-decoration-001.html]
-  type: reftest
-  expected: FAIL
deleted file mode 100644
--- a/testing/web-platform/meta/shadow-dom/styles/test-002.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test-002.html]
-  type: testharness
-  [A_06_00_02_T03]
-    expected: FAIL
-
--- a/testing/web-platform/meta/subresource-integrity/subresource-integrity.html.ini
+++ b/testing/web-platform/meta/subresource-integrity/subresource-integrity.html.ini
@@ -67,8 +67,11 @@
     expected: FAIL
 
   [Style: <crossorigin='use-credentials'> with incorrect hash CORS-eligible]
     expected: FAIL
 
   [Style: <crossorigin='anonymous'> with CORS-ineligible resource]
     expected: FAIL
 
+  [Style: Same-origin with incorrect sha256 and sha512 hash, rel='alternate stylesheet' enabled]
+    expected: FAIL
+
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-csp.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-csp.https.html.ini
@@ -1,10 +1,6 @@
 [fetch-csp.https.html]
   type: testharness
-  expected:
-    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
-    TIMEOUT
+  expected: TIMEOUT
   [Verify CSP control of fetch() in a Service Worker]
     expected: TIMEOUT
 
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-event-async-respond-with.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-event-async-respond-with.https.html.ini
@@ -1,10 +1,3 @@
 [fetch-event-async-respond-with.https.html]
   type: testharness
-  expected:
-    if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
-    if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
-    if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
-    CRASH
+  expected: CRASH
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html.ini
@@ -1,10 +1,3 @@
 [fetch-event-respond-with-stops-propagation.https.html]
   type: testharness
-  expected:
-    if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
-    if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
-    if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
-    CRASH
+  expected: CRASH
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-frame-resource.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-frame-resource.https.html.ini
@@ -6,17 +6,23 @@
 
   [Basic type response could be loaded in the new window.]
     expected: TIMEOUT
 
   [CORS type response could not be loaded in the iframe.]
     expected: FAIL
 
   [Opaque type response could not be loaded in the iframe.]
-    expected: FAIL
+    expected:
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): PASS
+      FAIL
 
   [CORS type response could not be loaded in the new window.]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1183162
-    expected: FAIL
+    expected:
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): PASS
+      FAIL
 
   [Opaque type response could not be loaded in the new window.]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1183162
     expected: FAIL
+
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-request-xhr.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-request-xhr.https.html.ini
@@ -1,10 +1,6 @@
 [fetch-request-xhr.https.html]
   type: testharness
-  expected:
-    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
-    TIMEOUT
+  expected: TIMEOUT
   [Verify the body of FetchEvent using XMLHttpRequest]
     expected: TIMEOUT
 
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-response-xhr.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-response-xhr.https.html.ini
@@ -1,10 +1,6 @@
 [fetch-response-xhr.https.html]
   type: testharness
-  expected:
-    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
-    TIMEOUT
+  expected: TIMEOUT
   [Verify the response of FetchEvent using XMLHttpRequest]
     expected: TIMEOUT
 
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/invalid-blobtype.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/invalid-blobtype.https.html.ini
@@ -1,10 +1,6 @@
 [invalid-blobtype.https.html]
   type: testharness
-  expected:
-    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
-    TIMEOUT
+  expected: TIMEOUT
   [Verify the response of FetchEvent using XMLHttpRequest]
     expected: TIMEOUT
 
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/invalid-header.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/invalid-header.https.html.ini
@@ -1,10 +1,6 @@
 [invalid-header.https.html]
   type: testharness
-  expected:
-    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
-    TIMEOUT
+  expected: TIMEOUT
   [Verify the response of FetchEvent using XMLHttpRequest]
     expected: TIMEOUT
 
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/referer.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/referer.https.html.ini
@@ -1,10 +1,6 @@
 [referer.https.html]
   type: testharness
-  expected:
-    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
-    TIMEOUT
+  expected: TIMEOUT
   [Verify the referer]
     expected: TIMEOUT