From 5645d3ff91ee3486b318a504d014878b24f071d8 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Tue, 22 Oct 2019 10:24:51 +0000
Subject: [PATCH] Update web-platform-tests to revision
 0740bf536a0dbdb60ef76dd0cb15980ebcc86c7d

---
 .../url/url-in-tags-revoke.window.js.ini      |   2 +-
 tests/wpt/metadata/MANIFEST.json              | 222 ++++++++++++------
 .../inline-negative-margin-001.html.ini       |   4 +-
 .../css/CSS2/normal-flow/width-051.xht.ini    |   2 +
 .../first-letter-punctuation-067.xht.ini      |   2 +-
 .../matchMedia-display-none-iframe.html.ini   |   2 -
 .../encoding/single-byte-decoder.html.ini     |   1 -
 .../fetch/content-type/response.window.js.ini |  10 +-
 .../fetch/content-type/script.window.js.ini   |   6 -
 .../nosniff/parsing-nosniff.window.js.ini     |   2 +-
 ...mbedded-credentials.tentative.sub.html.ini |   3 +-
 .../traverse_the_history_1.html.ini           |   4 +
 .../traverse_the_history_4.html.ini           |   4 -
 .../traverse_the_history_5.html.ini           |   4 -
 ...creating_browsing_context_test_01.html.ini |   4 -
 .../update-the-rendering.html.ini             |   4 +-
 .../iframe_sandbox_popups_escaping-3.html.ini |   3 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |   3 +-
 .../form-double-submit.html.ini               |   2 +-
 .../form-submission-algorithm.html.ini        |   4 -
 .../the-details-element/toggleEvent.html.ini  |   7 -
 .../parsing/DOMContentLoaded-defer.html.ini   |   4 -
 tests/wpt/metadata/url/url-setters.html.ini   |   9 +
 .../018.html.ini                              |   0
 .../Worker/Worker-constructor.html.ini        |   2 +
 .../css/transition_calc_implicit.html.ini     |   2 +
 .../web-platform-tests/.azure-pipelines.yml   |   2 +-
 .../structured-clone-transaction-state.any.js |  96 ++++++++
 .../inactive-timeline.https.html              |  41 ++++
 .../wm-propagation-svg-root-scrollbar.svg     |  11 +
 .../background-image-multiple-elements.html   |   4 +-
 .../background-image-stretched.html           |   4 +-
 .../element-timing/buffer-before-onload.html  |  10 +-
 .../element-timing/disconnect-image.html      |   4 +-
 .../element-timing/image-carousel.html        |  11 +-
 .../element-timing/image-clipped-svg.html     |   4 +-
 .../image-not-fully-visible.html              |   4 +-
 .../element-timing/image-with-css-scale.html  |   4 +-
 .../element-timing/image-with-rotation.html   |   4 +-
 .../images-repeated-resource.html             |   4 +-
 .../multiple-background-images.html           |   7 +-
 .../observe-background-image.html             |   4 +-
 .../element-timing/observe-elementtiming.html |   4 +-
 .../observe-empty-attribute.html              |  40 ++++
 .../observe-multiple-images.html              |  10 +-
 .../element-timing/observe-svg-image.html     |   4 +-
 .../element-timing/observe-video-poster.html  |   4 +-
 .../progressively-loaded-image.html           |   4 +-
 .../element-timing/rectangular-image.html     |   5 +-
 .../resources/utils.js                        |   3 +-
 .../update-the-rendering.html                 |  32 ++-
 .../selection-not-application.html            |   7 +-
 .../interfaces/payment-handler.idl            |  25 +-
 .../interfaces/wake-lock.idl                  |  24 +-
 .../resources/chromium/nfc-mock.js            |  54 ++---
 .../resources/test-helpers.sub.js             |  13 +-
 .../tools/ci/azure/fyi_hook.yml               |   2 +-
 .../url/resources/setters_tests.json          |   4 +-
 .../wpt/web-platform-tests/wake-lock/META.yml |   4 +-
 .../NDEFErrorEvent_constructor.https.html     |  20 ++
 ...FReader-document-hidden-manual.https.html} |   6 +-
 ...tps.html => NDEFReader_options.https.html} |  48 ++--
 ....https.html => NDEFReader_scan.https.html} |  70 +++---
 ...html => NDEFReader_scan_iframe.https.html} |   8 +-
 ...> NDEFReadingEvent_constructor.https.html} |  26 +-
 ...FWriter-document-hidden-manual.https.html} |   6 +-
 ....https.html => NDEFWriter_push.https.html} | 138 +++++------
 .../NFCErrorEvent_constructor.https.html      |  20 --
 .../wpt/web-platform-tests/web-nfc/README.md  |   2 +-
 .../web-nfc/idlharness.https.window.js        |   8 +-
 .../web-nfc/nfc_insecure_context.html         |   8 +-
 .../web-nfc/resources/nfc-helpers.js          |  18 +-
 .../canvas-resizing-with-pbo-bound.html.ini   |   1 -
 73 files changed, 698 insertions(+), 446 deletions(-)
 create mode 100644 tests/wpt/metadata/css/CSS2/normal-flow/width-051.xht.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
 delete mode 100644 tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
 delete mode 100644 tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
 rename tests/wpt/metadata/webmessaging/{with-ports => without-ports}/018.html.ini (100%)
 create mode 100644 tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
 create mode 100644 tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
 create mode 100644 tests/wpt/web-platform-tests/IndexedDB/structured-clone-transaction-state.any.js
 create mode 100644 tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg
 create mode 100644 tests/wpt/web-platform-tests/element-timing/observe-empty-attribute.html
 create mode 100644 tests/wpt/web-platform-tests/web-nfc/NDEFErrorEvent_constructor.https.html
 rename tests/wpt/web-platform-tests/web-nfc/{NFCReader-document-hidden-manual.https.html => NDEFReader-document-hidden-manual.https.html} (80%)
 rename tests/wpt/web-platform-tests/web-nfc/{NFCReader_options.https.html => NDEFReader_options.https.html} (76%)
 rename tests/wpt/web-platform-tests/web-nfc/{NFCReader_scan.https.html => NDEFReader_scan.https.html} (72%)
 rename tests/wpt/web-platform-tests/web-nfc/{NFCReader_scan_iframe.https.html => NDEFReader_scan_iframe.https.html} (86%)
 rename tests/wpt/web-platform-tests/web-nfc/{NFCReadingEvent_constructor.https.html => NDEFReadingEvent_constructor.https.html} (51%)
 rename tests/wpt/web-platform-tests/web-nfc/{NFCWriter-document-hidden-manual.https.html => NDEFWriter-document-hidden-manual.https.html} (79%)
 rename tests/wpt/web-platform-tests/web-nfc/{NFCWriter_push.https.html => NDEFWriter_push.https.html} (80%)
 delete mode 100644 tests/wpt/web-platform-tests/web-nfc/NFCErrorEvent_constructor.https.html

diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index 76b398963aee..a9e467132440 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: FAIL
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index f1965bb869b9..e643b2e26e18 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -19591,15 +19591,15 @@
      {}
     ]
    ],
-   "web-nfc/NFCReader-document-hidden-manual.https.html": [
+   "web-nfc/NDEFReader-document-hidden-manual.https.html": [
     [
-     "web-nfc/NFCReader-document-hidden-manual.https.html",
+     "web-nfc/NDEFReader-document-hidden-manual.https.html",
      {}
     ]
    ],
-   "web-nfc/NFCWriter-document-hidden-manual.https.html": [
+   "web-nfc/NDEFWriter-document-hidden-manual.https.html": [
     [
-     "web-nfc/NFCWriter-document-hidden-manual.https.html",
+     "web-nfc/NDEFWriter-document-hidden-manual.https.html",
      {}
     ]
    ],
@@ -178073,6 +178073,18 @@
      {}
     ]
    ],
+   "css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg": [
+    [
+     "css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg",
+     [
+      [
+       "/css/reference/blank.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-writing-modes/writing-mode-horizontal-001l.html": [
     [
      "css/css-writing-modes/writing-mode-horizontal-001l.html",
@@ -299230,6 +299242,48 @@
      {}
     ]
    ],
+   "IndexedDB/structured-clone-transaction-state.any.js": [
+    [
+     "IndexedDB/structured-clone-transaction-state.any.html",
+     {
+      "script_metadata": [
+       [
+        "script",
+        "support-promises.js"
+       ],
+       [
+        "title",
+        "Indexed DB transaction state during Structured Serializing"
+       ],
+       [
+        "timeout",
+        "long"
+       ]
+      ],
+      "timeout": "long"
+     }
+    ],
+    [
+     "IndexedDB/structured-clone-transaction-state.any.worker.html",
+     {
+      "script_metadata": [
+       [
+        "script",
+        "support-promises.js"
+       ],
+       [
+        "title",
+        "Indexed DB transaction state during Structured Serializing"
+       ],
+       [
+        "timeout",
+        "long"
+       ]
+      ],
+      "timeout": "long"
+     }
+    ]
+   ],
    "IndexedDB/structured-clone.any.js": [
     [
      "IndexedDB/structured-clone.any.html",
@@ -337332,6 +337386,12 @@
      {}
     ]
    ],
+   "element-timing/observe-empty-attribute.html": [
+    [
+     "element-timing/observe-empty-attribute.html",
+     {}
+    ]
+   ],
    "element-timing/observe-multiple-images.html": [
     [
      "element-timing/observe-multiple-images.html",
@@ -421789,51 +421849,51 @@
      {}
     ]
    ],
-   "web-nfc/NDEFMessage_constructor.https.html": [
+   "web-nfc/NDEFErrorEvent_constructor.https.html": [
     [
-     "web-nfc/NDEFMessage_constructor.https.html",
+     "web-nfc/NDEFErrorEvent_constructor.https.html",
      {}
     ]
    ],
-   "web-nfc/NDEFRecord_constructor.https.html": [
+   "web-nfc/NDEFMessage_constructor.https.html": [
     [
-     "web-nfc/NDEFRecord_constructor.https.html",
+     "web-nfc/NDEFMessage_constructor.https.html",
      {}
     ]
    ],
-   "web-nfc/NFCErrorEvent_constructor.https.html": [
+   "web-nfc/NDEFReader_options.https.html": [
     [
-     "web-nfc/NFCErrorEvent_constructor.https.html",
+     "web-nfc/NDEFReader_options.https.html",
      {}
     ]
    ],
-   "web-nfc/NFCReader_options.https.html": [
+   "web-nfc/NDEFReader_scan.https.html": [
     [
-     "web-nfc/NFCReader_options.https.html",
+     "web-nfc/NDEFReader_scan.https.html",
      {}
     ]
    ],
-   "web-nfc/NFCReader_scan.https.html": [
+   "web-nfc/NDEFReader_scan_iframe.https.html": [
     [
-     "web-nfc/NFCReader_scan.https.html",
+     "web-nfc/NDEFReader_scan_iframe.https.html",
      {}
     ]
    ],
-   "web-nfc/NFCReader_scan_iframe.https.html": [
+   "web-nfc/NDEFReadingEvent_constructor.https.html": [
     [
-     "web-nfc/NFCReader_scan_iframe.https.html",
+     "web-nfc/NDEFReadingEvent_constructor.https.html",
      {}
     ]
    ],
-   "web-nfc/NFCReadingEvent_constructor.https.html": [
+   "web-nfc/NDEFRecord_constructor.https.html": [
     [
-     "web-nfc/NFCReadingEvent_constructor.https.html",
+     "web-nfc/NDEFRecord_constructor.https.html",
      {}
     ]
    ],
-   "web-nfc/NFCWriter_push.https.html": [
+   "web-nfc/NDEFWriter_push.https.html": [
     [
-     "web-nfc/NFCWriter_push.https.html",
+     "web-nfc/NDEFWriter_push.https.html",
      {}
     ]
    ],
@@ -456095,7 +456155,7 @@
  },
  "paths": {
   ".azure-pipelines.yml": [
-   "33f84974005c89a004e7437193642d017e4449bf",
+   "c2f03eadab695ccbe1d01e03064a209422244bf9",
    "support"
   ],
   ".codecov.yml": [
@@ -462322,6 +462382,10 @@
    "cc905e56ecf83ea4cd4f1fe2ccfac425cdc5f9d0",
    "testharness"
   ],
+  "IndexedDB/structured-clone-transaction-state.any.js": [
+   "8c41d3b72bfc4b72565745531b832b4320729af1",
+   "testharness"
+  ],
   "IndexedDB/structured-clone.any.js": [
    "e03ba7aeee47bcd8ae75e2210fc2165581c0a82f",
    "testharness"
@@ -464203,7 +464267,7 @@
    "testharness"
   ],
   "animation-worklet/inactive-timeline.https.html": [
-   "24dc98c2327e45dd263b63139510445e96141ce1",
+   "bdd46f9abc0c8702931965f981b9beab2792380f",
    "testharness"
   ],
   "animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html": [
@@ -614442,6 +614506,10 @@
    "523928f9ad8e40e4f539e81724cb905b1b18159f",
    "testharness"
   ],
+  "css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg": [
+   "a9a7b25ff26854e137c8d6bc5c17160201401cdb",
+   "reftest"
+  ],
   "css/css-writing-modes/writing-mode-horizontal-001l.html": [
    "44ef05db12b560fbefb6ddf5b0511645a62f9ed7",
    "reftest"
@@ -632511,15 +632579,15 @@
    "testharness"
   ],
   "element-timing/background-image-multiple-elements.html": [
-   "084bb9ca0205815a1c7ad7764ce1979485e88435",
+   "44755d49f5c39fe8b5f96b73bcb4b7f3067dd2df",
    "testharness"
   ],
   "element-timing/background-image-stretched.html": [
-   "930b4cef8eb21b6eecbbfdd1eaf0c79ec87db551",
+   "0cd56333f50495f770145291df794877fb401a36",
    "testharness"
   ],
   "element-timing/buffer-before-onload.html": [
-   "68eeeefe15fdc587cdf0d4382f90c33ee3230290",
+   "d675c75ba1a2e46bf964a87cbfe9547af9fb09fb",
    "testharness"
   ],
   "element-timing/buffered-flag.html": [
@@ -632539,7 +632607,7 @@
    "testharness"
   ],
   "element-timing/disconnect-image.html": [
-   "82e7461b0417fb6f667ad266c08789b58f06c457",
+   "fa42397557b9d91d5bf0c4e0cb488b32825d8fc0",
    "testharness"
   ],
   "element-timing/element-only-when-fully-active.html": [
@@ -632563,11 +632631,11 @@
    "testharness"
   ],
   "element-timing/image-carousel.html": [
-   "39d9f0195c6ba17c3e83b41e5d2391203608b15a",
+   "dc5d8e8dde89b6e8e4c8865b4469c5f42e2330e7",
    "testharness"
   ],
   "element-timing/image-clipped-svg.html": [
-   "1e9971c8a8df75274480f2bd11fa2c730dc79adb",
+   "15c78a4cec5e0d78d91d67ed2d501324a1f9bab6",
    "testharness"
   ],
   "element-timing/image-data-uri.html": [
@@ -632579,7 +632647,7 @@
    "testharness"
   ],
   "element-timing/image-not-fully-visible.html": [
-   "105bb55ebc0a3a64343cfb07a27d845e58e66bd8",
+   "ece7770467d1cdedd1ea7a0f19775676df756f42",
    "testharness"
   ],
   "element-timing/image-rect-iframe.html": [
@@ -632591,15 +632659,15 @@
    "testharness"
   ],
   "element-timing/image-with-css-scale.html": [
-   "5c15daabe13dda37ce58a9c056cb2884cf1bb584",
+   "2dbbc0672485cb5e36ccec07f8ce9ccfbac012f0",
    "testharness"
   ],
   "element-timing/image-with-rotation.html": [
-   "c545becd19ba960c241ef6d82c998ea9d9dda87e",
+   "fcffe4acfa587fc1b23b5bc123b25e6595c7e284",
    "testharness"
   ],
   "element-timing/images-repeated-resource.html": [
-   "a6ad7acefcbef2891d50b6993457a2026b12f604",
+   "e3fe9b90db111f7238bf242601eb1e19ced075de",
    "testharness"
   ],
   "element-timing/invisible-images.html": [
@@ -632607,11 +632675,11 @@
    "testharness"
   ],
   "element-timing/multiple-background-images.html": [
-   "626287bf0d44078d4c4cdb0b87baf1efa79260c9",
+   "b29e66c04a70dffbc17f05f516d3d190159ec1c5",
    "testharness"
   ],
   "element-timing/observe-background-image.html": [
-   "c642264a19a89bfa02df83cadd2b5cd2c428d0ce",
+   "afc6b5b38d74ca3da65a48737b1de4a534dfbb25",
    "testharness"
   ],
   "element-timing/observe-child-element.html": [
@@ -632619,11 +632687,15 @@
    "testharness"
   ],
   "element-timing/observe-elementtiming.html": [
-   "0c67130dcc356ee7da9b3e2e10127352af7d169e",
+   "164cc4f580afd46ce8a2c5425db7f72841eba441",
+   "testharness"
+  ],
+  "element-timing/observe-empty-attribute.html": [
+   "c115a24cf6234b764c34a885c380e6ba5a6cca13",
    "testharness"
   ],
   "element-timing/observe-multiple-images.html": [
-   "8a5fa0bb89a31f1bb1d1a277edb1b8102680a4bf",
+   "6b5c5d9e3cb2099774b48c79821335f346606ec8",
    "testharness"
   ],
   "element-timing/observe-shadow-image.html": [
@@ -632635,7 +632707,7 @@
    "testharness"
   ],
   "element-timing/observe-svg-image.html": [
-   "29fec392a993b793fe824e8a6f6c1a9867740f6c",
+   "8a0f61d6699d95cc8c450bd5d384405a53d9956b",
    "testharness"
   ],
   "element-timing/observe-text.html": [
@@ -632643,15 +632715,15 @@
    "testharness"
   ],
   "element-timing/observe-video-poster.html": [
-   "9f82478ea27779d7bb52dd9bc4966d5e5c09f6a3",
+   "a6348377099f29f784ad5f993626960baac7806f",
    "testharness"
   ],
   "element-timing/progressively-loaded-image.html": [
-   "a55c5896f2acdcdcc9f9b416a689b9dbba5aef44",
+   "f156e1a32c4863aecf770c6f18e7bb88e8b694ee",
    "testharness"
   ],
   "element-timing/rectangular-image.html": [
-   "0b44c4fdd9212374fc83d6a8c027673d91fcc3e0",
+   "0c09911c502351d93f58e25b8957cc70f4a521ab",
    "testharness"
   ],
   "element-timing/resources/TAOImage.py": [
@@ -648139,7 +648211,7 @@
    "support"
   ],
   "html/interaction/focus/the-autofocus-attribute/resources/utils.js": [
-   "0eeb5a9f0adf1d09959227241cd71fe32ebb485c",
+   "c4f38fcb209e52328429a5d425fd5b5c8f2aaae4",
    "support"
   ],
   "html/interaction/focus/the-autofocus-attribute/same-origin-autofocus.html": [
@@ -648171,7 +648243,7 @@
    "testharness"
   ],
   "html/interaction/focus/the-autofocus-attribute/update-the-rendering.html": [
-   "afaf0926f5b55e4f1925010c7262ed26a616d3be",
+   "dcee4c16a07d9f5c622e562b7807e5788102fa13",
    "testharness"
   ],
   "html/obsolete/META.yml": [
@@ -653399,7 +653471,7 @@
    "testharness"
   ],
   "html/semantics/forms/textfieldselection/selection-not-application.html": [
-   "04b4fdd4f7872d3416db35e57c5ab176ca2e87e5",
+   "d205ee838a819fc87fa09f616064e77e1ec36571",
    "testharness"
   ],
   "html/semantics/forms/textfieldselection/selection-start-end-extra.html": [
@@ -660799,7 +660871,7 @@
    "support"
   ],
   "interfaces/payment-handler.idl": [
-   "c87c855d439609adee24d2f49fc77879f9c8352b",
+   "aadaecc17346e8651c487b9e94e7cd0bf29bee64",
    "support"
   ],
   "interfaces/payment-method-basic-card.idl": [
@@ -660939,7 +661011,7 @@
    "support"
   ],
   "interfaces/wake-lock.idl": [
-   "5bccbe8f9b7cd6464e60343b64bea477c4069057",
+   "b66c415e6aad71764ca117af0a7fdbfd619d9fd2",
    "support"
   ],
   "interfaces/wasm-js-api.idl": [
@@ -689439,7 +689511,7 @@
    "support"
   ],
   "resources/chromium/nfc-mock.js": [
-   "6ef03b390d8df7df8abd7662e037db6bdf5febce",
+   "d279fcf40d82525ec8e7ee628d267c2168ed7cd7",
    "support"
   ],
   "resources/chromium/sensor.mojom.js": [
@@ -693247,7 +693319,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/test-helpers.sub.js": [
-   "af8dad3a5be8aa831900b183ad7ee9a10417ba1a",
+   "bbd16abce4b3703a2f7499e7c2c4c7590566d33e",
    "support"
   ],
   "service-workers/service-worker/resources/test-request-headers-worker.js": [
@@ -700283,7 +700355,7 @@
    "support"
   ],
   "tools/ci/azure/fyi_hook.yml": [
-   "3d23da3bb7411fde847b3d3de8b95a1c33935eb9",
+   "f02f3cd8224e0b3eb4f478318f0437f5a475f4e5",
    "support"
   ],
   "tools/ci/azure/install_certs.yml": [
@@ -709855,7 +709927,7 @@
    "support"
   ],
   "url/resources/setters_tests.json": [
-   "0b4f6b67387c22879b1f2a03ed4d5d3c1d440d26",
+   "6b7d19b10164a38901abc70345663a550d4ee737",
    "support"
   ],
   "url/resources/toascii.json": [
@@ -711219,7 +711291,7 @@
    "manual"
   ],
   "wake-lock/META.yml": [
-   "7ca3da2d8d2e4c90c55074246589d5464aa7ae3e",
+   "0123ccef85511aaa86770c53716ef9264377b1c1",
    "support"
   ],
   "wake-lock/idlharness.https.any.js": [
@@ -712122,60 +712194,60 @@
    "32c24570db165422a60a18b767c828dab10c5b9c",
    "support"
   ],
+  "web-nfc/NDEFErrorEvent_constructor.https.html": [
+   "243893620c64a7d9fd0e71f506293dc5705716e7",
+   "testharness"
+  ],
   "web-nfc/NDEFMessage_constructor.https.html": [
    "88c9ec4006e60c27a0c33f154a3f7f419f5ee2a3",
    "testharness"
   ],
-  "web-nfc/NDEFRecord_constructor.https.html": [
-   "849a6ae336ea4026888e9835e89db64fd03eb555",
-   "testharness"
+  "web-nfc/NDEFReader-document-hidden-manual.https.html": [
+   "868cf1a968be65cd28c3ba2f5022f686c3c43b26",
+   "manual"
   ],
-  "web-nfc/NFCErrorEvent_constructor.https.html": [
-   "1cc9ce160be46955a9b15485ee4c040605722961",
+  "web-nfc/NDEFReader_options.https.html": [
+   "b9015dc2a57afbd1f511c84f12ae5085be3b18a0",
    "testharness"
   ],
-  "web-nfc/NFCReader-document-hidden-manual.https.html": [
-   "6d9a52c1ecf5bfb2f9ac9876b0ff5988bcc285e0",
-   "manual"
-  ],
-  "web-nfc/NFCReader_options.https.html": [
-   "5761747f907fad40873023f8ba746bef19fb08e7",
+  "web-nfc/NDEFReader_scan.https.html": [
+   "0a3610099486c6d61c4f9171a2d87950e75cd4e5",
    "testharness"
   ],
-  "web-nfc/NFCReader_scan.https.html": [
-   "638d0c5a1d1b8d0e2e8e8422bd4b9e9488512e54",
+  "web-nfc/NDEFReader_scan_iframe.https.html": [
+   "e9720e98ef65555cf39170ae4026329f257a226c",
    "testharness"
   ],
-  "web-nfc/NFCReader_scan_iframe.https.html": [
-   "31e79b0388aa5f407a7c9a1b591f162b3e42001f",
+  "web-nfc/NDEFReadingEvent_constructor.https.html": [
+   "c23a68a2f79e5527f5d2742c4729bce0d6178c19",
    "testharness"
   ],
-  "web-nfc/NFCReadingEvent_constructor.https.html": [
-   "20585176b7f89a129fad99f17d068b2deb828f68",
+  "web-nfc/NDEFRecord_constructor.https.html": [
+   "849a6ae336ea4026888e9835e89db64fd03eb555",
    "testharness"
   ],
-  "web-nfc/NFCWriter-document-hidden-manual.https.html": [
-   "72d8c8143cd934ad3ff0f8e32968851a1769b0c3",
+  "web-nfc/NDEFWriter-document-hidden-manual.https.html": [
+   "2f291e51412f717001339c02db2fbf1bbd7a1ac6",
    "manual"
   ],
-  "web-nfc/NFCWriter_push.https.html": [
-   "6b4034fccc2987c0366ccdfd58dd394a5111709b",
+  "web-nfc/NDEFWriter_push.https.html": [
+   "b909bee3171dcfa56af951f2d4a351487bd9705e",
    "testharness"
   ],
   "web-nfc/README.md": [
-   "dd072174e056ec01c00e98505980768fff24e4c4",
+   "87145b0e3ec0064457dfdcaa6bc6cd2595b88afb",
    "support"
   ],
   "web-nfc/idlharness.https.window.js": [
-   "869433d2ff5a6463f14193e3965c32eb66ab7dd1",
+   "f59ad9b512ed5548b22ff43b84f8404258e9e6c9",
    "testharness"
   ],
   "web-nfc/nfc_insecure_context.html": [
-   "f883f0473b7c7a7b9b622cad5214ca529885b34e",
+   "9a8e58cf802fceb818fa93000cb5a3db75bddc14",
    "testharness"
   ],
   "web-nfc/resources/nfc-helpers.js": [
-   "ed5cc9c9718d01580460535ea14405c2817c0986",
+   "ce4079ae8a699305ad74349b665c34aafba731a5",
    "support"
   ],
   "web-nfc/resources/support-iframe.html": [
diff --git a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 9f60026f6d9b..94a3570d26b9 100644
--- a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -5,9 +5,9 @@
   [[data-expected-height\] 7]
     expected: FAIL
 
-  [[data-expected-height\] 1]
+  [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 2]
+  [[data-expected-height\] 4]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/width-051.xht.ini b/tests/wpt/metadata/css/CSS2/normal-flow/width-051.xht.ini
new file mode 100644
index 000000000000..f3fd8b05a02f
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/width-051.xht.ini
@@ -0,0 +1,2 @@
+[width-051.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/selectors/first-letter-punctuation-067.xht.ini b/tests/wpt/metadata/css/CSS2/selectors/first-letter-punctuation-067.xht.ini
index 6da7f72b4846..44e66f84dc6c 100644
--- a/tests/wpt/metadata/css/CSS2/selectors/first-letter-punctuation-067.xht.ini
+++ b/tests/wpt/metadata/css/CSS2/selectors/first-letter-punctuation-067.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-067.xht]
   type: reftest
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
deleted file mode 100644
index e6e1f29e2743..000000000000
--- a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
index 3d135f3bd664..939a36eb9d98 100644
--- a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
+++ b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
@@ -2,7 +2,6 @@
   type: testharness
 
 [single-byte-decoder.html?document]
-  expected: TIMEOUT
   [ISO-8859-4: iso_8859-4:1988 (document.characterSet and document.inputEncoding)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 25458f2a5c99..2406547c511b 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,18 +315,18 @@
   [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*]
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index c7413d589dc1..d2df9b78483b 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,9 +56,3 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
-    expected: FAIL
-
-  [separate text/javascript;charset=windows-1252  text/javascript]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 536384f36e1c..a639f15230c4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%2Cnosniff]
+  [Content-Type-Options%3A%20nosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
index 62068b05a2f3..a3a600c5846a 100644
--- a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
@@ -1,6 +1,5 @@
 [embedded-credentials.tentative.sub.html]
   type: testharness
-  expected: TIMEOUT
   [Embedded credentials are treated as network errors.]
     expected: FAIL
 
@@ -11,5 +10,5 @@
     expected: FAIL
 
   [Embedded credentials matching the top-level are treated as network errors for cross-origin URLs.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 000000000000..87b07c3e6704
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321e..000000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516deb..000000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 16fa2c5cfc19..000000000000
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini
index 72932af0b918..031d706d27b8 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html.ini
@@ -1,5 +1,7 @@
 [update-the-rendering.html]
-  expected: TIMEOUT
   ["Flush autofocus candidates" should be happen after the first animation frame callbacks, and before a resize event in the next iteration of window event loop.]
     expected: TIMEOUT
 
+  ["Flush autofocus candidates" should be happen before a scroll event and animation frame callbacks]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306c..5f60c78e73cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3f7e3e9544f1..9df1ac56f2ac 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
index dce74c6dd71d..47a7bbb7975f 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -1,5 +1,5 @@
 [form-double-submit.html]
   expected: ERROR
   [default submit action should supersede onclick submit()]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
index 702af61a3c4c..127392316de4 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
@@ -1,11 +1,7 @@
 [form-submission-algorithm.html]
-  expected: TIMEOUT
   [If form's firing submission events is true, then return; 'submit' event]
     expected: FAIL
 
   [If form's firing submission events is true, then return; 'invalid' event]
     expected: FAIL
 
-  [Cannot navigate (after constructing the entry list)]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
deleted file mode 100644
index 9e522297c94d..000000000000
--- a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[toggleEvent.html]
-  [Calling open twice on 'details' fires only one toggle event]
-    expected: FAIL
-
-  [Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
deleted file mode 100644
index a9677391662b..000000000000
--- a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DOMContentLoaded-defer.html]
-  [The end: DOMContentLoaded and defer scripts]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/url/url-setters.html.ini b/tests/wpt/metadata/url/url-setters.html.ini
index 2a8973c4905e..970009f11f29 100644
--- a/tests/wpt/metadata/url/url-setters.html.ini
+++ b/tests/wpt/metadata/url/url-setters.html.ini
@@ -1041,3 +1041,12 @@
   [<area>: Setting <data:text/plain,Stuff>.hostname = 'example.net' Cannot-be-a-base means no host]
     expected: FAIL
 
+  [<area>: Setting <ssh://me@example.net>.protocol = 'https']
+    expected: FAIL
+
+  [<a>: Setting <ssh://me@example.net>.protocol = 'https']
+    expected: FAIL
+
+  [URL: Setting <ssh://me@example.net>.protocol = 'https']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
similarity index 100%
rename from tests/wpt/metadata/webmessaging/with-ports/018.html.ini
rename to tests/wpt/metadata/webmessaging/without-ports/018.html.ini
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 000000000000..80f9a4f15b8a
--- /dev/null
+++ b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
new file mode 100644
index 000000000000..dbea4f293ad0
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
@@ -0,0 +1,2 @@
+[transition_calc_implicit.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/web-platform-tests/.azure-pipelines.yml
index 33f84974005c..c2f03eadab69 100644
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@@ -60,7 +60,7 @@ jobs:
   displayName: './wpt test-jobs'
   condition: eq(variables['Build.Reason'], 'PullRequest')
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-18.04'
   steps:
   - template: tools/ci/azure/checkout.yml
   - script: |
diff --git a/tests/wpt/web-platform-tests/IndexedDB/structured-clone-transaction-state.any.js b/tests/wpt/web-platform-tests/IndexedDB/structured-clone-transaction-state.any.js
new file mode 100644
index 000000000000..8c41d3b72bfc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/IndexedDB/structured-clone-transaction-state.any.js
@@ -0,0 +1,96 @@
+// META: script=support-promises.js
+// META: title=Indexed DB transaction state during Structured Serializing
+// META: timeout=long
+'use strict';
+
+promise_test(async testCase => {
+  const db = await createDatabase(testCase, database => {
+    database.createObjectStore('store');
+  });
+
+  const transaction = db.transaction(['store'], 'readwrite');
+  const objectStore = transaction.objectStore('store');
+
+  let getterCalled = false;
+  const activeValue = {};
+  Object.defineProperty(activeValue, 'propertyName', {
+    enumerable: true,
+    get: testCase.step_func(() => {
+      getterCalled = true;
+      assert_throws('TransactionInactiveError', () => {
+        objectStore.get('key');
+      }, 'transaction should not be active during structured clone');
+      return 'value that should not be used';
+    }),
+  });
+  objectStore.add(activeValue, 'key');
+  await promiseForTransaction(testCase, transaction);
+  db.close();
+
+  assert_true(getterCalled,
+              "activeValue's getter should be called during test");
+}, 'Transaction inactive during structured clone in IDBObjectStore.add()');
+
+promise_test(async testCase => {
+  const db = await createDatabase(testCase, database => {
+    database.createObjectStore('store');
+  });
+
+  const transaction = db.transaction(['store'], 'readwrite');
+  const objectStore = transaction.objectStore('store');
+
+  let getterCalled = false;
+  const activeValue = {};
+  Object.defineProperty(activeValue, 'propertyName', {
+    enumerable: true,
+    get: testCase.step_func(() => {
+      getterCalled = true;
+      assert_throws('TransactionInactiveError', () => {
+        objectStore.get('key');
+      }, 'transaction should not be active during structured clone');
+      return 'value that should not be used';
+    }),
+  });
+
+  objectStore.put(activeValue, 'key');
+  await promiseForTransaction(testCase, transaction);
+  db.close();
+
+  assert_true(getterCalled,
+              "activeValue's getter should be called during test");
+}, 'Transaction inactive during structured clone in IDBObjectStore.put()');
+
+promise_test(async testCase => {
+  const db = await createDatabase(testCase, database => {
+    const objectStore = database.createObjectStore('store');
+    objectStore.put({}, 'key');
+  });
+
+  const transaction = db.transaction(['store'], 'readwrite');
+  const objectStore = transaction.objectStore('store');
+
+  let getterCalled = false;
+  const activeValue = {};
+  Object.defineProperty(activeValue, 'propertyName', {
+    enumerable: true,
+    get: testCase.step_func(() => {
+      getterCalled = true;
+      assert_throws('TransactionInactiveError', () => {
+        objectStore.get('key');
+      }, 'transaction should not be active during structured clone');
+      return 'value that should not be used';
+    }),
+  });
+
+  const request = objectStore.openCursor();
+  request.onsuccess = testCase.step_func(() => {
+    const cursor = request.result;
+    cursor.update(activeValue);
+  });
+
+  await promiseForTransaction(testCase, transaction);
+  db.close();
+
+  assert_true(getterCalled,
+              "activeValue's getter should be called during test");
+}, 'Transaction inactive during structured clone in IDBCursor.update()');
diff --git a/tests/wpt/web-platform-tests/animation-worklet/inactive-timeline.https.html b/tests/wpt/web-platform-tests/animation-worklet/inactive-timeline.https.html
index 24dc98c2327e..bdd46f9abc0c 100644
--- a/tests/wpt/web-platform-tests/animation-worklet/inactive-timeline.https.html
+++ b/tests/wpt/web-platform-tests/animation-worklet/inactive-timeline.https.html
@@ -49,6 +49,16 @@
     promise_test(async t => {
       const animation = createScrollLinkedWorkletAnimation(t);
       const scroller = animation.timeline.scrollSource;
+      const target = animation.effect.target;
+
+      // There is no direct way to control when local times of composited
+      // animations are synced to the main thread. This test uses another
+      // composited worklet animation with an always active timeline as an
+      // indicator of when the sync is ready. The sync is done when animation
+      // effect's output has changed as a result of advancing the timeline.
+      const animationRef = createScrollLinkedWorkletAnimation(t);
+      const scrollerRef = animationRef.timeline.scrollSource;
+      const targetRef = animationRef.effect.target;
 
       const maxScroll = scroller.scrollHeight - scroller.clientHeight;
       const timeRange = animation.timeline.timeRange;
@@ -60,6 +70,7 @@
       scroller.scrollTop;
 
       animation.play();
+      animationRef.play();
       assert_equals(animation.currentTime, null,
         'Initial current time must be unresolved in idle state.');
       assert_equals(animation.startTime, null,
@@ -72,6 +83,17 @@
       assert_equals(animation.startTime, null,
         'Initial start time must be unresolved in playing state.');
 
+      scrollerRef.scrollTop = 0.2 * maxScroll;
+
+      // Wait until local times are synced back to the main thread.
+      await waitForAnimationFrameWithCondition(_ => {
+        return animationRef.effect.getComputedTiming().localTime == 200;
+      });
+
+      assert_equals(animation.effect.getComputedTiming().localTime, null,
+        'The underlying effect local time must be undefined while the ' +
+        'timeline is inactive.');
+
       // Make the timeline active.
       scroller.style.display = ""
       scroller.scrollTop;
@@ -81,6 +103,15 @@
       assert_times_equal(animation.startTime, 0,
         'Start time must be initialized.');
 
+      scrollerRef.scrollTop = 0.4 * maxScroll;
+      // Wait until local times are synced back to the main thread.
+      await waitForAnimationFrameWithCondition(_ => {
+        return animationRef.effect.getComputedTiming().localTime == 400;
+      });
+      assert_times_equal(animation.effect.getComputedTiming().localTime, 200,
+        'When the timeline becomes newly active, the underlying effect\'s ' +
+        'timing should be properly updated.');
+
       // Make the timeline inactive again.
       scroller.style.display = "none"
       scroller.scrollTop;
@@ -90,6 +121,16 @@
       assert_equals(animation.startTime, null,
         'Initial start time must be unresolved.');
 
+      scrollerRef.scrollTop = 0.6 * maxScroll;
+      scrollerRef.scrollTop;
+      // Wait until local times are synced back to the main thread.
+      await waitForAnimationFrameWithCondition(_ => {
+        return animationRef.effect.getComputedTiming().localTime == 600;
+      });
+
+      assert_times_equal(animation.effect.getComputedTiming().localTime, 200,
+        'When the timeline becomes newly inactive, the underlying effect\'s ' +
+        'timing should stay unchanged.');
     }, 'When timeline time becomes inactive previous current time must be ' +
        'the current time and start time unresolved');
     done();
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg b/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg
new file mode 100644
index 000000000000..a9a7b25ff268
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/wm-propagation-svg-root-scrollbar.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml" width="2000px" height="100px" style="direction: rtl;">
+  <g id="testmeta">
+    <title>CSS-Writing Modes Test: Principal Writing Mode</title>
+    <html:link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com"/>
+    <html:link rel="author" title="Mozilla" href="https://mozilla.org/"/>
+    <html:link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/#principal-flow"/>
+    <html:link rel="mismatch" href="../reference/blank.html"/>
+    <decs class="assert">This test verifies setting "direction:rtl" on the svg root
+    with a large width can generate a horizontal scroll bar.</decs>
+  </g>
+</svg>
diff --git a/tests/wpt/web-platform-tests/element-timing/background-image-multiple-elements.html b/tests/wpt/web-platform-tests/element-timing/background-image-multiple-elements.html
index 084bb9ca0205..44755d49f5c3 100644
--- a/tests/wpt/web-platform-tests/element-timing/background-image-multiple-elements.html
+++ b/tests/wpt/web-platform-tests/element-timing/background-image-multiple-elements.html
@@ -31,9 +31,7 @@
     let observedDiv1 = false;
     let observedDiv2Img = false;
     let observedDiv2Txt = false;
-    const index = window.location.href.lastIndexOf('/');
-    const pathname = window.location.href.substring(0, index) +
-        '/resources/square100.png';
+    const pathname = window.location.origin + '/element-timing/resources/square100.png';
     const observer = new PerformanceObserver(
       t.step_func(function(entryList) {
         entryList.getEntries().forEach(entry => {
diff --git a/tests/wpt/web-platform-tests/element-timing/background-image-stretched.html b/tests/wpt/web-platform-tests/element-timing/background-image-stretched.html
index 930b4cef8eb2..0cd56333f504 100644
--- a/tests/wpt/web-platform-tests/element-timing/background-image-stretched.html
+++ b/tests/wpt/web-platform-tests/element-timing/background-image-stretched.html
@@ -25,9 +25,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        const index = window.location.href.lastIndexOf('/');
-        const pathname = window.location.href.substring(0, index) +
-            '/resources/square100.png';
+        const pathname = window.location.origin + '/element-timing/resources/square100.png';
         checkElement(entry, pathname, 'my_div', 'target', beforeRender,
             document.getElementById('target'));
         // The background image extends to occupy to full size of the div.
diff --git a/tests/wpt/web-platform-tests/element-timing/buffer-before-onload.html b/tests/wpt/web-platform-tests/element-timing/buffer-before-onload.html
index 68eeeefe15fd..d675c75ba1a2 100644
--- a/tests/wpt/web-platform-tests/element-timing/buffer-before-onload.html
+++ b/tests/wpt/web-platform-tests/element-timing/buffer-before-onload.html
@@ -25,19 +25,17 @@
 
     // this PerformanceObserver should be notified about the previously
     // buffered element entry
-    new PerformanceObserver(function (entryList, observer) {
+    new PerformanceObserver(t.step_func((entryList, observer) => {
       assert_equals(entryList.getEntries().length, 1);
-      entryList.getEntries().forEach(function(entry) {
+      entryList.getEntries().forEach(entry => {
         assert_equals(entry.entryType, "element");
-        const index = window.location.href.lastIndexOf('/');
-        const pathname = window.location.href.substring(0, index) +
-            '/resources/square20.jpg';
+        const pathname = window.location.origin + '/element-timing/resources/square20.jpg';
         checkElement(entry, pathname, 'my_image', 'my_id', beforeRender, img);
         checkNaturalSize(entry, 20, 20);
         observer.disconnect();
         t.done();
       });
-    }).observe({
+    })).observe({
       type: "element",
       buffered: true
     });
diff --git a/tests/wpt/web-platform-tests/element-timing/disconnect-image.html b/tests/wpt/web-platform-tests/element-timing/disconnect-image.html
index 82e7461b0417..fa42397557b9 100644
--- a/tests/wpt/web-platform-tests/element-timing/disconnect-image.html
+++ b/tests/wpt/web-platform-tests/element-timing/disconnect-image.html
@@ -16,9 +16,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        const index = window.location.href.lastIndexOf('/');
-        const pathname = window.location.href.substring(0, index) +
-            '/resources/square100.png';
+        const pathname = window.location.origin + '/element-timing/resources/square100.png';
         // This method will check that entry.element is |img|.
         checkElement(entry, pathname, 'my_image', 'my_id', beforeRender, img);
 
diff --git a/tests/wpt/web-platform-tests/element-timing/image-carousel.html b/tests/wpt/web-platform-tests/element-timing/image-carousel.html
index 39d9f0195c6b..dc5d8e8dde89 100644
--- a/tests/wpt/web-platform-tests/element-timing/image-carousel.html
+++ b/tests/wpt/web-platform-tests/element-timing/image-carousel.html
@@ -32,12 +32,9 @@
     const beforeRenderTimes = [];
     let entry_count = 0;
     const entry_count_per_element = [0, 0];
-    const index = window.location.href.lastIndexOf('/');
-    const pathname0 = window.location.href.substring(0, index) +
-        '/resources/circle.svg';
-    const pathname1 = window.location.href.substring(0, index) +
-        '/resources/square100.png';
-    const observer = new PerformanceObserver(list => {
+    const pathname0 = window.location.origin + '/element-timing/resources/circle.svg';
+    const pathname1 = window.location.origin + '/element-timing/resources/square100.png';
+    const observer = new PerformanceObserver(t.step_func(list => {
       list.getEntries().forEach(entry => {
         if (entry_count % 2 == 0) {
           checkElement(entry, pathname0, 'image0', 'image0', beforeRenderTimes[entry_count],
@@ -61,7 +58,7 @@
           t.done();
         }
       })
-    });
+    }));
     observer.observe({entryTypes: ['element']});
     let slideIndex = 0;
     showCarousel();
diff --git a/tests/wpt/web-platform-tests/element-timing/image-clipped-svg.html b/tests/wpt/web-platform-tests/element-timing/image-clipped-svg.html
index 1e9971c8a8df..15c78a4cec5e 100644
--- a/tests/wpt/web-platform-tests/element-timing/image-clipped-svg.html
+++ b/tests/wpt/web-platform-tests/element-timing/image-clipped-svg.html
@@ -14,9 +14,7 @@
     t.step_func_done(function(entryList) {
       assert_equals(entryList.getEntries().length, 1);
       const entry = entryList.getEntries()[0];
-      const index = window.location.href.lastIndexOf('/');
-      const pathname = window.location.href.substring(0, index) +
-          '/resources/circle.svg';
+      const pathname = window.location.origin + '/element-timing/resources/circle.svg';
       checkElement(entry, pathname, 'my_svg', 'SVG', beforeRender,
           document.getElementById('SVG'));
       // Image size is 200x200 but SVG size is 100x100 so it is clipped.
diff --git a/tests/wpt/web-platform-tests/element-timing/image-not-fully-visible.html b/tests/wpt/web-platform-tests/element-timing/image-not-fully-visible.html
index 105bb55ebc0a..ece7770467d1 100644
--- a/tests/wpt/web-platform-tests/element-timing/image-not-fully-visible.html
+++ b/tests/wpt/web-platform-tests/element-timing/image-not-fully-visible.html
@@ -21,9 +21,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        const index = window.location.href.lastIndexOf('/');
-        const pathname = window.location.href.substring(0, index) +
-            '/resources/square20.png';
+        const pathname = window.location.origin + '/element-timing/resources/square20.png';
         checkElement(entry, pathname, 'not_fully_visible', '', beforeRender, img);
         // Image will not be fully visible. It should start from the top left part
         // of the document, excluding the margin, and then overflow.
diff --git a/tests/wpt/web-platform-tests/element-timing/image-with-css-scale.html b/tests/wpt/web-platform-tests/element-timing/image-with-css-scale.html
index 5c15daabe13d..2dbbc0672485 100644
--- a/tests/wpt/web-platform-tests/element-timing/image-with-css-scale.html
+++ b/tests/wpt/web-platform-tests/element-timing/image-with-css-scale.html
@@ -28,9 +28,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        const index = window.location.href.lastIndexOf('/');
-        const pathname = window.location.href.substring(0, index - 14) +
-            'images/black-rectangle.png';
+        const pathname = window.location.origin + '/images/black-rectangle.png';
         checkElement(entry, pathname, 'rectangle', 'rect_id', beforeRender,
             document.getElementById('rect_id'));
         checkRect(entry, [0, 200, 25, 125]);
diff --git a/tests/wpt/web-platform-tests/element-timing/image-with-rotation.html b/tests/wpt/web-platform-tests/element-timing/image-with-rotation.html
index c545becd19ba..fcffe4acfa58 100644
--- a/tests/wpt/web-platform-tests/element-timing/image-with-rotation.html
+++ b/tests/wpt/web-platform-tests/element-timing/image-with-rotation.html
@@ -28,9 +28,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        const index = window.location.href.lastIndexOf('/');
-        const pathname = window.location.href.substring(0, index - 14) +
-            'images/black-rectangle.png';
+        const pathname = window.location.origin + '/images/black-rectangle.png';
         checkElement(entry, pathname, 'rectangle', 'rect_id', beforeRender,
             document.getElementById('rect_id'));
         checkNaturalSize(entry, 100, 50);
diff --git a/tests/wpt/web-platform-tests/element-timing/images-repeated-resource.html b/tests/wpt/web-platform-tests/element-timing/images-repeated-resource.html
index a6ad7acefcbe..e3fe9b90db11 100644
--- a/tests/wpt/web-platform-tests/element-timing/images-repeated-resource.html
+++ b/tests/wpt/web-platform-tests/element-timing/images-repeated-resource.html
@@ -19,9 +19,6 @@
   let renderTime2;
   let img;
   let img2;
-  const index = window.location.href.lastIndexOf('/');
-  const pathname = window.location.href.substring(0, index) +
-      '/resources/square100.png';
   async_test(function (t) {
     if (!window.PerformanceElementTiming) {
       assert_unreached("PerformanceElementTiming is not implemented");
@@ -30,6 +27,7 @@
       t.step_func(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
+        const pathname = window.location.origin + '/element-timing/resources/square100.png';
         // Easier to check the |element| attribute here since element ID is the same for both images.
         checkElement(entry, pathname, entry.identifier, 'image_id', beforeRender, null);
         checkNaturalSize(entry, 100, 100);
diff --git a/tests/wpt/web-platform-tests/element-timing/multiple-background-images.html b/tests/wpt/web-platform-tests/element-timing/multiple-background-images.html
index 626287bf0d44..b29e66c04a70 100644
--- a/tests/wpt/web-platform-tests/element-timing/multiple-background-images.html
+++ b/tests/wpt/web-platform-tests/element-timing/multiple-background-images.html
@@ -24,8 +24,7 @@
     let numObservedElements = 0;
     let observedCircle = false;
     let observedSquare = false;
-    const index = window.location.href.lastIndexOf('/');
-    const pathname = window.location.href.substring(0, index) + '/resources/';
+    const pathPrefix = window.location.origin + '/element-timing/resources/';
     let div = document.getElementById('target');
     const observer = new PerformanceObserver(
       t.step_func(entryList => {
@@ -33,13 +32,13 @@
           numObservedElements++;
           if (entry.url.endsWith('square100.png')) {
             observedSquare = true;
-            checkElement(entry, pathname + 'square100.png', 'multi', 'target', beforeRender, div);
+            checkElement(entry, pathPrefix + 'square100.png', 'multi', 'target', beforeRender, div);
             checkRect(entry, [0, 200, 0, 200]);
             checkNaturalSize(entry, 100, 100);
           }
           else if (entry.url.endsWith('circle.svg')) {
             observedCircle = true;
-            checkElement(entry, pathname + 'circle.svg', 'multi', 'target', beforeRender, div);
+            checkElement(entry, pathPrefix + 'circle.svg', 'multi', 'target', beforeRender, div);
             checkRect(entry, [0, 200, 0, 200]);
             checkNaturalSize(entry, 200, 200);
           }
diff --git a/tests/wpt/web-platform-tests/element-timing/observe-background-image.html b/tests/wpt/web-platform-tests/element-timing/observe-background-image.html
index c642264a19a8..afc6b5b38d74 100644
--- a/tests/wpt/web-platform-tests/element-timing/observe-background-image.html
+++ b/tests/wpt/web-platform-tests/element-timing/observe-background-image.html
@@ -25,9 +25,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        const index = window.location.href.lastIndexOf('/');
-        const pathname = window.location.href.substring(0, index - 14) +
-            'images/black-rectangle.png';
+        const pathname = window.location.origin + '/images/black-rectangle.png';
         checkElement(entry, pathname, 'my_div', 'target', beforeRender,
             document.getElementById('target'));
         checkRect(entry, [0, 100, 0, 50]);
diff --git a/tests/wpt/web-platform-tests/element-timing/observe-elementtiming.html b/tests/wpt/web-platform-tests/element-timing/observe-elementtiming.html
index 0c67130dcc35..164cc4f580af 100644
--- a/tests/wpt/web-platform-tests/element-timing/observe-elementtiming.html
+++ b/tests/wpt/web-platform-tests/element-timing/observe-elementtiming.html
@@ -21,9 +21,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        const index = window.location.href.lastIndexOf('/');
-        const pathname = window.location.href.substring(0, index) +
-            '/resources/square100.png';
+        const pathname = window.location.origin + '/element-timing/resources/square100.png';
         checkElement(entry, pathname, 'my_image', 'my_id', beforeRender, img);
         // Assume viewport has size at least 100, so the element is fully visible.
         checkRect(entry, [0, 100, 0, 100]);
diff --git a/tests/wpt/web-platform-tests/element-timing/observe-empty-attribute.html b/tests/wpt/web-platform-tests/element-timing/observe-empty-attribute.html
new file mode 100644
index 000000000000..c115a24cf623
--- /dev/null
+++ b/tests/wpt/web-platform-tests/element-timing/observe-empty-attribute.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Element Timing: observe with empty elementtiming attribute</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/element-timing-helpers.js"></script>
+<script>
+let beforeRender;
+async_test(function (t) {
+  if (!window.PerformanceElementTiming) {
+    assert_unreached("PerformanceElementTiming is not implemented");
+  }
+  let observedImage = false;
+  let observedText = false;
+  const observer = new PerformanceObserver(
+    t.step_func(function(entryList) {
+      entryList.getEntries().forEach(entry => {
+        if (entry.name === 'image-paint') {
+          assert_false(observedImage, 'Image should only be observed once.');
+          const pathname = window.location.origin + '/element-timing/resources/square20.png';
+          checkElement(entry, pathname, '', 'square', beforeRender,
+              document.getElementById('square'));
+          checkNaturalSize(entry, 20, 20);
+          observedImage = true;
+        } else {
+          assert_false(observedText, 'Text should only be observed once.');
+          checkTextElement(entry, '', 'text', beforeRender, document.getElementById('text'));
+          observedText = true;
+        }
+      });
+      if (observedImage && observedText)
+        t.done();
+    })
+  );
+  observer.observe({type: 'element', buffered: true});
+  beforeRender = performance.now();
+}, "Able to observe image and text with empty elementtiming attribute.");
+</script>
+<img id='square' src='resources/square20.png' elementtiming/>
+<p id='text' elementtiming>Text!</p>
diff --git a/tests/wpt/web-platform-tests/element-timing/observe-multiple-images.html b/tests/wpt/web-platform-tests/element-timing/observe-multiple-images.html
index 8a5fa0bb89a3..6b5c5d9e3cb2 100644
--- a/tests/wpt/web-platform-tests/element-timing/observe-multiple-images.html
+++ b/tests/wpt/web-platform-tests/element-timing/observe-multiple-images.html
@@ -25,7 +25,6 @@
     if (!window.PerformanceElementTiming) {
       assert_unreached("PerformanceElementTiming is not implemented");
     }
-    const index = window.location.href.lastIndexOf('/');
     const observer = new PerformanceObserver(
       t.step_func(function(entryList) {
         entryList.getEntries().forEach( entry => {
@@ -35,8 +34,7 @@
               t.done();
             }
             image1Observed = 1;
-            const pathname1 = window.location.href.substring(0, index) +
-                '/resources/square100.png';
+            const pathname1 = window.location.origin + '/element-timing/resources/square100.png';
             // The images do not contain ID, so expect an empty ID.
             checkElement(entry, pathname1, 'image1', 'img1', beforeRender,
                 document.getElementById('img1'));
@@ -61,8 +59,7 @@
               t.done();
             }
             image2Observed = 1;
-            const pathname2 = window.location.href.substring(0, index) +
-                '/resources/square20.png';
+            const pathname2 = window.location.origin + '/element-timing/resources/square20.png';
             checkElement(entry, pathname2, 'image2', 'img2', beforeRender,
                 document.getElementById('img2'));
             // This image should be below image 1, and should respect the margin.
@@ -75,8 +72,7 @@
               t.done();
             }
             image3Observed = 1;
-            const pathname3 = window.location.href.substring(0, index) +
-                '/resources/circle.svg';
+            const pathname3 = window.location.origin + '/element-timing/resources/circle.svg';
             checkElement(entry, pathname3, 'image3', 'img3', beforeRender,
                 document.getElementById('img3'));
             // This image is just to the right of image2.
diff --git a/tests/wpt/web-platform-tests/element-timing/observe-svg-image.html b/tests/wpt/web-platform-tests/element-timing/observe-svg-image.html
index 29fec392a993..8a0f61d6699d 100644
--- a/tests/wpt/web-platform-tests/element-timing/observe-svg-image.html
+++ b/tests/wpt/web-platform-tests/element-timing/observe-svg-image.html
@@ -14,9 +14,7 @@
     t.step_func_done(function(entryList) {
       assert_equals(entryList.getEntries().length, 1);
       const entry = entryList.getEntries()[0];
-      const index = window.location.href.lastIndexOf('/');
-      const pathname = window.location.href.substring(0, index) +
-          '/resources/circle.svg';
+      const pathname = window.location.origin + '/element-timing/resources/circle.svg';
       checkElement(entry, pathname, 'my_svg', 'svg_id', beforeRender,
           document.getElementById('svg_id'));
       // Assume viewport has size at least 200, so the element is fully visible.
diff --git a/tests/wpt/web-platform-tests/element-timing/observe-video-poster.html b/tests/wpt/web-platform-tests/element-timing/observe-video-poster.html
index 9f82478ea277..a6348377099f 100644
--- a/tests/wpt/web-platform-tests/element-timing/observe-video-poster.html
+++ b/tests/wpt/web-platform-tests/element-timing/observe-video-poster.html
@@ -14,9 +14,7 @@
     t.step_func_done(function(entryList) {
       assert_equals(entryList.getEntries().length, 1);
       const entry = entryList.getEntries()[0];
-      const index = window.location.href.lastIndexOf('/');
-      const pathname = window.location.href.substring(0, index) +
-          '/resources/circle.svg';
+      const pathname = window.location.origin + '/element-timing/resources/circle.svg';
       checkElement(entry, pathname, 'my_poster', 'the_poster', beforeRender,
           document.getElementById('the_poster'));
       // Assume viewport has size at least 200, so the element is fully visible.
diff --git a/tests/wpt/web-platform-tests/element-timing/progressively-loaded-image.html b/tests/wpt/web-platform-tests/element-timing/progressively-loaded-image.html
index a55c5896f2ac..f156e1a32c48 100644
--- a/tests/wpt/web-platform-tests/element-timing/progressively-loaded-image.html
+++ b/tests/wpt/web-platform-tests/element-timing/progressively-loaded-image.html
@@ -23,9 +23,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        const index = window.location.href.lastIndexOf('/');
-        const pathname = window.location.href.substring(0, index) + '/' +
-            img_src;
+        const pathname = window.location.origin + '/element-timing/' + img_src;
         // Since the image is only fully loaded after the sleep, the render timestamp
         // must be greater than |beforeRender| + |sleep|.
         checkElement(entry, pathname, 'my_image', '', beforeRender + sleep, img);
diff --git a/tests/wpt/web-platform-tests/element-timing/rectangular-image.html b/tests/wpt/web-platform-tests/element-timing/rectangular-image.html
index 0b44c4fdd921..0c09911c5023 100644
--- a/tests/wpt/web-platform-tests/element-timing/rectangular-image.html
+++ b/tests/wpt/web-platform-tests/element-timing/rectangular-image.html
@@ -21,10 +21,7 @@
       t.step_func_done(function(entryList) {
         assert_equals(entryList.getEntries().length, 1);
         const entry = entryList.getEntries()[0];
-        const index = window.location.href.lastIndexOf('/');
-        // Subtracting 14 to remove 'element-timing'.
-        const pathname = window.location.href.substring(0, index - 14) +
-            'images/black-rectangle.png';
+        const pathname = window.location.origin + '/images/black-rectangle.png';
         checkElement(entry, pathname, 'my_image', 'rectangle', beforeRender, img);
         // Assume viewport has size at least 100, so the element is fully visible.
         checkRect(entry, [20, 120, 20, 70]);
diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/utils.js b/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/utils.js
index 0eeb5a9f0adf..c4f38fcb209e 100644
--- a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/utils.js
+++ b/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/resources/utils.js
@@ -36,7 +36,6 @@ function timeOut(test, ms) {
 // doesn't work well.
 async function waitUntilStableAutofocusState(w) {
   let targetWindow = w || window;
-  // Awaiting two animation frames is an easy way to determine autofocus state.
-  await waitForAnimationFrame(targetWindow);
+  // Awaiting one animation frame is an easy way to determine autofocus state.
   await waitForAnimationFrame(targetWindow);
 }
diff --git a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html b/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html
index afaf0926f5b5..dcee4c16a07d 100644
--- a/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html
+++ b/tests/wpt/web-platform-tests/html/interaction/focus/the-autofocus-attribute/update-the-rendering.html
@@ -10,32 +10,30 @@
 async_test(t => {
   t.events = [];
 
-  let iframe = document.createElement('iframe');
-  iframe.addEventListener('load', t.step_func(() => {
-    let w = iframe.contentWindow;
-    w.requestAnimationFrame(t.step_func(() => {
-      t.events.push('animationFrame');
-      w.requestAnimationFrame(t.step_func(() => {
-        t.events.push('animationFrame-should-not-be-recorded');
-      }));
-    }));
+  let w = window.open('/common/blank.html', 'name',
+      'width=100,height=100,menubar=no,toolbar=no,location=no');
+  t.add_cleanup(() => { w.close(); });
+  w.addEventListener('load', t.step_func(() => {
+    w.focus();
     let element = w.document.createElement('input');
     element.autofocus = true;
+    element.style.marginTop = '200px'; // Setting focus causes scrolling.
     element.addEventListener('focus', t.step_func(() => {
       t.events.push('autofocus');
-      iframe.style.width = '71px';
     }));
 
-    w.addEventListener('resize', t.step_func_done(() => {
-      t.events.push('resize');
-      assert_array_equals(t.events, ['animationFrame', 'autofocus', 'resize']);
+    w.addEventListener('scroll', t.step_func(() => {
+      t.events.push('scroll');
+    }));
+
+    w.requestAnimationFrame(t.step_func_done(() => {
+      t.events.push('animationFrame');
+      assert_array_equals(t.events, ['autofocus', 'scroll', 'animationFrame'], t.events);
     }));
 
     w.document.body.appendChild(element);
   }));
-  document.body.appendChild(iframe);
-}, '"Flush autofocus candidates" should be happen after the first animation ' +
-    'frame callbacks, and before a resize event in the next iteration of ' +
-    'window event loop.');
+}, '"Flush autofocus candidates" should be happen before a scroll event and ' +
+    'animation frame callbacks');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-not-application.html b/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-not-application.html
index 04b4fdd4f787..d205ee838a81 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-not-application.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/textfieldselection/selection-not-application.html
@@ -14,6 +14,11 @@
     var el = document.createElement("input");
     el.type = type;
 
+    if (el.type != type) {
+      // Type is not supported - don't bother with the following checks.
+      return;
+    }
+
     test(() => {
       assert_equals(el.selectionStart, null);
     }, `selectionStart on an input[type=${type}] returns null`);
@@ -70,7 +75,7 @@
     }, `selectionEnd on an input[type=${type}] returns a value`);
 
     test(() => {
-      assert_equals(el.selectionDirection, "none");
+      assert_in_array(el.selectionDirection, ["forward", "none"]);
     }, `selectionDirection on an input[type=${type}] returns a value`);
 
     test(() => {
diff --git a/tests/wpt/web-platform-tests/interfaces/payment-handler.idl b/tests/wpt/web-platform-tests/interfaces/payment-handler.idl
index c87c855d4396..aadaecc17346 100644
--- a/tests/wpt/web-platform-tests/interfaces/payment-handler.idl
+++ b/tests/wpt/web-platform-tests/interfaces/payment-handler.idl
@@ -11,6 +11,14 @@ partial interface ServiceWorkerRegistration {
 interface PaymentManager {
   [SameObject] readonly attribute PaymentInstruments instruments;
   attribute DOMString userHint;
+  Promise<void> enableDelegations(FrozenArray<PaymentDelegation> delegations);
+};
+
+enum PaymentDelegation {
+  "shippingAddress",
+  "payerName",
+  "payerPhone",
+  "payerEmail"
 };
 
 [SecureContext, Exposed=(Window,Worker)]
@@ -59,11 +67,13 @@ partial interface ServiceWorkerGlobalScope {
   attribute EventHandler onpaymentrequest;
 };
 
-dictionary PaymentMethodChangeResponse {
+dictionary PaymentRequestDetailsUpdate {
   DOMString error;
   PaymentCurrencyAmount total;
   FrozenArray<PaymentDetailsModifier> modifiers;
+  FrozenArray<PaymentShippingOption> shippingOptions;
   object paymentMethodErrors;
+  AddressErrors shippingAddressErrors;
 };
 
 [Exposed=ServiceWorker]
@@ -77,8 +87,12 @@ interface PaymentRequestEvent : ExtendableEvent {
   readonly attribute FrozenArray<PaymentDetailsModifier> modifiers;
   readonly attribute DOMString instrumentKey;
   readonly attribute boolean requestBillingAddress;
+  readonly attribute object? paymentOptions;
+  readonly attribute FrozenArray<PaymentShippingOption>? shippingOptions;
   Promise<WindowClient?> openWindow(USVString url);
-  Promise<PaymentMethodChangeResponse?> changePaymentMethod(DOMString methodName, optional object? methodDetails = null);
+  Promise<PaymentRequestDetailsUpdate?> changePaymentMethod(DOMString methodName, optional object? methodDetails = null);
+  Promise<PaymentRequestDetailsUpdate?> changeShippingAddress(AddressInit shippingAddress);
+  Promise<PaymentRequestDetailsUpdate?> changeShippingOption(DOMString shippingOption);
   void respondWith(Promise<PaymentHandlerResponse> handlerResponsePromise);
 };
 
@@ -90,9 +104,16 @@ dictionary PaymentRequestEventInit : ExtendableEventInit {
   PaymentCurrencyAmount total;
   sequence<PaymentDetailsModifier> modifiers;
   DOMString instrumentKey;
+  PaymentOptions paymentOptions;
+  sequence<PaymentShippingOption> shippingOptions;
 };
 
 dictionary PaymentHandlerResponse {
 DOMString methodName;
 object details;
+DOMString? payerName;
+DOMString? payerEmail;
+DOMString? payerPhone;
+AddressInit shippingAddress;
+DOMString? shippingOption;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/wake-lock.idl b/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
index 5bccbe8f9b7c..b66c415e6aad 100644
--- a/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
+++ b/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
@@ -4,17 +4,29 @@
 // Source: Wake Lock API (https://w3c.github.io/wake-lock/)
 
 dictionary WakeLockPermissionDescriptor : PermissionDescriptor {
-  WakeLockType type;
+  required WakeLockType type;
 };
 
 enum WakeLockType { "screen", "system" };
 
-[SecureContext, Exposed=(DedicatedWorker, Window)]
+[SecureContext]
+partial interface Navigator {
+  [SameObject] readonly attribute WakeLock wakeLock;
+};
+
+[SecureContext]
+partial interface WorkerNavigator {
+  [SameObject] readonly attribute WakeLock wakeLock;
+};
+
+[SecureContext, Exposed=(DedicatedWorker,Window)]
 interface WakeLock {
-  [Exposed=Window] static Promise<PermissionState> requestPermission(WakeLockType type);
-  static Promise<void> request(WakeLockType type, optional WakeLockRequestOptions options = {});
+  Promise<WakeLockSentinel> request(WakeLockType type);
 };
 
-dictionary WakeLockRequestOptions {
-  AbortSignal signal;
+[SecureContext, Exposed=(DedicatedWorker,Window)]
+interface WakeLockSentinel : EventTarget {
+  readonly attribute WakeLockType type;
+  Promise<void> release();
+  attribute EventHandler onrelease;
 };
diff --git a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
index 6ef03b390d8d..d279fcf40d82 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
@@ -1,14 +1,14 @@
 'use strict';
 
-function toMojoNFCPushTarget(target) {
+function toMojoNDEFPushTarget(target) {
   switch (target) {
   case 'peer':
-    return device.mojom.NFCPushTarget.PEER;
+    return device.mojom.NDEFPushTarget.PEER;
   case 'tag':
-    return device.mojom.NFCPushTarget.TAG;
+    return device.mojom.NDEFPushTarget.TAG;
   }
 
-  return device.mojom.NFCPushTarget.ANY;
+  return device.mojom.NDEFPushTarget.ANY;
 }
 
 // Converts between NDEFMessageInit https://w3c.github.io/web-nfc/#dom-ndefmessage
@@ -65,9 +65,9 @@ function compareNDEFRecords(providedRecord, receivedRecord) {
                       new Uint8Array(receivedRecord.data));
 }
 
-// Compares NFCPushOptions structures that were provided to API and
+// Compares NDEFPushOptions structures that were provided to API and
 // received by the mock mojo service.
-function assertNFCPushOptionsEqual(provided, received) {
+function assertNDEFPushOptionsEqual(provided, received) {
   if (provided.ignoreRead !== undefined)
     assert_equals(provided.ignoreRead, !!received.ignoreRead);
   else
@@ -79,14 +79,14 @@ function assertNFCPushOptionsEqual(provided, received) {
     assert_equals(received.timeout, Infinity);
 
   if (provided.target !== undefined)
-    assert_equals(toMojoNFCPushTarget(provided.target), received.target);
+    assert_equals(toMojoNDEFPushTarget(provided.target), received.target);
   else
-    assert_equals(received.target, device.mojom.NFCPushTarget.ANY);
+    assert_equals(received.target, device.mojom.NDEFPushTarget.ANY);
 }
 
-// Compares NFCReaderOptions structures that were provided to API and
+// Compares NDEFReaderOptions structures that were provided to API and
 // received by the mock mojo service.
-function assertNFCReaderOptionsEqual(provided, received) {
+function assertNDEFReaderOptionsEqual(provided, received) {
   if (provided.url !== undefined)
     assert_equals(provided.url, received.url);
   else
@@ -103,7 +103,7 @@ function assertNFCReaderOptionsEqual(provided, received) {
   }
 }
 
-// Checks whether NFCReaderOptions are matched with given message.
+// Checks whether NDEFReaderOptions are matched with given message.
 function matchesWatchOptions(message, options) {
   // Filter by Web NFC id.
   if (!matchesWebNfcId(message.url, options.url)) return false;
@@ -150,9 +150,9 @@ function matchesWebNfcId(id, pattern) {
   return true;
 }
 
-function createNFCError(type) {
+function createNDEFError(type) {
   return { error: type ?
-      new device.mojom.NFCError({ errorType: type }) : null };
+      new device.mojom.NDEFError({ errorType: type }) : null };
 }
 
 var WebNFCTest = (() => {
@@ -201,21 +201,21 @@ var WebNFCTest = (() => {
           // Resolve with TimeoutError, else pend push operation.
           if (this.push_should_timeout_) {
             resolve(
-                createNFCError(device.mojom.NFCErrorType.TIMER_EXPIRED));
+                createNDEFError(device.mojom.NDEFErrorType.TIMER_EXPIRED));
           }
         } else {
-          resolve(createNFCError(null));
+          resolve(createNDEFError(null));
         }
       });
     }
 
     async cancelPush(target) {
-      if (this.push_options_ && ((target === device.mojom.NFCPushTarget.ANY) ||
+      if (this.push_options_ && ((target === device.mojom.NDEFPushTarget.ANY) ||
           (this.push_options_.target === target))) {
         this.cancelPendingPushOperation();
       }
 
-      return createNFCError(null);
+      return createNDEFError(null);
     }
 
     setClient(client) {
@@ -241,33 +241,33 @@ var WebNFCTest = (() => {
         }
       }
 
-      return createNFCError(null);
+      return createNDEFError(null);
     }
 
     async cancelWatch(id) {
       let index = this.watchers_.findIndex(value => value.id === id);
       if (index === -1) {
-        return createNFCError(device.mojom.NFCErrorType.NOT_FOUND);
+        return createNDEFError(device.mojom.NDEFErrorType.NOT_FOUND);
       }
 
       this.watchers_.splice(index, 1);
-      return createNFCError(null);
+      return createNDEFError(null);
     }
 
     async cancelAllWatches() {
       if (this.watchers_.length === 0) {
-        return createNFCError(device.mojom.NFCErrorType.NOT_FOUND);
+        return createNDEFError(device.mojom.NDEFErrorType.NOT_FOUND);
       }
 
       this.watchers_.splice(0, this.watchers_.length);
-      return createNFCError(null);
+      return createNDEFError(null);
     }
 
     getHWError() {
       if (this.hw_status_ === NFCHWStatus.DISABLED)
-        return createNFCError(device.mojom.NFCErrorType.NOT_READABLE);
+        return createNDEFError(device.mojom.NDEFErrorType.NOT_READABLE);
       if (this.hw_status_ === NFCHWStatus.NOT_SUPPORTED)
-        return createNFCError(device.mojom.NFCErrorType.NOT_SUPPORTED);
+        return createNDEFError(device.mojom.NDEFErrorType.NOT_SUPPORTED);
       return null;
     }
 
@@ -306,7 +306,7 @@ var WebNFCTest = (() => {
     cancelPendingPushOperation() {
       if (this.pending_promise_func_) {
         this.pending_promise_func_(
-            createNFCError(device.mojom.NFCErrorType.OPERATION_CANCELLED));
+            createNDEFError(device.mojom.NDEFErrorType.OPERATION_CANCELLED));
       }
 
       this.pushed_message_ = null;
@@ -321,7 +321,7 @@ var WebNFCTest = (() => {
       this.reading_messages_.push(message);
       // Ignore reading if NFC operation is suspended.
       if(this.operations_suspended_) return;
-      // Ignore reading if NFCPushOptions.ignoreRead is true.
+      // Ignore reading if NDEFPushOptions.ignoreRead is true.
       if(this.push_options_ && this.push_options_.ignoreRead)
         return;
       // Triggers onWatch if the new message matches existing watchers.
@@ -359,7 +359,7 @@ var WebNFCTest = (() => {
       }
       // Resumes pending push operation.
       if (this.pending_promise_func_) {
-        this.pending_promise_func_(createNFCError(null));
+        this.pending_promise_func_(createNDEFError(null));
       }
     }
   }
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
index af8dad3a5be8..bbd16abce4b3 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
@@ -1,10 +1,19 @@
 // Adapter for testharness.js-style tests with Service Workers
 
-function service_worker_unregister_and_register(test, url, scope) {
+/**
+ * @param options an object that represents RegistrationOptions except for scope.
+ * @param options.type a WorkerType.
+ * @param options.updateViaCache a ServiceWorkerUpdateViaCache.
+ * @see https://w3c.github.io/ServiceWorker/#dictdef-registrationoptions
+ */
+function service_worker_unregister_and_register(test, url, scope, options) {
   if (!scope || scope.length == 0)
     return Promise.reject(new Error('tests must define a scope'));
 
-  var options = { scope: scope };
+  if (options && options.scope)
+    return Promise.reject(new Error('scope must not be passed in options'));
+
+  options = Object.assign({ scope: scope }, options);
   return service_worker_unregister(test, scope)
     .then(function() {
         return navigator.serviceWorker.register(url, options);
diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/fyi_hook.yml b/tests/wpt/web-platform-tests/tools/ci/azure/fyi_hook.yml
index 3d23da3bb741..f02f3cd8224e 100644
--- a/tests/wpt/web-platform-tests/tools/ci/azure/fyi_hook.yml
+++ b/tests/wpt/web-platform-tests/tools/ci/azure/fyi_hook.yml
@@ -10,7 +10,7 @@ jobs:
   displayName: 'wpt.fyi hook: ${{ parameters.artifactName }}'
   dependsOn: ${{ parameters.dependsOn }}
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-18.04'
   steps:
   - checkout: none
   - script: curl -f -s -S -d "artifact=${{ parameters.artifactName }}" -X POST https://wpt.fyi/api/checks/azure/$(Build.BuildId)
diff --git a/tests/wpt/web-platform-tests/url/resources/setters_tests.json b/tests/wpt/web-platform-tests/url/resources/setters_tests.json
index 0b4f6b67387c..6b7d19b10164 100644
--- a/tests/wpt/web-platform-tests/url/resources/setters_tests.json
+++ b/tests/wpt/web-platform-tests/url/resources/setters_tests.json
@@ -122,7 +122,7 @@
             "href": "gopher://example.net:1234",
             "new_value": "file",
             "expected": {
-                "href": "gopher://example.net:1234/",
+                "href": "gopher://example.net:1234",
                 "protocol": "gopher:"
             }
         },
@@ -212,7 +212,7 @@
         },
         {
             "href": "ssh://me@example.net",
-            "new_value": "gopher",
+            "new_value": "https",
             "expected": {
                 "href": "ssh://me@example.net",
                 "protocol": "ssh:"
diff --git a/tests/wpt/web-platform-tests/wake-lock/META.yml b/tests/wpt/web-platform-tests/wake-lock/META.yml
index 7ca3da2d8d2e..0123ccef8551 100644
--- a/tests/wpt/web-platform-tests/wake-lock/META.yml
+++ b/tests/wpt/web-platform-tests/wake-lock/META.yml
@@ -1,4 +1,6 @@
 spec: https://w3c.github.io/wake-lock/
 suggested_reviewers:
-  - marcoscaceres
   - Honry
+  - marcoscaceres
+  - rakuco
+  - reillyeon
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFErrorEvent_constructor.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFErrorEvent_constructor.https.html
new file mode 100644
index 000000000000..243893620c64
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFErrorEvent_constructor.https.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>NDEFErrorEvent constructor</title>
+<link rel="help" href="https://w3c.github.io/web-nfc/#dom-ndeferrorevent">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(() => {
+    assert_equals(NDEFErrorEvent.length, 2);
+    assert_throws(new TypeError, () => new NDEFErrorEvent('error'));
+  }, 'NDEFErrorEvent constructor without init dict');
+
+  test(() => {
+    assert_throws(new TypeError, () => new NDEFErrorEvent('error', { error : null }));
+  }, 'NDEFErrorEvent constructor with a null that is not of type DOMException');
+
+  test(() => {
+    const event = new NDEFErrorEvent('error', { error : new DOMException() });
+    assert_true(event.error instanceof DOMException);
+  }, 'NDEFErrorEvent constructor with a valid DOMException');
+</script>
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCReader-document-hidden-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFReader-document-hidden-manual.https.html
similarity index 80%
rename from tests/wpt/web-platform-tests/web-nfc/NFCReader-document-hidden-manual.https.html
rename to tests/wpt/web-platform-tests/web-nfc/NDEFReader-document-hidden-manual.https.html
index 6d9a52c1ecf5..868cf1a968be 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NFCReader-document-hidden-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFReader-document-hidden-manual.https.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <meta name="timeout" content="long">
-<title>NFCReader.onreading respect page visibility changes</title>
+<title>NDEFReader.onreading respect page visibility changes</title>
 <link rel="help" href="https://w3c.github.io/web-nfc/#visible-document">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
 
 promise_test(async t => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   reader.scan();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
 
@@ -18,7 +18,7 @@
       resolve();
     });
   });
-}, "Test NFCReader.onreading is not fired when document is hidden");
+}, "Test NDEFReader.onreading is not fired when document is hidden");
 
 </script>
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCReader_options.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_options.https.html
similarity index 76%
rename from tests/wpt/web-platform-tests/web-nfc/NFCReader_options.https.html
rename to tests/wpt/web-platform-tests/web-nfc/NDEFReader_options.https.html
index 5761747f907f..b9015dc2a57a 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NFCReader_options.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_options.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
-<title>Web NFC: NFCReader option tests</title>
+<title>Web NFC: NDEFReader option tests</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
 <script src="/resources/testharness.js"></script>
@@ -10,45 +10,45 @@
 
 'use strict';
 
-const NFCReaderOptionTests =
+const NDEFReaderOptionTests =
   [
     {
-      desc: "Test that reading data succeed when NFCScanOptions'" +
+      desc: "Test that reading data succeed when NDEFScanOptions'" +
             " recordType is set to 'empty'.",
       scanOptions: {recordType: "empty"},
       unmatchedScanOptions: {recordType: "json"},
       message: createMessage([createRecord('empty', '')])
     },
     {
-      desc: "Test that reading data succeed when NFCScanOptions'" +
+      desc: "Test that reading data succeed when NDEFScanOptions'" +
             " recordType is set to 'json'.",
       scanOptions: {recordType: "json"},
       unmatchedScanOptions: {recordType: "url"},
       message: createMessage([createJsonRecord(test_json_data)])
     },
     {
-      desc: "Test that reading data succeed when NFCScanOptions'" +
+      desc: "Test that reading data succeed when NDEFScanOptions'" +
             " recordType is set to 'opaque'.",
       scanOptions: {recordType: "opaque"},
       unmatchedScanOptions: {recordType: "json"},
       message: createMessage([createOpaqueRecord(test_buffer_data)])
     },
     {
-      desc: "Test that reading data succeed when NFCScanOptions'" +
+      desc: "Test that reading data succeed when NDEFScanOptions'" +
             " recordType is set to 'text'.",
       scanOptions: {recordType: "text"},
       unmatchedScanOptions: {recordType: "json"},
       message: createMessage([createTextRecord(test_text_data)])
     },
     {
-      desc: "Test that reading data succeed when NFCScanOptions'" +
+      desc: "Test that reading data succeed when NDEFScanOptions'" +
             " recordType is set to 'url'.",
       scanOptions: {recordType: "url"},
       unmatchedScanOptions: {recordType: "json"},
       message: createMessage([createUrlRecord(test_url_data)])
     },
     {
-      desc: "Test that reading data succeed when NFCScanOptions'" +
+      desc: "Test that reading data succeed when NDEFScanOptions'" +
             " recordType is set to a custom type for external type records.",
       scanOptions: {recordType: "w3.org:xyz"},
       unmatchedScanOptions: {recordType: "opaque"},
@@ -56,7 +56,7 @@
             test_buffer_data)])
     },
     {
-      desc: "Test that the url of NFCScanOptions filters relevant data" +
+      desc: "Test that the url of NDEFScanOptions filters relevant data" +
             " sources correctly.",
       scanOptions: {url: `${location.origin}/custom/path`},
       unmatchedScanOptions: {url: `${location.origin}/custom/invalid`},
@@ -64,7 +64,7 @@
           records: [createTextRecord(test_text_data)]}
     },
     {
-      desc: "Test that the mediaType of NFCScanOptions filters relevant data" +
+      desc: "Test that the mediaType of NDEFScanOptions filters relevant data" +
             " sources correctly.",
       scanOptions: {mediaType: "application/octet-stream"},
       unmatchedScanOptions: {mediaType: "application/json"},
@@ -76,42 +76,42 @@
   [
     {
       desc: "Test that filtering 'empty' record from different messages" +
-            " correctly with NFCScanOptions' recordType is set to 'empty'.",
+            " correctly with NDEFScanOptions' recordType is set to 'empty'.",
       scanOptions: {recordType: "empty"},
       message: createMessage([createRecord('empty', '')]),
       unmatchedMessage: createMessage([createJsonRecord(test_json_data)]),
     },
     {
       desc: "Test that filtering 'json' record from different messages" +
-            " correctly with NFCScanOptions' recordType is set to 'json'.",
+            " correctly with NDEFScanOptions' recordType is set to 'json'.",
       scanOptions: {recordType: "json"},
       message: createMessage([createJsonRecord(test_json_data)]),
       unmatchedMessage: createMessage([createUrlRecord(test_url_data)])
     },
     {
       desc: "Test that filtering 'opaque' record from different messages" +
-            " correctly with NFCScanOptions' recordType is set to 'opaque'.",
+            " correctly with NDEFScanOptions' recordType is set to 'opaque'.",
       scanOptions: {recordType: "opaque"},
       message: createMessage([createOpaqueRecord(test_buffer_data)]),
       unmatchedMessage: createMessage([createJsonRecord(test_json_data)])
     },
     {
       desc: "Test that filtering 'text' record from different messages" +
-            " correctly with NFCScanOptions' recordType is set to 'text'.",
+            " correctly with NDEFScanOptions' recordType is set to 'text'.",
       scanOptions: {recordType: "text"},
       message: createMessage([createTextRecord(test_text_data)]),
       unmatchedMessage: createMessage([createUrlRecord(test_url_data)])
     },
     {
       desc: "Test that filtering 'url' record from different messages" +
-            " correctly with NFCScanOptions' recordType is set to 'url'.",
+            " correctly with NDEFScanOptions' recordType is set to 'url'.",
       scanOptions: {recordType: "url"},
       message: createMessage([createUrlRecord(test_url_data)]),
       unmatchedMessage: createMessage([createTextRecord(test_text_data)])
     },
     {
       desc: "Test that filtering external record from different messages" +
-            " correctly with NFCScanOptions' recordType is set to the custom type.",
+            " correctly with NDEFScanOptions' recordType is set to the custom type.",
       scanOptions: {recordType: "w3.org:xyz"},
       message: createMessage([createRecord('w3.org:xyz', 'application/octet-stream',
             test_buffer_data)]),
@@ -119,7 +119,7 @@
     },
     {
       desc: "Test that filtering 'text' record from different messages" +
-            " correctly with NFCScanOptions' url set.",
+            " correctly with NDEFScanOptions' url set.",
       scanOptions: {url: `${location.origin}/custom/path`},
       message: {url: `${location.origin}/custom/path/update`,
           records: [createTextRecord(test_text_data)]},
@@ -128,19 +128,19 @@
     },
     {
       desc: "Test that filtering 'opaque' record from different messages" +
-            " correctly with NFCScanOptions' mediaType set.",
+            " correctly with NDEFScanOptions' mediaType set.",
       scanOptions: {mediaType: "application/octet-stream"},
       message: createMessage([createOpaqueRecord(test_buffer_data)]),
       unmatchedMessage: createMessage([createJsonRecord(test_json_data)])
     }
   ];
 
-for (let NFCReaderOptionTest of NFCReaderOptionTests) {
-  testNFCScanOptions(
-    NFCReaderOptionTest.message,
-    NFCReaderOptionTest.scanOptions,
-    NFCReaderOptionTest.unmatchedScanOptions,
-    NFCReaderOptionTest.desc
+for (let NDEFReaderOptionTest of NDEFReaderOptionTests) {
+  testNDEFScanOptions(
+    NDEFReaderOptionTest.message,
+    NDEFReaderOptionTest.scanOptions,
+    NDEFReaderOptionTest.unmatchedScanOptions,
+    NDEFReaderOptionTest.desc
   );
 }
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCReader_scan.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan.https.html
similarity index 72%
rename from tests/wpt/web-platform-tests/web-nfc/NFCReader_scan.https.html
rename to tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan.https.html
index 638d0c5a1d1b..0a3610099486 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NFCReader_scan.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
-<title>Web NFC: NFCReader.scan tests</title>
+<title>Web NFC: NDEFReader.scan tests</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
 <script src="/resources/testharness.js"></script>
@@ -21,128 +21,128 @@
 ];
 
 function waitSyntaxErrorPromise(t, scan_options) {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
   const promise = readerWatcher.wait_for("error").then(event => {
     assert_equals(event.error.name, 'SyntaxError');
   });
-  // NFCReader#scan() asynchronously dispatches the syntax error event.
+  // NDEFReader#scan() asynchronously dispatches the syntax error event.
   reader.scan(scan_options);
   return promise;
 }
 
 promise_test(async t => {
   await waitSyntaxErrorPromise(t, {url: "www.a.com"});
-}, "Test that NFCReader.scan fails if NFCScanOptions.url is missing \
+}, "Test that NDEFReader.scan fails if NDEFScanOptions.url is missing \
 components.");
 
 promise_test(async t => {
   await waitSyntaxErrorPromise(t, {url: "invalid"});
-}, "Test that NFCReader.scan fails if NFCScanOptions.url is invalid.");
+}, "Test that NDEFReader.scan fails if NDEFScanOptions.url is invalid.");
 
 promise_test(async t => {
   await waitSyntaxErrorPromise(t, {url: "http://a.com"});
-}, "Test that NFCReader.scan fails if NFCScanOptions.url has wrong \
+}, "Test that NDEFReader.scan fails if NDEFScanOptions.url has wrong \
 protocol.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
   reader.scan();
   mockNFC.setHWStatus(NFCHWStatus.DISABLED);
   const event = await readerWatcher.wait_for("error");
   assert_equals(event.error.name, 'NotReadableError');
-}, "NFCReader.scan should fail if NFC HW is disabled.");
+}, "NDEFReader.scan should fail if NFC HW is disabled.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
   reader.scan();
   mockNFC.setHWStatus(NFCHWStatus.NOT_SUPPORTED);
   const event = await readerWatcher.wait_for("error");
   assert_equals(event.error.name, 'NotSupportedError');
-}, "NFCReader.scan should fail if NFC HW is not supported.");
+}, "NDEFReader.scan should fail if NFC HW is not supported.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
 
   mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   const promise = readerWatcher.wait_for("reading").then(event => {
-    assert_true(event instanceof NFCReadingEvent);
+    assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  // NFCReader#scan() asynchronously dispatches the reading event.
+  // NDEFReader#scan() asynchronously dispatches the reading event.
   reader.scan({signal : controller.signal});
   await promise;
 }, "Test that nfc watch success if NFC HW is enabled.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
 
   mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   const promise = readerWatcher.wait_for("reading").then(event => {
-    assert_true(event instanceof NFCReadingEvent);
+    assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  // NFCReader#scan() asynchronously dispatches the reading event.
+  // NDEFReader#scan() asynchronously dispatches the reading event.
   reader.scan({signal : controller.signal, url: "https://a.com"});
   await promise;
-}, "Test that NFCReader.scan succeeds if NFCScanOptions.url is valid URL.");
+}, "Test that NDEFReader.scan succeeds if NDEFScanOptions.url is valid URL.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
 
   mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   const promise = readerWatcher.wait_for("reading").then(event => {
-    assert_true(event instanceof NFCReadingEvent);
+    assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  // NFCReader#scan() asynchronously dispatches the reading event.
+  // NDEFReader#scan() asynchronously dispatches the reading event.
   reader.scan({signal : controller.signal, url: "https://a.com/*"});
   await promise;
-}, "Test that NFCReader.scan succeeds if NFCScanOptions.url is valid URL \
+}, "Test that NDEFReader.scan succeeds if NDEFScanOptions.url is valid URL \
 with '*' wildcard character in path.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
 
   mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   const promise = readerWatcher.wait_for("reading").then(event => {
-    assert_true(event instanceof NFCReadingEvent);
+    assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  // NFCReader#scan() asynchronously dispatches the reading event.
+  // NDEFReader#scan() asynchronously dispatches the reading event.
   reader.scan({signal : controller.signal, url: "https://a.com/*/bar"});
   await promise;
-}, "Test that NFCReader.scan succeeds if NFCScanOptions.url is valid URL \
+}, "Test that NDEFReader.scan succeeds if NDEFScanOptions.url is valid URL \
 with '*' wildcard character in the beginning of path component followed by \
 subpath.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
 
   mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   const promise = readerWatcher.wait_for("reading").then(event => {
-    assert_true(event instanceof NFCReadingEvent);
+    assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  // NFCReader#scan() asynchronously dispatches the reading event.
+  // NDEFReader#scan() asynchronously dispatches the reading event.
   reader.scan({signal : controller.signal, url: ""});
   await promise;
-}, "Test that NFCReader.scan succeeds if NFCScanOptions.url is empty.");
+}, "Test that NDEFReader.scan succeeds if NDEFScanOptions.url is empty.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
   mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
 
@@ -157,11 +157,11 @@
     t.step_timeout(resolve, 100);
   });
 
-}, "Test that NFCReader.onreading should not be fired if NFCScanOptions.signal \
+}, "Test that NDEFReader.onreading should not be fired if NDEFScanOptions.signal \
 is aborted.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
   const message = createMessage([createTextRecord(test_text_data)]);
@@ -170,7 +170,7 @@
 
   reader.scan({signal: controller.signal});
   const event = await readerWatcher.wait_for("reading");
-  assert_true(event instanceof NFCReadingEvent);
+  assert_true(event instanceof NDEFReadingEvent);
   mockNFC.setReadingMessage(message);
   controller.abort();
 
@@ -184,11 +184,11 @@
 }, "Synchronously signaled abort.");
 
 test(() => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   invalid_signals.forEach(invalid_signal => {
     assert_throws(new TypeError(),
         () => { reader.scan({ signal: invalid_signal }); });
   });
-}, "NFCReader.scan should fail if signal is not an AbortSignal.");
+}, "NDEFReader.scan should fail if signal is not an AbortSignal.");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCReader_scan_iframe.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan_iframe.https.html
similarity index 86%
rename from tests/wpt/web-platform-tests/web-nfc/NFCReader_scan_iframe.https.html
rename to tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan_iframe.https.html
index 31e79b0388aa..e9720e98ef65 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NFCReader_scan_iframe.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan_iframe.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
-<title>NFCWriter.scan with an focused iframe</title>
+<title>NDEFWriter.scan with an focused iframe</title>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -9,12 +9,12 @@
 <script>
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
 
   const promise = readerWatcher.wait_for("reading").then(event => {
-    assert_true(event instanceof NFCReadingEvent);
+    assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
   reader.scan({ signal: controller.signal });
@@ -37,7 +37,7 @@
 
   // Remove iframe from main document.
   iframe.parentNode.removeChild(iframe);
-}, 'Test that NFCWriter.scan is not suspended if iframe gains focus.');
+}, 'Test that NDEFWriter.scan is not suspended if iframe gains focus.');
 
 </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCReadingEvent_constructor.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFReadingEvent_constructor.https.html
similarity index 51%
rename from tests/wpt/web-platform-tests/web-nfc/NFCReadingEvent_constructor.https.html
rename to tests/wpt/web-platform-tests/web-nfc/NDEFReadingEvent_constructor.https.html
index 20585176b7f8..c23a68a2f79e 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NFCReadingEvent_constructor.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFReadingEvent_constructor.https.html
@@ -1,40 +1,40 @@
 <!DOCTYPE html>
-<title>NFCReadingEvent constructor</title>
-<link rel="help" href="https://w3c.github.io/web-nfc/#dom-nfcreadingevent">
+<title>NDEFReadingEvent constructor</title>
+<link rel="help" href="https://w3c.github.io/web-nfc/#dom-ndefreadingevent">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/nfc-helpers.js"></script>
 <script>
 
   test(() => {
-    assert_equals(NFCReadingEvent.length, 2);
-    assert_throws(new TypeError, () => new NFCReadingEvent('message'));
-  }, 'NFCReadingEvent constructor without init dict');
+    assert_equals(NDEFReadingEvent.length, 2);
+    assert_throws(new TypeError, () => new NDEFReadingEvent('message'));
+  }, 'NDEFReadingEvent constructor without init dict');
 
   test(() => {
     const message = createMessage([createJsonRecord(test_json_data)]);
-    const event = new NFCReadingEvent('type', {serialNumber: null, message: message});
+    const event = new NDEFReadingEvent('type', {serialNumber: null, message: message});
     assert_equals(event.serialNumber, '', 'serialNumber');
-  }, 'NFCReadingEvent constructor with null serialNumber');
+  }, 'NDEFReadingEvent constructor with null serialNumber');
 
   test(() => {
     const message = createMessage([createJsonRecord(test_json_data)]);
-    const event = new NFCReadingEvent('type', {message: message});
+    const event = new NDEFReadingEvent('type', {message: message});
     assert_equals(event.serialNumber, '', 'serialNumber');
-  }, 'NFCReadingEvent constructor with serialNumber not present');
+  }, 'NDEFReadingEvent constructor with serialNumber not present');
 
   test(() => {
-    const event = new NFCReadingEvent('type', {serialNumber: '', message: null});
+    const event = new NDEFReadingEvent('type', {serialNumber: '', message: null});
     assert_equals(0, event.message.records.length, 'no records');
     assert_equals(0, event.message.url.length, 'empty url');
-  }, 'NFCReadingEvent constructor with null message');
+  }, 'NDEFReadingEvent constructor with null message');
 
   test(() => {
     const message = createMessage([createJsonRecord(test_json_data)]);
-    const event = new NFCReadingEvent('type', {serialNumber: '', message: message});
+    const event = new NDEFReadingEvent('type', {serialNumber: '', message: message});
     assert_equals(event.type, 'type', 'type');
     assert_equals(event.serialNumber, '', 'serialNumber');
     assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
-  }, 'NFCReadingEvent constructor with valid parameters');
+  }, 'NDEFReadingEvent constructor with valid parameters');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCWriter-document-hidden-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter-document-hidden-manual.https.html
similarity index 79%
rename from tests/wpt/web-platform-tests/web-nfc/NFCWriter-document-hidden-manual.https.html
rename to tests/wpt/web-platform-tests/web-nfc/NDEFWriter-document-hidden-manual.https.html
index 72d8c8143cd9..2f291e51412f 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NFCWriter-document-hidden-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter-document-hidden-manual.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <meta name="timeout" content="long">
-<title>NFCWriter.push respect page visibility changes</title>
+<title>NDEFWriter.push respect page visibility changes</title>
 <link rel="help" href="https://w3c.github.io/web-nfc/#visible-document">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -9,7 +9,7 @@
 <script>
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   const p1 = writer.push(test_text_data);
 
   return await new Promise((resolve, reject) => {
@@ -20,7 +20,7 @@
       reject();
     });
   });
-}, "Test NFCWriter.push operation should be suspend when document is not visible");
+}, "Test NDEFWriter.push operation should be suspend when document is not visible");
 
 </script>
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_push.https.html
similarity index 80%
rename from tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html
rename to tests/wpt/web-platform-tests/web-nfc/NDEFWriter_push.https.html
index 6b4034fccc29..b909bee3171d 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_push.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
-<title>Web NFC: NFCWriter.push Tests</title>
+<title>Web NFC: NDEFWriter.push Tests</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
 <script src="/resources/testharness.js"></script>
@@ -92,7 +92,7 @@
 ];
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   const promises = [];
   invalid_type_messages.forEach(message => {
     promises.push(
@@ -102,7 +102,7 @@
 }, "Test that promise is rejected with TypeError if NDEFMessageSource is invalid.");
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   const promises = [];
   invalid_syntax_messages.forEach(message => {
     promises.push(
@@ -113,7 +113,7 @@
  invalid records.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   const controller = new AbortController();
 
   //Make sure push is pending
@@ -131,31 +131,31 @@
   });
   await rejected;
   assert_true(callback_called, 'timeout should have caused the abort');
-}, "NFCWriter.push should fail if abort push request before push happends.");
+}, "NDEFWriter.push should fail if abort push request before push happends.");
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   const controller = new AbortController();
   assert_false(controller.signal.aborted);
   controller.abort();
   assert_true(controller.signal.aborted);
   await promise_rejects(t, 'AbortError',
       writer.push(test_text_data, { signal: controller.signal }));
-}, "NFCWriter.push should fail if signal's aborted flag is set.");
+}, "NDEFWriter.push should fail if signal's aborted flag is set.");
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   const promises = [];
   invalid_signals.forEach(invalid_signal => {
     promises.push(promise_rejects(t, new TypeError(),
         writer.push(test_text_data, { signal: invalid_signal })));
   });
   await Promise.all(promises);
-}, "NFCWriter.push should fail if signal is not an AbortSignal.");
+}, "NDEFWriter.push should fail if signal is not an AbortSignal.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer1 = new NFCWriter();
-  const writer2 = new NFCWriter();
+  const writer1 = new NDEFWriter();
+  const writer2 = new NDEFWriter();
   const controller = new AbortController();
   mockNFC.setPendingPushCompleted(false);
   const p1 = writer1.push(test_text_data,
@@ -171,47 +171,47 @@
 }, "Synchronously signaled abort.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   mockNFC.setHWStatus(NFCHWStatus.DISABLED);
   await promise_rejects(t, 'NotReadableError', writer.push(test_text_data));
-}, "NFCWriter.push should fail when NFC HW is disabled.");
+}, "NDEFWriter.push should fail when NFC HW is disabled.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   mockNFC.setHWStatus(NFCHWStatus.NOT_SUPPORTED);
   await promise_rejects(t, 'NotSupportedError', writer.push(test_text_data));
-}, "NFCWriter.push should fail when NFC HW is not supported.");
+}, "NDEFWriter.push should fail when NFC HW is not supported.");
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await promise_rejects(
     t, new TypeError(), writer.push(test_text_data, { timeout: "invalid"}));
-}, "NFCWriter.push should fail with TypeError when invalid timeout is \
+}, "NDEFWriter.push should fail with TypeError when invalid timeout is \
 provided.");
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await promise_rejects(
     t, new TypeError(), writer.push(test_text_data, { timeout: -1 }));
-}, "NFCWriter.push should fail with TypeError when invalid negative timeout \
+}, "NDEFWriter.push should fail with TypeError when invalid negative timeout \
 value is provided.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   mockNFC.setPendingPushCompleted(false);
   const p = writer.push(test_text_data, { timeout: 1 });
   mockNFC.setPushShouldTimeout(true);
   await promise_rejects(t, 'TimeoutError', p);
-}, "NFCWriter.push should fail with TimeoutError when timer expires.");
+}, "NDEFWriter.push should fail with TimeoutError when timer expires.");
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await promise_rejects(
     t, 'NotSupportedError', writer.push(new ArrayBuffer(32 * 1024 + 1)));
 }, "Reject promise with NotSupportedError if NFC message size exceeds 32KB.");
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   const message = createMessage([createTextRecord(test_text_data)]);
   message.url = '%00/invalid/ path';
   await promise_rejects(t, 'SyntaxError', writer.push(message));
@@ -219,17 +219,17 @@
 provided URL.");
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   const message = createMessage([createRecord('json','application/json',
       { get x(){ return this; } })]);
   await promise_rejects(t, new TypeError(), writer.push(message));
 }, "Reject promise with exceptions thrown from serializing the 'json' record data.");
 
 promise_test(async t => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await promise_rejects(
     t, new TypeError(), writer.push(test_text_data, {target: "invalid"}));
-}, "NFCWriter.push should fail with TypeError when invalid target value is \
+}, "NDEFWriter.push should fail with TypeError when invalid target value is \
 provided.");
 
 promise_test(async () => {
@@ -249,7 +249,7 @@
                             }
                           };
                           try {
-                            const writer = new NFCWriter();
+                            const writer = new NDEFWriter();
                             writer.push("Test").then(onSuccess, onError);
                           } catch(e) {
                             parent.postMessage("Failure", "*");
@@ -270,12 +270,12 @@
 }, 'Test that WebNFC API is not accessible from iframe context.');
 
 nfc_test(async () => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push(test_text_data, { timeout: 1 });
-}, 'NFCWriter.push should succeed when NFC HW is enabled');
+}, 'NDEFWriter.push should succeed when NFC HW is enabled');
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   let message = createMessage([createTextRecord(test_text_data),
                                createJsonRecord(test_json_data),
                                createJsonRecord(test_number_data),
@@ -285,42 +285,42 @@
                                test_message_origin);
   await writer.push(message);
   assertNDEFMessagesEqual(message, mockNFC.pushedMessage());
-}, "NFCWriter.push NDEFMessage containing text, json, opaque, url and external records \
-with default NFCPushOptions.");
+}, "NDEFWriter.push NDEFMessage containing text, json, opaque, url and external records \
+with default NDEFPushOptions.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push(test_text_data);
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "Test that NFCWriter.push succeeds when message is DOMString.");
+}, "Test that NDEFWriter.push succeeds when message is DOMString.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push(test_buffer_data);
   assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
-}, "Test that NFCWriter.push succeeds when message is ArrayBuffer.");
+}, "Test that NDEFWriter.push succeeds when message is ArrayBuffer.");
 
 nfc_test(async () => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push(createMessage([createRecord('empty')]));
-}, "NFCWriter.push with 'empty' record should succeed.");
+}, "NDEFWriter.push with 'empty' record should succeed.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push(test_text_data);
-  assertNFCPushOptionsEqual(createNFCPushOptions('any', Infinity, true),
+  assertNDEFPushOptionsEqual(createNDEFPushOptions('any', Infinity, true),
                             mockNFC.pushOptions());
-}, "Check that default NFCPushOptions values are correctly set.");
+}, "Check that default NDEFPushOptions values are correctly set.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
-  let nfcPushOptions = createNFCPushOptions('tag', 1, false);
-  await writer.push(test_text_data, nfcPushOptions);
-  assertNFCPushOptionsEqual(nfcPushOptions, mockNFC.pushOptions());
-}, "Check that provided NFCPushOptions values are correctly converted.");
+  const writer = new NDEFWriter();
+  let ndefPushOptions = createNDEFPushOptions('tag', 1, false);
+  await writer.push(test_text_data, ndefPushOptions);
+  assertNDEFPushOptionsEqual(ndefPushOptions, mockNFC.pushOptions());
+}, "Check that provided NDEFPushOptions values are correctly converted.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const message = createMessage([createTextRecord(test_text_data)]);
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
@@ -331,34 +331,34 @@
 
   reader.scan({ signal: controller.signal });
 
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push(test_text_data, { ignoreRead: false });
   mockNFC.setReadingMessage(message);
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
   await promise;
-}, "NFCWriter.push should read data when ignoreRead is false.");
+}, "NDEFWriter.push should read data when ignoreRead is false.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NFCReader();
+  const reader = new NDEFReader();
   const message = createMessage([createTextRecord(test_text_data)]);
-  // Ignore reading if NFCPushOptions.ignoreRead is true
+  // Ignore reading if NDEFPushOptions.ignoreRead is true
   reader.onreading = t.unreached_func("reading event should not be fired.");
   reader.scan();
 
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push(test_text_data, { ignoreRead: true });
   mockNFC.setReadingMessage(message);
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "NFCWriter.push should ignore reading data when ignoreRead is true.");
+}, "NDEFWriter.push should ignore reading data when ignoreRead is true.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer1 = new NFCWriter();
-  const writer2 = new NFCWriter();
+  const writer1 = new NDEFWriter();
+  const writer2 = new NDEFWriter();
 
-  const nfcPushOptions1 = createNFCPushOptions('tag', 1000, false);
-  const nfcPushOptions2 = createNFCPushOptions('tag', Infinity, true);
-  const p1 = writer1.push(test_text_data, nfcPushOptions1);
-  const p2 = writer2.push(test_url_data, nfcPushOptions2);
+  const ndefPushOptions1 = createNDEFPushOptions('tag', 1000, false);
+  const ndefPushOptions2 = createNDEFPushOptions('tag', Infinity, true);
+  const p1 = writer1.push(test_text_data, ndefPushOptions1);
+  const p2 = writer2.push(test_url_data, ndefPushOptions2);
 
   await new Promise((resolve, reject) => {
     // Make first push pending
@@ -371,29 +371,29 @@
     });
     p2.then(() => {
       assertNDEFMessagesEqual(test_url_data, mockNFC.pushedMessage());
-      assertNFCPushOptionsEqual(nfcPushOptions2, mockNFC.pushOptions());
+      assertNDEFPushOptionsEqual(ndefPushOptions2, mockNFC.pushOptions());
       assert_equals(err, "AbortError", "the pending push should be aborted");
       resolve();
     });
   });
-}, "NFCWriter.push should replace all previously configured push operations.");
+}, "NDEFWriter.push should replace all previously configured push operations.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push({ records: [{ data: test_text_data}] });
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
 }, "Test that recordType should be set to 'text' if NDEFRecordInit.record's \
 recordType is undefined and NDEFRecordInit.record's data is DOMString.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push({ records: [{ data: test_buffer_data}] });
   assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
 }, "Test that recordType should be set to 'opaque' if NDEFRecordInit.record's \
 recordType is undefined and NDEFRecordInit.record's data is ArrayBuffer.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push({ records: [{ data: test_json_data }] });
   const message = createMessage([createJsonRecord(test_json_data)]);
   assertNDEFMessagesEqual(message, mockNFC.pushedMessage());
@@ -402,14 +402,14 @@
 ArrayBuffer.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push({ records: [{ recordType: "text", data: test_text_data }] });
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
 }, "Test that mediaType should be set to 'text/plain' if NDEFRecordInit.record's \
 recordType is 'text' and NDEFRecordInit.record's mediaType is undefined.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push({ records: [{ recordType: "opaque", data: test_buffer_data }] });
   assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
 }, "Test that mediaType should be set to 'application/octet-stream' if \
@@ -417,7 +417,7 @@
 mediaType is undefined.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push({ records: [{ recordType: "json", data: test_json_data }] });
   const message = createMessage([createJsonRecord(test_json_data)]);
   assertNDEFMessagesEqual(message, mockNFC.pushedMessage());
@@ -426,7 +426,7 @@
 mediaType is undefined.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push({ records: [{ recordType: "url", data: test_url_data }] });
   const message = createMessage([createUrlRecord(test_url_data)]);
   assertNDEFMessagesEqual(message, mockNFC.pushedMessage());
@@ -434,7 +434,7 @@
 recordType is 'url' and NDEFRecordInit.record's mediaType is undefined.");
 
 nfc_test(async (t, mockNFC) => {
-  const writer = new NFCWriter();
+  const writer = new NDEFWriter();
   await writer.push({ records: [{ recordType: "w3.org:xyz", data: test_buffer_data }] });
   const message = createMessage([createRecord('w3.org:xyz', 'application/octet-stream',
       test_buffer_data)]);
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCErrorEvent_constructor.https.html b/tests/wpt/web-platform-tests/web-nfc/NFCErrorEvent_constructor.https.html
deleted file mode 100644
index 1cc9ce160be4..000000000000
--- a/tests/wpt/web-platform-tests/web-nfc/NFCErrorEvent_constructor.https.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<title>NFCErrorEvent constructor</title>
-<link rel="help" href="https://w3c.github.io/web-nfc/#dom-nfcerrorevent">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-  test(() => {
-    assert_equals(NFCErrorEvent.length, 2);
-    assert_throws(new TypeError, () => new NFCErrorEvent('error'));
-  }, 'NFCErrorEvent constructor without init dict');
-
-  test(() => {
-    assert_throws(new TypeError, () => new NFCErrorEvent('error', { error : null }));
-  }, 'NFCErrorEvent constructor with a null that is not of type DOMException');
-
-  test(() => {
-    const event = new NFCErrorEvent('error', { error : new DOMException() });
-    assert_true(event.error instanceof DOMException);
-  }, 'NFCErrorEvent constructor with a valid DOMException');
-</script>
diff --git a/tests/wpt/web-platform-tests/web-nfc/README.md b/tests/wpt/web-platform-tests/web-nfc/README.md
index dd072174e056..87145b0e3ec0 100644
--- a/tests/wpt/web-platform-tests/web-nfc/README.md
+++ b/tests/wpt/web-platform-tests/web-nfc/README.md
@@ -16,7 +16,7 @@ The `WebNFCTest` interface is defined as:
     setPendingPushCompleted(boolean result); // Sets if the pending push is completed.
     setPushShouldTimeout(boolean result); // Sets flag to trigger the pending push to timeout.
     pushedMessage(); // Gets the pushed `NDEFMessageSource`.
-    pushOptions(); // Gets the pushed `NFCPushOptions`.
+    pushOptions(); // Gets the pushed `NDEFPushOptions`.
   };
 ```
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/idlharness.https.window.js b/tests/wpt/web-platform-tests/web-nfc/idlharness.https.window.js
index 869433d2ff5a..f59ad9b512ed 100644
--- a/tests/wpt/web-platform-tests/web-nfc/idlharness.https.window.js
+++ b/tests/wpt/web-platform-tests/web-nfc/idlharness.https.window.js
@@ -21,12 +21,12 @@ idl_test(
   ['html', 'dom', 'WebIDL'],
   idl_array => {
     idl_array.add_objects({
-      NFCWriter: ['new NFCWriter();'],
-      NFCReader: ['new NFCReader();'],
+      NDEFWriter: ['new NDEFWriter();'],
+      NDEFReader: ['new NDEFReader();'],
       NDEFRecord: [`new NDEFRecord(${JSON.stringify(record)});`],
       NDEFMessage: [`new NDEFMessage(${JSON.stringify(message)});`],
-      NFCReadingEvent: [`new NFCReadingEvent("reading", { message: ${JSON.stringify(message)} })`],
-      NFCErrorEvent: ['new NFCErrorEvent("error", { error: new DOMException() });'],
+      NDEFReadingEvent: [`new NDEFReadingEvent("reading", { message: ${JSON.stringify(message)} })`],
+      NDEFErrorEvent: ['new NDEFErrorEvent("error", { error: new DOMException() });'],
     });
   }
 );
diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc_insecure_context.html b/tests/wpt/web-platform-tests/web-nfc/nfc_insecure_context.html
index f883f0473b7c..9a8e58cf802f 100644
--- a/tests/wpt/web-platform-tests/web-nfc/nfc_insecure_context.html
+++ b/tests/wpt/web-platform-tests/web-nfc/nfc_insecure_context.html
@@ -17,12 +17,12 @@ <h2>Note</h2>
 
 test(t => {
   assert_false(isSecureContext);
-  assert_false('NFCWriter' in window);
-}, 'NFCWriter requires a secure context');
+  assert_false('NDEFWriter' in window);
+}, 'NDEFWriter requires a secure context');
 
 test(t => {
   assert_false(isSecureContext);
-  assert_false('NFCReader' in window);
-}, 'NFCReader requires a secure context');
+  assert_false('NDEFReader' in window);
+}, 'NDEFReader requires a secure context');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
index ed5cc9c9718d..ce4079ae8a69 100644
--- a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
+++ b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
@@ -111,12 +111,12 @@ function createUrlRecord(url) {
   return createRecord('url', 'text/plain', url);
 }
 
-function createNFCPushOptions(target, timeout, ignoreRead) {
+function createNDEFPushOptions(target, timeout, ignoreRead) {
   return {target, timeout, ignoreRead};
 }
 
 // Compares NDEFMessageSource that was provided to the API
-// (e.g. NFCWriter.push), and NDEFMessage that was received by the
+// (e.g. NDEFWriter.push), and NDEFMessage that was received by the
 // mock NFC service.
 function assertNDEFMessagesEqual(providedMessage, receivedMessage) {
   // If simple data type is passed, e.g. String or ArrayBuffer, convert it
@@ -137,7 +137,7 @@ function assertNDEFMessagesEqual(providedMessage, receivedMessage) {
 }
 
 // Used to compare two NDEFMessage, one that is received from
-// NFCWriter.onreading() EventHandler and another that is provided to mock NFC
+// NDEFWriter.onreading() EventHandler and another that is provided to mock NFC
 // service.
 function assertWebNDEFMessagesEqual(message, expectedMessage) {
   if (expectedMessage.url)
@@ -172,10 +172,10 @@ function assertWebNDEFMessagesEqual(message, expectedMessage) {
   }
 }
 
-function testNFCScanOptions(message, scanOptions, unmatchedScanOptions, desc) {
+function testNDEFScanOptions(message, scanOptions, unmatchedScanOptions, desc) {
   nfc_test(async (t, mockNFC) => {
-    const reader1 = new NFCReader();
-    const reader2 = new NFCReader();
+    const reader1 = new NDEFReader();
+    const reader2 = new NDEFReader();
     const controller = new AbortController();
 
     mockNFC.setReadingMessage(message);
@@ -191,7 +191,7 @@ function testNFCScanOptions(message, scanOptions, unmatchedScanOptions, desc) {
       controller.abort();
       assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
     });
-    // NFCReader#scan() asynchronously dispatches the onreading event.
+    // NDEFReader#scan() asynchronously dispatches the onreading event.
     scanOptions.signal = controller.signal;
     reader2.scan(scanOptions);
     await promise;
@@ -201,7 +201,7 @@ function testNFCScanOptions(message, scanOptions, unmatchedScanOptions, desc) {
 function testReadingMultiMessages(
     message, scanOptions, unmatchedMessage, desc) {
   nfc_test(async (t, mockNFC) => {
-    const reader = new NFCReader();
+    const reader = new NDEFReader();
     const controller = new AbortController();
     const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
 
@@ -209,7 +209,7 @@ function testReadingMultiMessages(
       controller.abort();
       assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
     });
-    // NFCReader#scan() asynchronously dispatches the onreading event.
+    // NDEFReader#scan() asynchronously dispatches the onreading event.
     scanOptions.signal = controller.signal;
     reader.scan(scanOptions);
 
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/canvas-resizing-with-pbo-bound.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/canvas-resizing-with-pbo-bound.html.ini
index 436b6e96fe77..0e7c48f14817 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/canvas-resizing-with-pbo-bound.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/canvas-resizing-with-pbo-bound.html.ini
@@ -1,5 +1,4 @@
 [canvas-resizing-with-pbo-bound.html]
-  expected: TIMEOUT
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL