Attachment 347796 Details for Bug 188816 – patch

[patch] patch

patch (text/plain), 628.46 KB, created by youenn fablet on 2018-08-22 08:39:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-08-22 08:39:16 PDT

Size: 628.46 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 924066c7a42..168cfff3cc9 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,55 @@
>+2018-08-21  Youenn Fablet  <youenn@apple.com>
>+
>+        Update WPT XHR tests to 87329a1
>+        https://bugs.webkit.org/show_bug.cgi?id=188816
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update expectations according renamed XMLHttpRequest to xhr folder.
>+
>+        * TestExpectations:
>+        * platform/gtk/TestExpectations:
>+        * platform/gtk/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt: Renamed from LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async-expected.txt.
>+        * platform/gtk/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt: Renamed from LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-expected.txt.
>+        * platform/gtk/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub-expected.txt: Renamed from LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt.
>+        * platform/gtk/imported/w3c/web-platform-tests/xhr/send-redirect-expected.txt: Renamed from LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-expected.txt.
>+        * platform/gtk/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt: Renamed from LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt.
>+        * platform/ios-wk1/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub-expected.txt: Renamed from LayoutTests/platform/ios-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt.
>+        * platform/ios/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive-expected.txt: Renamed from LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive-expected.txt.
>+        * platform/ios/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt: Renamed from LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt.
>+        * platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt: Renamed from LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty-expected.txt.
>+        * platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt: Renamed from LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none-expected.txt.
>+        * platform/ios/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt: Renamed from LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt.
>+        * platform/mac-sierra/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt: Renamed from LayoutTests/platform/mac-sierra/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt.
>+        * platform/mac-wk1/TestExpectations:
>+        * platform/mac-wk1/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-expected.txt: Renamed from LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt.
>+        * platform/mac-wk1/imported/w3c/web-platform-tests/xhr/late-upload-events-expected.txt: Renamed from LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/late-upload-events-expected.txt.
>+        * platform/mac-wk1/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-expected.txt: Renamed from LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors-expected.txt.
>+        * platform/mac-wk1/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub-expected.txt: Renamed from LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub-expected.txt.
>+        * platform/mac-wk1/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub-expected.txt: Renamed from LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub-expected.txt.
>+        * platform/mac-wk2/TestExpectations:
>+        * platform/mac/TestExpectations:
>+        * platform/mac/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive-expected.txt: Renamed from LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive-expected.txt.
>+        * platform/mac/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt: Renamed from LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt.
>+        * platform/mac/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt: Renamed from LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty-expected.txt.
>+        * platform/mac/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt: Renamed from LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none-expected.txt.
>+        * platform/win/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-expected.txt: Renamed from LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt.
>+        * platform/win/imported/w3c/web-platform-tests/xhr/late-upload-events-expected.txt: Renamed from LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/late-upload-events-expected.txt.
>+        * platform/win/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-expected.txt: Renamed from LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors-expected.txt.
>+        * platform/win/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub-expected.txt: Renamed from LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub-expected.txt.
>+        * platform/wpe/TestExpectations:
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt.
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/access-control-basic-get-fail-non-simple-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt.
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt.
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async-expected.txt.
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-expected.txt.
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/send-redirect-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-expected.txt.
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-expected.txt.
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-sync-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync-expected.txt.
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt.
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-expected.txt.
>+        * platform/wpe/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-sync-expected.txt: Renamed from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync-expected.txt.
>+
> 2018-08-20  Justin Fan  <justin_fan@apple.com>
> 
>         Update webkit-webgl-test-harness.js to provide more info on failing and partially passing tests
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index e180442c059..fb005160c1e 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -259,14 +259,22 @@ imported/w3c/web-platform-tests/workers/SharedWorker_blobUrl.html [ Skip ]
> 
> imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.html [ DumpJSConsoleLogInStdErr ]
> imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-redirect.any.worker.html [ DumpJSConsoleLogInStdErr ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects.htm [ DumpJSConsoleLogInStdErr ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers.htm [ DumpJSConsoleLogInStdErr ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple.htm [ DumpJSConsoleLogInStdErr ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type.htm [ DumpJSConsoleLogInStdErr ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-setrequestheader-no-cred.htm [ DumpJSConsoleLogInStdErr ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm [ DumpJSConsoleLogInStdErr ]
>+imported/w3c/web-platform-tests/xhr/access-control-and-redirects.htm [ DumpJSConsoleLogInStdErr ]
>+imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers.htm [ DumpJSConsoleLogInStdErr ]
>+imported/w3c/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm [ DumpJSConsoleLogInStdErr ]
>+imported/w3c/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm [ DumpJSConsoleLogInStdErr ]
>+imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled.htm  [ DumpJSConsoleLogInStdErr ]
>+imported/w3c/web-platform-tests/xhr/send-authentication-cors-setrequestheader-no-cred.htm [ DumpJSConsoleLogInStdErr ]
>+imported/w3c/web-platform-tests/xhr/send-authentication-cors-basic-setrequestheader.htm [ DumpJSConsoleLogInStdErr ]
> imported/w3c/web-platform-tests/cors/request-headers.htm [ DumpJSConsoleLogInStdErr ]
>-
>+imported/w3c/web-platform-tests/xhr/event-error-order.sub.html [ DumpJSConsoleLogInStdErr ]
>+
>+imported/w3c/web-platform-tests/xhr/event-error.sub.html [ Failure ]
>+imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session.htm [ Failure ]
>+imported/w3c/web-platform-tests/xhr/send-authentication-competing-names-passwords.htm [ Failure ]
>+imported/w3c/web-platform-tests/xhr/preserve-ua-header-on-redirect.htm [ Failure ]
>+imported/w3c/web-platform-tests/xhr/setrequestheader-case-insensitive.htm [ Failure ]
>+imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub.htm [ Failure ]
> http/tests/security/cross-origin-cached-images-parallel.html [ DumpJSConsoleLogInStdErr ]
> 
> # textarea.animate is not supported
>@@ -289,19 +297,19 @@ http/tests/inspector/paymentrequest [ Skip ]
> imported/w3c/web-platform-tests/payment-request [ Skip ]
> 
> http/tests/xmlhttprequest/redirect-cross-origin-sync-double.html [ DumpJSConsoleLogInStdErr ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync.htm [ DumpJSConsoleLogInStdErr ]
>-
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub.html [ Skip ]
>-webkit.org/b/179607 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async.htm [ Pass Failure ]
>-webkit.org/b/179607 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-same-origin.htm [ Pass Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-header-denied.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-method-denied.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-not-supported.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-header-denied.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-method-denied.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-not-supported.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional-cors.htm [ Failure ]
>-webkit.org/b/179611 imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document.htm [ Pass Failure ]
>+imported/w3c/web-platform-tests/xhr/send-redirect-bogus-sync.htm [ DumpJSConsoleLogInStdErr ]
>+
>+imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub.html [ Skip ]
>+webkit.org/b/179607 imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.htm [ Pass Failure ]
>+webkit.org/b/179607 imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.htm [ Pass Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-async-header-denied.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-async-method-denied.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-async-not-supported.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/send-conditional-cors.htm [ Failure ]
>+webkit.org/b/179611 imported/w3c/web-platform-tests/xhr/send-entity-body-document.htm [ Pass Failure ]
> webkit.org/b/145566 imported/w3c/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html [ ImageOnlyFailure ]
> webkit.org/b/145566 imported/w3c/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-002.html [ ImageOnlyFailure ]
> webkit.org/b/145566 imported/w3c/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-003.html [ ImageOnlyFailure ]
>@@ -684,11 +692,11 @@ webkit.org/b/187034 imported/w3c/web-platform-tests/webmessaging/without-ports/0
> webkit.org/b/187034 imported/w3c/web-platform-tests/webmessaging/without-ports/021.html [ Skip ]
> 
> # XMLHttpRequest tests requiring DTR/WTR to allow other URLs than localhost to not be blocked and be reachable (www2.localhost)
>-imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus.htm [ Skip ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors.htm [ Skip ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-non-cors.htm [ Skip ]
>+imported/w3c/web-platform-tests/xhr/send-redirect-bogus.htm [ Skip ]
>+imported/w3c/web-platform-tests/xhr/send-redirect-to-cors.htm [ Skip ]
>+imported/w3c/web-platform-tests/xhr/send-redirect-to-non-cors.htm [ Skip ]
> # Failing assertion with dynamic message
>-imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-document-properties.htm [ Failure ]
>+imported/w3c/web-platform-tests/xhr/responsexml-document-properties.htm [ Failure ]
> 
> imported/w3c/web-platform-tests/fetch/api/basic/block-mime-as-script.html [ DumpJSConsoleLogInStdErr ]
> imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.html [ DumpJSConsoleLogInStdErr ]
>@@ -711,7 +719,7 @@ webkit.org/b/178241 imported/w3c/web-platform-tests/fetch/api/basic/integrity.ht
> webkit.org/b/178241 imported/w3c/web-platform-tests/fetch/api/basic/integrity-worker.html [ Pass Failure ]
> 
> imported/w3c/web-platform-tests/fetch/http-cache/partial.html [ Failure Pass ]
>-webkit.org/b/159724 imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload.htm [ Failure Pass ]
>+webkit.org/b/159724 imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm [ Failure Pass ]
> 
> # Flaky tests due to always changing assertion error message
> imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/url-encoded.html [ Failure ]
>@@ -1931,7 +1939,7 @@ webkit.org/b/170699 [ Debug ] imported/w3c/web-platform-tests/html/webappapis/ti
> 
> webkit.org/b/90724 compositing/iframes/iframe-size-from-zero.html [ Failure Pass ]
> 
>-webkit.org/b/171031 imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cl.htm [ Failure ]
>+webkit.org/b/171031 imported/w3c/web-platform-tests/xhr/getallresponseheaders-cl.htm [ Failure ]
> 
> webkit.org/b/172961 fast/mediacapturefromelement/CanvasCaptureMediaStream-2d-events.html [ Pass Timeout ]
> 
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index e25f6fdc649..667750bd3ef 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-21  Youenn Fablet  <youenn@apple.com>
>+
>+        Update WPT XHR tests to 87329a1
>+        https://bugs.webkit.org/show_bug.cgi?id=188816
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Moved tests from XMLHttpRequest to xhr.
>+        Updated xhr tests according upstream WPT.
>+
>+        * resources/import-expectations.json:
>+        * resources/resource-files.json:
>+        * web-platform-tests/XMLHttpRequest: Removed.
>+        * web-platform-tests/xhr: Added.
>+
> 2018-08-20  Rob Buis  <rbuis@igalia.com>
> 
>         Throw an exception if window.open() gets passed a URL that cannot be parsed
>diff --git a/LayoutTests/imported/w3c/resources/import-expectations.json b/LayoutTests/imported/w3c/resources/import-expectations.json
>index b00f8342f48..8e738cd58b8 100644
>--- a/LayoutTests/imported/w3c/resources/import-expectations.json
>+++ b/LayoutTests/imported/w3c/resources/import-expectations.json
>@@ -347,5 +347,6 @@
>     "web-platform-tests/webvtt": "skip", 
>     "web-platform-tests/workers": "import", 
>     "web-platform-tests/worklets": "skip", 
>-    "web-platform-tests/x-frame-options": "skip"
>+    "web-platform-tests/x-frame-options": "skip", 
>+    "web-platform-tests/xhr": "import"
> }
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/resources/resource-files.json b/LayoutTests/imported/w3c/resources/resource-files.json
>index 4cbf4aa7da9..fe8008f4e90 100644
>--- a/LayoutTests/imported/w3c/resources/resource-files.json
>+++ b/LayoutTests/imported/w3c/resources/resource-files.json
>@@ -798,6 +798,7 @@
>         "web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-3.html",
>         "web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-4.html",
>         "web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name_cross_origin-0.html",
>+        "web-platform-tests/html/browsers/browsing-the-web/history-traversal/support/window-name-after-cross-origin-main-frame-navigation-popup.sub.html",
>         "web-platform-tests/html/browsers/browsing-the-web/history-traversal/support/window-name-navigation.sub.html",
>         "web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html",
>         "web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-1.html",
>@@ -837,9 +838,12 @@
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-1.html",
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-2.html",
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward-1.html",
>+        "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt-and-unload-script-uncloseable-1.html",
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-1.html",
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-2.html",
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/002-1.html",
>+        "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-1.html",
>+        "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/004-2.html",
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-001.html",
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-002.html",
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-003.html",
>@@ -860,6 +864,7 @@
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-1.html",
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/manual-001-1.html",
>         "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/manual-001.html",
>+        "web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/pagehide-manual-1.html",
>         "web-platform-tests/html/browsers/history/the-history-interface/009-1.html",
>         "web-platform-tests/html/browsers/history/the-history-interface/009-3.html",
>         "web-platform-tests/html/browsers/history/the-history-interface/009-5.html",
>@@ -1044,6 +1049,7 @@
>         "web-platform-tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-before.html",
>         "web-platform-tests/html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-inside.html",
>         "web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-iframed.sub.html",
>+        "web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/support/sizes-iframed.sub.html",
>         "web-platform-tests/html/semantics/embedded-content/the-object-element/test0.html",
>         "web-platform-tests/html/semantics/embedded-content/the-object-element/test1.html",
>         "web-platform-tests/html/semantics/embedded-content/the-object-element/test2.html",
>@@ -1113,6 +1119,7 @@
>         "web-platform-tests/upgrade-insecure-requests/support/post-origin-to-parent.html",
>         "web-platform-tests/webmessaging/message-channels/004-1.html",
>         "web-platform-tests/webmessaging/message-channels/004-2.html",
>+        "web-platform-tests/webmessaging/support/ChildWindowPostMessage.htm",
>         "web-platform-tests/webmessaging/without-ports/019-1.html",
>         "web-platform-tests/webmessaging/without-ports/020-1.html",
>         "web-platform-tests/workers/data-url-shared-window.html",
>@@ -1130,6 +1137,7 @@
>         "web-platform-tests/workers/support/WorkerLocation-origin.html",
>         "web-platform-tests/workers/support/iframe_sw_dataUrl.html",
>         "web-platform-tests/workers/support/sandboxed-tests.html",
>+        "web-platform-tests/workers/support/sync_xhr_target.xml",
>         "web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts-subframe.html",
>         "web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader-subframe.html"
>     ]
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied-expected.txt
>deleted file mode 100644
>index c4d14134c03..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied-expected.txt
>+++ /dev/null
>@@ -1,6 +0,0 @@
>-CONSOLE MESSAGE: line 26: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>-
>-PASS Same-origin request accepted 
>-PASS Cross-origin request denied 
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type-expected.txt
>deleted file mode 100644
>index bb2408d88c7..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type-expected.txt
>+++ /dev/null
>@@ -1,5 +0,0 @@
>-CONSOLE MESSAGE: line 26: Request header field Content-Type is not allowed by Access-Control-Allow-Headers.
>-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-put-allow.py due to access control checks.
>-
>-PASS Deny cross-origin request with non-CORS-safelisted content type 
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin-expected.txt
>deleted file mode 100644
>index e8dfbb23df6..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin-expected.txt
>+++ /dev/null
>@@ -1,6 +0,0 @@
>-
>-PASS Upload events registered on time (http://127.0.0.1:8800/XMLHttpRequest/resources/corsenabled.py) 
>-PASS Upload events registered on time (resources/redirect.py?code=307&location=http://127.0.0.1:8800/XMLHttpRequest/resources/corsenabled.py) 
>-PASS Upload events registered too late (http://127.0.0.1:8800/XMLHttpRequest/resources/corsenabled.py) 
>-PASS Upload events registered too late (resources/redirect.py?code=307&location=http://127.0.0.1:8800/XMLHttpRequest/resources/corsenabled.py) 
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-expected.txt
>deleted file mode 100644
>index 3e5bd6965d5..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-expected.txt
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-
>-PASS XMLHttpRequest: upload progress event 
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress.htm b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress.htm
>deleted file mode 100644
>index e4b24e7cdd5..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress.htm
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-<!doctype html>
>-<html lang=en>
>-<meta charset=utf-8>
>-<title>XMLHttpRequest: upload progress event</title>
>-<script src="/resources/testharness.js"></script>
>-<script src="/resources/testharnessreport.js"></script>
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onprogress" data-tested-assertations="../.." />
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-upload" data-tested-assertations=".." />
>-
>-<div id="log"></div>
>-<script>
>-  var test = async_test();
>-  test.step(function() {
>-    var client = new XMLHttpRequest();
>-    client.upload.onprogress = test.step_func(function(e) {
>-      assert_true(e instanceof ProgressEvent);
>-      // This short payload will most likely be sent before the first progress evt
>-      assert_equals(e.loaded, 22);
>-      assert_equals(e.total, 22);
>-      test.done();
>-    });
>-    client.onreadystatechange = test.step_func(function() {
>-      if (client.readyState === 4) assert_unreached("onprogress not called.");
>-    });
>-    client.open("POST", "resources/upload.py");
>-    client.send("This is a test string.");
>-  });
>-</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-content-length.html b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-content-length.html
>deleted file mode 100644
>index 6e548525c32..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-content-length.html
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-<!doctype html>
>-<html>
>-  <head>
>-    <title>ProgressEvent: firing events for HTTP with Content-Length</title>
>-    <script src="/resources/testharness.js"></script>
>-    <script src="/resources/testharnessreport.js"></script>
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#firing-events-using-the-progressevent-interface">
>-  </head>
>-  <body>
>-    <div id="log"></div>
>-    <script>
>-      var test = async_test();
>-
>-      test.step(function() {
>-        var xhr = new XMLHttpRequest();
>-
>-        xhr.onprogress = function(pe) {
>-          test.step(function() {
>-            if(pe.type == "progress") {
>-              assert_greater_than_equal(pe.loaded, 0, "loaded");
>-              assert_true(pe.lengthComputable, "lengthComputable");
>-              assert_equals(pe.total, 1300, "total");
>-            }
>-          }, "Check lengthComputed, loaded, total when Content-Length is given.");
>-        }
>-
>-        // "loadstart", "error", "abort", "load" tests are out of scope.
>-        // They SHOULD be tested in each spec that implement ProgressEvent.
>-
>-        xhr.onloadend = function(pe) {
>-          test.done();
>-        }
>-        xhr.open("GET", "resources/trickle.py?ms=0&count=100&specifylength=1", true);
>-        xhr.send(null);
>-      })
>-    </script>
>-  </body>
>-</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-no-content-length.html b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-no-content-length.html
>deleted file mode 100644
>index 2a4614aaa7b..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-no-content-length.html
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-<!doctype html>
>-<html>
>-  <head>
>-    <title>ProgressEvent: firing events for HTTP with no Content-Length</title>
>-    <script src="/resources/testharness.js"></script>
>-    <script src="/resources/testharnessreport.js"></script>
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#firing-events-using-the-progressevent-interface">
>-  </head>
>-  <body>
>-    <div id="log"></div>
>-    <script>
>-      var test = async_test();
>-
>-      test.step(function() {
>-        var xhr = new XMLHttpRequest();
>-
>-        xhr.onprogress = function(pe) {
>-          test.step(function() {
>-            if(pe.type == "progress") {
>-              assert_greater_than_equal(pe.loaded, 0, "loaded");
>-              assert_false(pe.lengthComputable, "lengthComputable");
>-              assert_equals(pe.total, 0, "total");
>-            }
>-          }, "Check lengthComputed, loaded, total when Content-Length is NOT given.");
>-        }
>-
>-        // "loadstart", "error", "abort", "load" tests are out of scope.
>-        // They SHOULD be tested in each spec that implement ProgressEvent.
>-
>-        xhr.onloadend = function(pe) {
>-          test.done();
>-        }
>-        xhr.open("GET", "resources/trickle.py?ms=0&count=100", true);
>-        xhr.send(null);
>-      })
>-    </script>
>-  </body>
>-</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-status.htm b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-status.htm
>deleted file mode 100644
>index ec1aa9a8072..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-status.htm
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-  <head>
>-    <title>XMLHttpRequest: getAllResponseHeaders() excludes status</title>
>-    <script src="/resources/testharness.js"></script>
>-    <script src="/resources/testharnessreport.js"></script>
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getallresponseheaders" data-tested-assertations="/following::OL[1]/LI[1] /following::OL[1]/LI[3]" />
>-  </head>
>-  <body>
>-    <div id="log"></div>
>-    <script>
>-      var test = async_test()
>-      test.step(function() {
>-        var client = new XMLHttpRequest()
>-        var headersUnsent = client.getAllResponseHeaders();
>-         test.step(function() {
>-           assert_equals(headersUnsent, "")
>-         });
>-        client.onreadystatechange = function() {
>-          test.step(function() {
>-            var headers = client.getAllResponseHeaders().toLowerCase()
>-            if(client.readyState == 1) {
>-              assert_equals(headers, "")
>-            }
>-            if(client.readyState > 1) {
>-              assert_false(headers.indexOf("200 ok") != -1)
>-              assert_false(headers.indexOf("http/1.") != -1)
>-            }
>-            if(client.readyState == 4)
>-              test.done()
>-          })
>-        }
>-        client.open("GET", "resources/headers.py")
>-        client.send(null)
>-      })
>-  </script>
>- </body>
>-</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-error-state-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-error-state-expected.txt
>deleted file mode 100644
>index 4df7cec85f9..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-error-state-expected.txt
>+++ /dev/null
>@@ -1,5 +0,0 @@
>-Blocked access to external URL http://www1.localhost:8800/XMLHttpRequest/resources/nocors/folder.txt
>-CONSOLE MESSAGE: line 32: XMLHttpRequest cannot load http://www1.localhost:8800/XMLHttpRequest/resources/nocors/folder.txt due to access control checks.
>-
>-PASS XMLHttpRequest: getResponseHeader() in error state (failing cross-origin test) 
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-encoding-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-encoding-expected.txt
>deleted file mode 100644
>index 34dc364db8a..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-encoding-expected.txt
>+++ /dev/null
>@@ -1,4 +0,0 @@
>-
>-FAIL percent encode characters assert_equals: expected "%C3%9F" but got "%DF"
>-FAIL lone surrogate should return U+FFFD assert_equals: expected "%EF%BF%BD" but got "%26%2355357%3B"
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-redirected-worker-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-redirected-worker-origin-expected.txt
>deleted file mode 100644
>index c9488cd07ac..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-redirected-worker-origin-expected.txt
>+++ /dev/null
>@@ -1,6 +0,0 @@
>-Blocked access to external URL http://www2.localhost:8800/XMLHttpRequest/resources/inspect-headers.py?filter_name=origin&cors
>-
>-FAIL Referer header assert_equals: expected "Referer: http://localhost:8800/XMLHttpRequest/resources/workerxhr-origin-referrer.js\n" but got "Referer: http://localhost:8800/XMLHttpRequest/resources/redirect.py?location=workerxhr-origin-referrer.js\n"
>-FAIL Origin header assert_equals: expected "Origin: http://localhost:8800\n" but got ""
>-PASS Request URL test 
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-blob-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-blob-expected.txt
>deleted file mode 100644
>index 056742eabce..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-blob-expected.txt
>+++ /dev/null
>@@ -1,7 +0,0 @@
>-
>-FAIL Use text/xml as fallback MIME type assert_equals: expected "text/xml" but got ""
>-PASS Use text/xml as fallback MIME type, 2 
>-FAIL Bogus MIME type should end up as application/octet-stream assert_equals: expected "" but got "bogus"
>-FAIL Bogus MIME type should end up as application/octet-stream, 2 assert_equals: expected "" but got "text/xml;charset=â "
>-FAIL Valid MIME types need to be normalized assert_equals: expected "" but got "HI/x;test=test"
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-blob.html b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-blob.html
>deleted file mode 100644
>index 83378a89bd7..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-blob.html
>+++ /dev/null
>@@ -1,65 +0,0 @@
>-<!doctype html>
>-<title>XMLHttpRequest: overrideMimeType() and responseType = "blob"</title>
>-<meta charset="utf-8">
>-<script src="/resources/testharness.js"></script>
>-<script src="/resources/testharnessreport.js"></script>
>-<div id="log"></div>
>-<script>
>-async_test(t => {
>-  const client = new XMLHttpRequest()
>-  client.onload = t.step_func_done(() => {
>-    assert_equals(client.getResponseHeader("Content-Type"), "")
>-    assert_equals(client.response.type, "text/xml")
>-  })
>-  client.open("GET", "resources/status.py")
>-  client.responseType = "blob"
>-  client.send()
>-}, "Use text/xml as fallback MIME type")
>-
>-async_test(t => {
>-  const client = new XMLHttpRequest()
>-  client.onload = t.step_func_done(() => {
>-    assert_equals(client.getResponseHeader("Content-Type"), "")
>-    assert_equals(client.response.type, "text/xml")
>-  })
>-  client.open("GET", "resources/status.py?content=thisshouldnotmakeadifferencebutdoes")
>-  client.responseType = "blob"
>-  client.send()
>-}, "Use text/xml as fallback MIME type, 2")
>-
>-async_test(t => {
>-  const client = new XMLHttpRequest()
>-  client.onload = t.step_func_done(() => {
>-    assert_equals(client.getResponseHeader("Content-Type"), "")
>-    assert_equals(client.response.type, "application/octet-stream")
>-  })
>-  client.open("GET", "resources/status.py")
>-  client.responseType = "blob"
>-  client.overrideMimeType("bogus")
>-  client.send()
>-}, "Bogus MIME type should end up as application/octet-stream")
>-
>-async_test(t => {
>-  const client = new XMLHttpRequest()
>-  client.onload = t.step_func_done(() => {
>-    assert_equals(client.getResponseHeader("Content-Type"), "")
>-    assert_equals(client.response.type, "application/octet-stream")
>-  })
>-  client.open("GET", "resources/status.py")
>-  client.responseType = "blob"
>-  client.overrideMimeType("text/xml;charset=â ")
>-  client.send()
>-}, "Bogus MIME type should end up as application/octet-stream, 2")
>-
>-async_test(t => {
>-  const client = new XMLHttpRequest()
>-  client.onload = t.step_func_done(() => {
>-    assert_equals(client.getResponseHeader("Content-Type"), "")
>-    assert_equals(client.response.type, "hi/x")
>-  })
>-  client.open("GET", "resources/status.py")
>-  client.responseType = "blob"
>-  client.overrideMimeType("HI/x;test=test")
>-  client.send()
>-}, "Valid MIME types need to be normalized")
>-</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/accept.py b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/accept.py
>deleted file mode 100644
>index 2fdf210b6d6..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/accept.py
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-def main(request, response):
>-  return [("Content-Type", "text/plain")], request.headers.get("accept", "NO")
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-allow-with-body.py b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-allow-with-body.py
>deleted file mode 100644
>index 22134356735..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-allow-with-body.py
>+++ /dev/null
>@@ -1,15 +0,0 @@
>-def main(request, response):
>-    headers = {
>-            "Cache-Control": "no-store",
>-            "Access-Control-Allow-Headers": "X-Requested-With",
>-            "Access-Control-Max-Age": 0,
>-            "Access-Control-Allow-Origin": "*",
>-            "Access-Control-Allow-Methods": "*",
>-            "Vary": "Accept-Encoding",
>-            "Content-Type": "text/plain"
>-    }
>-
>-    for (name, value) in headers.items():
>-        response.headers.set(name, value)
>-
>-    response.content = "PASS"
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-whitelist-response-headers.py b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-whitelist-response-headers.py
>deleted file mode 100644
>index e7c15bb8b30..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-whitelist-response-headers.py
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-def main(request, response):
>-    headers = {
>-            # CORS-safelisted
>-            "content-type": "text/plain",
>-            "cache-control": "no cache",
>-            "content-language": "en",
>-            "expires": "Fri, 30 Oct 1998 14:19:41 GMT",
>-            "last-modified": "Tue, 15 Nov 1994 12:45:26 GMT",
>-            "pragma": "no-cache",
>-
>-            # Non-CORS-safelisted
>-            "x-test": "foobar",
>-
>-            "Access-Control-Allow-Origin": "*"
>-    }
>-    for header in headers:
>-        response.headers.set(header, headers[header])
>-
>-    response.content = "PASS: Cross-domain access allowed."
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth2/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth2/w3c-import.log
>deleted file mode 100644
>index 2702e9dcae9..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth2/w3c-import.log
>+++ /dev/null
>@@ -1,18 +0,0 @@
>-The tests in this directory were imported from the W3C repository.
>-Do NOT modify these tests directly in WebKit.
>-Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>-
>-Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>-
>-Do NOT modify or remove this file.
>-
>-------------------------------------------------------------------------
>-Properties requiring vendor prefixes:
>-None
>-Property values requiring vendor prefixes:
>-None
>-------------------------------------------------------------------------
>-List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth2/auth.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth2/corsenabled.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth6/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth6/w3c-import.log
>deleted file mode 100644
>index 79704ce748d..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth6/w3c-import.log
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-The tests in this directory were imported from the W3C repository.
>-Do NOT modify these tests directly in WebKit.
>-Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>-
>-Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>-
>-Do NOT modify or remove this file.
>-
>-------------------------------------------------------------------------
>-Properties requiring vendor prefixes:
>-None
>-Property values requiring vendor prefixes:
>-None
>-------------------------------------------------------------------------
>-List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth6/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth7/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth7/w3c-import.log
>deleted file mode 100644
>index 48f6ad048d6..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth7/w3c-import.log
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-The tests in this directory were imported from the W3C repository.
>-Do NOT modify these tests directly in WebKit.
>-Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>-
>-Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>-
>-Do NOT modify or remove this file.
>-
>-------------------------------------------------------------------------
>-Properties requiring vendor prefixes:
>-None
>-Property values requiring vendor prefixes:
>-None
>-------------------------------------------------------------------------
>-List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth7/corsenabled.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth8/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth8/w3c-import.log
>deleted file mode 100644
>index a019d212025..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth8/w3c-import.log
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-The tests in this directory were imported from the W3C repository.
>-Do NOT modify these tests directly in WebKit.
>-Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>-
>-Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>-
>-Do NOT modify or remove this file.
>-
>-------------------------------------------------------------------------
>-Properties requiring vendor prefixes:
>-None
>-Property values requiring vendor prefixes:
>-None
>-------------------------------------------------------------------------
>-List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth8/corsenabled-no-authorize.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth9/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth9/w3c-import.log
>deleted file mode 100644
>index 44b17c90c45..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth9/w3c-import.log
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-The tests in this directory were imported from the W3C repository.
>-Do NOT modify these tests directly in WebKit.
>-Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>-
>-Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>-
>-Do NOT modify or remove this file.
>-
>-------------------------------------------------------------------------
>-Properties requiring vendor prefixes:
>-None
>-Property values requiring vendor prefixes:
>-None
>-------------------------------------------------------------------------
>-List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth9/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/inspect-headers.py b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/inspect-headers.py
>deleted file mode 100644
>index a8f1258fa25..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/inspect-headers.py
>+++ /dev/null
>@@ -1,35 +0,0 @@
>-def get_response(raw_headers, filter_value, filter_name):
>-    result = ""
>-    for line in raw_headers.headers:
>-        if line[-2:] != '\r\n':
>-            return "Syntax error: missing CRLF: " + line
>-        line = line[:-2]
>-
>-        if ':' not in line:
>-            return "Syntax error: no colon found: " + line
>-        name, value = line.split(':', 1)
>-        if len(value) > 1 and value[0] == ' ':
>-            value = value[1:]
>-
>-        if filter_value:
>-            if value == filter_value:
>-                result += name + ","
>-        elif name.lower() == filter_name:
>-            result += name + ": " + value + "\n";
>-    return result
>-
>-def main(request, response):
>-    headers = []
>-    if "cors" in request.GET:
>-        headers.append(("Access-Control-Allow-Origin", "*"))
>-        headers.append(("Access-Control-Allow-Credentials", "true"))
>-        headers.append(("Access-Control-Allow-Methods", "GET, POST, PUT, FOO"))
>-        headers.append(("Access-Control-Allow-Headers", "x-test, x-foo"))
>-        headers.append(("Access-Control-Expose-Headers", "x-request-method, x-request-content-type, x-request-query, x-request-content-length"))
>-    headers.append(("content-type", "text/plain"))
>-
>-    filter_value = request.GET.first("filter_value", "")
>-    filter_name = request.GET.first("filter_name", "").lower()
>-    result = get_response(request.raw_headers, filter_value, filter_name)
>-
>-    return headers, result
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/nocors/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/nocors/w3c-import.log
>deleted file mode 100644
>index 751acb34714..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/nocors/w3c-import.log
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-The tests in this directory were imported from the W3C repository.
>-Do NOT modify these tests directly in WebKit.
>-Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>-
>-Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>-
>-Do NOT modify or remove this file.
>-
>-------------------------------------------------------------------------
>-Properties requiring vendor prefixes:
>-None
>-Property values requiring vendor prefixes:
>-None
>-------------------------------------------------------------------------
>-List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/nocors/folder.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/w3c-import.log
>deleted file mode 100644
>index 9aad34622f2..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/w3c-import.log
>+++ /dev/null
>@@ -1,100 +0,0 @@
>-The tests in this directory were imported from the W3C repository.
>-Do NOT modify these tests directly in WebKit.
>-Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>-
>-Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>-
>-Do NOT modify or remove this file.
>-
>-------------------------------------------------------------------------
>-Properties requiring vendor prefixes:
>-None
>-Property values requiring vendor prefixes:
>-None
>-------------------------------------------------------------------------
>-List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/accept-language.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/accept.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-allow-lists.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-allow-with-body.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-auth-basic.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-allow-no-credentials.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-allow-star.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-allow.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-cors-safelisted-request-headers.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-denied.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-options-not-supported.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-preflight-cache-timeout.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-preflight-cache.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-put-allow.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-whitelist-response-headers.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-cookie.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-origin-header.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-denied.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-header-lowercase.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-header-sorted.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-headers-origin.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-must-not-contain-cookie.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-sandboxed-iframe.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/authentication.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/base.xml
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/chunked.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/conditional.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/content.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/corsenabled.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/delay.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/echo-headers.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/echo-method.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/empty-div-utf8-html.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/folder.txt
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/form.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/gzip.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/header-content-length.asis
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/headers-basic.asis
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/headers.asis
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/headers.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/image.gif
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/img-utf8-html.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/img.jpg
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/infinite-redirects.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/init.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/inspect-headers.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/invalid-utf8-html.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/last-modified.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/no-custom-header-on-preflight.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/parse-headers.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/pass.txt
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/redirect-cors.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/redirect.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/requri.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/reset-token.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/responseType-document-in-worker.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/responseXML-unavailable-in-worker.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/send-after-setting-document-domain-window-1.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/send-after-setting-document-domain-window-2.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/send-after-setting-document-domain-window-helper.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/shift-jis-html.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/status.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/trickle.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/upload.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/utf16.txt
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/well-formed.xml
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/win-1252-html.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/win-1252-xml.py
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/workerxhr-origin-referrer.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/workerxhr-simple.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-event-order.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-aborted.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-abortedonmain.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overridesexpires.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-runner.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-simple.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-synconmain.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-synconworker.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-twice.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/zlib.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-competing-names-passwords-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-competing-names-passwords-expected.txt
>deleted file mode 100644
>index dbd8ed85889..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-competing-names-passwords-expected.txt
>+++ /dev/null
>@@ -1,8 +0,0 @@
>-
>-PASS XMLHttpRequest: send() - "Basic" authenticated requests with competing user name/password options user/pass in open() call 
>-PASS XMLHttpRequest: send() - "Basic" authenticated requests with competing user name/password options another user/pass in open() call - must override cached credentials from previous test 
>-PASS XMLHttpRequest: send() - "Basic" authenticated requests with competing user name/password options user/pass both in URL userinfo AND open() call - expexted that open() wins 
>-PASS XMLHttpRequest: send() - "Basic" authenticated requests with competing user name/password options user/pass *only* in URL userinfo 
>-PASS XMLHttpRequest: send() - "Basic" authenticated requests with competing user name/password options user name in URL userinfo, password in open() call: user name wins and password is thrown away 
>-FAIL XMLHttpRequest: send() - "Basic" authenticated requests with competing user name/password options user name and password in URL userinfo, only user name in open() call: user name in open() wins assert_true: responseText should contain the right user and password expected true got false
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-competing-names-passwords.htm b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-competing-names-passwords.htm
>deleted file mode 100644
>index d58d9e002d7..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-competing-names-passwords.htm
>+++ /dev/null
>@@ -1,54 +0,0 @@
>-<!doctype html>
>-<html>
>-  <head>
>-    <title>XMLHttpRequest: send() - "Basic" authenticated requests with competing user name/password options</title>
>-    <script src="/resources/testharness.js"></script>
>-    <script src="/resources/testharnessreport.js"></script>
>-    <script src="/common/utils.js"></script>
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />  </head>
>-  <body>
>-    <div id="log"></div>
>-    <script>
>-      function request(user1, pass1, user2, pass2, name) {
>-        // user1, pass1 will if given become userinfo part of URL
>-        // user2, pass2 will if given be passed to open() call
>-        test(function() {
>-          var client = new XMLHttpRequest(),
>-              urlstart = "", userwin, passwin
>-          // if user2 is set, winning user name and password is 2
>-          if(user2)
>-            userwin = user2, passwin = pass2
>-          // if user1 is set, and user2 is not set, user1 and pass1 win
>-          if(user1 && ! user2)
>-            userwin = user1, passwin = pass1
>-          // if neither user name is set, pass 2 wins (there will be no userinfo in URL)
>-          if (!(user1 || user2))
>-            passwin = pass2
>-          if(user1) { // should add userinfo to URL (there is no way to create userinfo part of URL with only password in)
>-            urlstart = "http://" + user1
>-            if(pass1)
>-              urlstart += ":" + pass1
>-            urlstart += "@" + location.host + location.pathname.replace(/\/[^\/]*$/, '/')
>-          }
>-          client.open("GET", urlstart + "resources/authentication.py", false, user2, pass2)
>-          client.setRequestHeader("x-user", userwin)
>-          client.send(null)
>-          assert_true(client.responseText == ((userwin||'') + "\n" + (passwin||'')), 'responseText should contain the right user and password')
>-
>-          // We want to send multiple requests to the same realm here, so we try to make the UA forget its (cached) credentials between each test..
>-          // forcing a 401 response to (hopefully) "log out"
>-          // NOTE: This is commented out because it causes authentication prompts while running the test
>-          //client.open('GET', "resources/authentication.py?logout=1", false)
>-          //client.send()
>-        }, document.title+' '+name)
>-      }
>-      request(null, null, token(), token(), 'user/pass in open() call')
>-      request(null, null, token(), token(), 'another user/pass in open() call - must override cached credentials from previous test')
>-      request("userinfo-user", "userinfo-pass", token(), token(), 'user/pass both in URL userinfo AND open() call - expexted that open() wins')
>-      request(token(), token(), null, null, 'user/pass *only* in URL userinfo')
>-      request(token(), null, null, token(), 'user name in URL userinfo, password in open() call: user name wins and password is thrown away')
>-      request("1", token(), token(), null, 'user name and password in URL userinfo, only user name in open() call: user name in open() wins')
>-    </script>
>-  </body>
>-</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-charset-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-charset-expected.txt
>deleted file mode 100644
>index dbba02d27fd..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-charset-expected.txt
>+++ /dev/null
>@@ -1,13 +0,0 @@
>-
>-FAIL header with invalid MIME type is not changed assert_equals: expected "text; charset=ascii" but got "text; charset=UTF-8"
>-PASS known charset but bogus header - missing MIME type 
>-PASS bogus charset and bogus header - missing MIME type 
>-FAIL Correct text/plain MIME with charset assert_equals: expected "text/plain;charset=utf-8" but got "text/plain;charset=UTF-8"
>-PASS If no charset= param is given, implementation should not add one - unknown MIME 
>-PASS If no charset= param is given, implementation should not add one - known MIME 
>-FAIL charset given but wrong, fix it (unknown MIME, bogus charset) assert_equals: expected "text/x-thepiano;charset=UTF-8" but got "text/x-thepiano;charset= UTF-8"
>-FAIL charset given but wrong, fix it (known MIME, bogus charset) assert_equals: expected "text/plain;charset=utf-8;charset=UTF-8" but got "text/plain;charset=UTF-8;charset=UTF-8"
>-PASS charset given but wrong, fix it (known MIME, actual charset) 
>-PASS If multiple charset parameters are given, all should be rewritten 
>-PASS No content type set, give MIME and charset 
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt
>deleted file mode 100644
>index 6a078341a78..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt
>+++ /dev/null
>@@ -1,5 +0,0 @@
>-Blocked access to external URL http://nonexistent-origin.localhost:8800/
>-
>-PASS http URL 
>-PASS data URL 
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events.htm b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events.htm
>deleted file mode 100644
>index 6aea627d661..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events.htm
>+++ /dev/null
>@@ -1,76 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-<head>
>-    <script src="/resources/testharness.js"></script>
>-    <script src="/resources/testharnessreport.js"></script>
>-    <title>XMLHttpRequest: The send() method: timeout is not 0 </title>
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[5] following::a[contains(@href,'#timeout-error')]/.." />
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".." />
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7]/ol/li[3] following::ol[1]/li[7]/ol/li[4] following::ol[1]/li[9] following::ol[1]/li[10]" />
>-</head>
>-
>-<body>
>-    <div id="log"></div>
>-
>-    <script type="text/javascript">
>-        var test = async_test();
>-
>-        test.step(function()
>-        {
>-            var xhr = new XMLHttpRequest();
>-            var expect = [4, "", "upload.timeout", "upload.loadend", "timeout", "loadend"];
>-            var actual = [];
>-
>-            xhr.onreadystatechange = test.step_func(function()
>-            {
>-                if (xhr.readyState == 4)
>-                {
>-                    actual.push(xhr.readyState, xhr.response);
>-                }
>-            });
>-
>-            xhr.onloadend = test.step_func_done(function(e)
>-            {
>-                assert_equals(e.loaded, 0);
>-                assert_equals(e.total, 0);
>-                actual.push(e.type);
>-                assert_array_equals(actual, expect);
>-            });
>-
>-            xhr.ontimeout = test.step_func(function(e)
>-            {
>-                assert_equals(e.loaded, 0);
>-                assert_equals(e.total, 0);
>-                actual.push(e.type);
>-            });
>-
>-
>-            xhr.upload.onloadend = test.step_func(function(e)
>-            {
>-                assert_equals(e.loaded, 0);
>-                assert_equals(e.total, 0);
>-                actual.push("upload." + e.type);
>-            });
>-
>-            xhr.upload.ontimeout = test.step_func(function(e)
>-            {
>-                assert_equals(e.loaded, 0);
>-                assert_equals(e.total, 0);
>-                actual.push("upload." + e.type);
>-            });
>-
>-
>-            var content = "";
>-            for (var i = 0; i < 121026; i++)
>-            {
>-                content += "[" + i + "]";
>-            }
>-
>-            xhr.open("POST", "./resources/trickle.py", true);
>-            xhr.timeout = 1;
>-            xhr.send(content);
>-        });
>-    </script>
>-</body>
>-</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive-expected.txt
>deleted file mode 100644
>index 7eac3a6315c..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive-expected.txt
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-
>-PASS XMLHttpRequest: setRequestHeader() - headers that differ in case 
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-cors-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-cors-async-expected.txt
>deleted file mode 100644
>index 3d4a8cd755c..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-cors-async-expected.txt
>+++ /dev/null
>@@ -1,5 +0,0 @@
>-Blocked access to external URL http://www2.localhost:8800/XMLHttpRequest/resources/corsenabled.py?delay=2&code=200
>-CONSOLE MESSAGE: line 40: XMLHttpRequest cannot load http://www2.localhost:8800/XMLHttpRequest/resources/corsenabled.py?delay=2&code=200 due to access control checks.
>-
>-FAIL XMLHttpRequest: timeout event and cross-origin request assert_true: timeout event should fire expected true got false
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/w3c-import.log
>deleted file mode 100644
>index 79837a1bb37..00000000000
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/w3c-import.log
>+++ /dev/null
>@@ -1,293 +0,0 @@
>-The tests in this directory were imported from the W3C repository.
>-Do NOT modify these tests directly in WebKit.
>-Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>-
>-Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>-
>-Do NOT modify or remove this file.
>-
>-------------------------------------------------------------------------
>-Properties requiring vendor prefixes:
>-None
>-Property values requiring vendor prefixes:
>-None
>-------------------------------------------------------------------------
>-List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/FormData-append.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/OWNERS
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/README.md
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-receive.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-send.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-timeout.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-done.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-headers-received.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-loading.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.worker.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-unsent.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-upload.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-abort.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-listeners.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-loadend.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-order.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-upload-event-abort.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-upload-event-loadend.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-same-origin.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header-data-url.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-async.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-async.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-timeout.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-star.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-response-headers.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-success-no-content-type.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-header-denied.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-method-denied.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-not-supported.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-async.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-sync.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-async.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-sync.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-lowercase.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-sorted.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-headers-origin.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-must-not-contain-cookie.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-header-denied.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-method-denied.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-not-supported.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-recursive-failed-request.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body-sync.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-exposed-headers.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow-origin-null.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/allow-lists-starting-with-comma.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/anonymous-mode-unsupported.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/data-uri.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-abort.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-error.sub.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-load.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadend.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadstart-upload.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadstart.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-progress.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-readystate-sync-open.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-readystatechange-loaded.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-timeout.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-content-length.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-no-content-length.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/folder.txt
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-blob.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-delete.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-foreach.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-get.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-has.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-set.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cl.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cookies.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-status.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-cookies-and-more.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-error-state.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-server-date.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-special-characters.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-unsent-opened-state.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/headers-normalize-response.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/historical.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/interfaces.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/loadstart-and-state.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-after-abort.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-after-setrequestheader.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-event.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-processing.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-bogus.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-case-insensitive.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-case-sensitive.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-insecure.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-responsetype-set-sync.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-open-send.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-open-sync-send.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-referer.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-send-during-abort.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-send-open.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-sync-open-send.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-about-blank-window.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-inserted-after-open.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-inserted.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-encoding.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-fragment.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-javascript-window-2.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-javascript-window.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-2.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-3.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-4.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-5.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-6.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-redirected-worker-origin.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-origin.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-simple.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-user-password-non-same-origin.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-blob.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-done-state.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-invalid-mime-type.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-loading-state.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-open-state-force-xml.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progress-events-response-data-gzip.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progressevent-constructor.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progressevent-interface.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-arraybuffer.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-blob.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-deflate.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-gzip.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-progress.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-invalid-responsetype.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-json.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-method.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseText-status.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseType-document-in-worker.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseXML-unavailable-in-worker.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsedocument-decoding.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetext-decoding.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetype.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseurl.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-basic.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-document-properties.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-get-twice.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-media-type.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-non-document-types.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-non-well-formed.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/security-consideration.sub.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-accept-language.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-accept.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-setrequestheader-and-arguments.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-setrequestheader.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-competing-names-passwords.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-setrequestheader-no-cred.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional-cors.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-charset.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-string.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-arraybuffer.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-arraybufferview.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-blob.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-es-object.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-formdata.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-unexpected-tostring.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-basic.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document-bogus.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-loadend.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-loadstart.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-order.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-receive-utf16.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-no-location.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-non-cors.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-event-order.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-loadend.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-loadstart.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-progress.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.worker.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-blocks-async.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-load.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-loadend.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-order.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-response-event-order.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-timeout.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any.js
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-after-send.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-allow-empty-value.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-allow-whitespace-in-value.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-before-open.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-bogus-name.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-bogus-value.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-forbidden.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-open-setrequestheader.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-async.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-basic.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-error.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/template-element.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-cors-async.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-multiple-fetches.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-sync.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-basic.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-eventtarget.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error.htm
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-subframe.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-scripts.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-subframe.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-reused.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-unsent.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-trailer-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-trailer-expected.txt
>index 5a34aed1fd4..7daee24b209 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-trailer-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/response/response-trailer-expected.txt
>@@ -1,3 +1,3 @@
> 
>-FAIL trailer() test assert_equals: expected (string) "X-Test-Me" but got (object) null
>+FAIL trailer() test promise_test: Unhandled rejection with value: object "TypeError: undefined is not an object (evaluating 'res.trailer.then')"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/FormData-append-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/FormData-append-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/FormData-append-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/FormData-append-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/FormData-append.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/FormData-append.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/FormData-append.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/FormData-append.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/META.yml b/LayoutTests/imported/w3c/web-platform-tests/xhr/META.yml
>new file mode 100644
>index 00000000000..4b2ecf39bf3
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/META.yml
>@@ -0,0 +1,10 @@
>+spec: https://xhr.spec.whatwg.org/
>+suggested_reviewers:
>+  - caitp
>+  - Manishearth
>+  - jungkees
>+  - ibelem
>+  - mathiasbynens
>+  - jdm
>+  - annevk
>+  - wisniewskit
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/OWNERS b/LayoutTests/imported/w3c/web-platform-tests/xhr/OWNERS
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/OWNERS
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/OWNERS
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/README.md b/LayoutTests/imported/w3c/web-platform-tests/xhr/README.md
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/README.md
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/README.md
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.worker-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any.worker-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.worker-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.worker.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/XMLHttpRequest-withCredentials.any.worker.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.worker.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-receive-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-receive-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-receive.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-receive.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-send-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-send-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-send.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-send.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop-expected.txt
>new file mode 100644
>index 00000000000..1ebb2c0c8f0
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop-expected.txt
>@@ -0,0 +1,3 @@
>+
>+FAIL XMLHttpRequest: abort event should fire when stop() method is used assert_equals: expected true but got false
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.htm
>new file mode 100644
>index 00000000000..7c5060fa4c6
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.htm
>@@ -0,0 +1,30 @@
>+<!doctype html>
>+<html>
>+  <head>
>+    <title>XMLHttpRequest: abort event should fire when stop() method is used</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[3] following::dt[3]/following::dd[1]/p"/>
>+  </head>
>+  <body>
>+    <div id="log"></div>
>+    <script>
>+      var test = async_test();
>+      window.onload = test.step_func(function() {
>+        var client = new XMLHttpRequest();
>+        var abortFired = false;
>+        client.onabort = test.step_func(function (e) {
>+          assert_equals(e.type, 'abort');
>+          abortFired = true;
>+        });
>+        client.open("GET", "resources/delay.py?ms=3000", true);
>+        client.send(null);
>+        test.step_timeout(() => {
>+          assert_equals(abortFired, true);
>+          test.done();
>+        }, 200);
>+        window.stop();
>+      });
>+    </script>
>+  </body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-timeout-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-timeout-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-timeout.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-after-timeout.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-done-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-done-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-done.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-done.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-headers-received-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-headers-received-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-headers-received.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-headers-received.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-loading-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-loading-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-loading.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-loading.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any-expected.txt
>new file mode 100644
>index 00000000000..d9df1a32ddf
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS XMLHttpRequest: abort() during OPEN 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.worker.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.js
>new file mode 100644
>index 00000000000..42a1bce0ef2
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.js
>@@ -0,0 +1,18 @@
>+var test = async_test("XMLHttpRequest: abort() during OPEN");
>+test.step(function() {
>+  var client = new XMLHttpRequest()
>+  client.open("GET", "...")
>+  client.onreadystatechange = function() {
>+    test.step(function() {
>+      assert_unreached()
>+    })
>+  }
>+  assert_equals(client.readyState, 1, "before abort()")
>+  assert_equals(client.status, 0)
>+  assert_equals(client.statusText, "")
>+  client.abort()
>+  assert_equals(client.readyState, 1, "after abort()")
>+  assert_equals(client.status, 0)
>+  assert_equals(client.statusText, "")
>+})
>+test.done()
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.worker-expected.txt
>new file mode 100644
>index 00000000000..d9df1a32ddf
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.worker-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS XMLHttpRequest: abort() during OPEN 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.worker.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.worker.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.worker.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.worker-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.worker-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.worker-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.worker.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.worker.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.worker.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.worker.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-open.worker.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.worker.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-unsent-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-unsent-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-unsent.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-unsent.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-upload-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-upload-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-upload.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-during-upload.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-abort-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-abort-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-abort.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-abort.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-listeners-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-listeners-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-listeners.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-listeners.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-loadend-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-loadend-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-loadend.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-loadend.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-order-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-order-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-order-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-order-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-order.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-order.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-event-order.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-order.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-upload-event-abort-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-upload-event-abort-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-upload-event-abort.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-upload-event-abort.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-upload-event-loadend-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-upload-event-loadend-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-upload-event-loadend.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/abort-upload-event-loadend.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-same-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-same-origin-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-same-origin.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.htm
>similarity index 84%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-same-origin.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.htm
>index 24cc80c228f..14e999c0844 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-same-origin.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.htm
>@@ -33,37 +33,37 @@
> 
>     // The redirect response passes the access check.
>     async_test(t => {
>-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow-star.py",
>+      runTest(t, "/xhr/resources/access-control-basic-allow-star.py",
>           withoutCredentials, succeeds)
>     }, "Request without credentials is redirected to a cross-origin response with Access-Control-Allow-Origin=* (with star)");
> 
>     // The redirect response fails the access check because credentials were sent.
>     async_test(t => {
>-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow-star.py",
>+      runTest(t, "/xhr/resources/access-control-basic-allow-star.py",
>           withCredentials, fails)
>     }, "Request with credentials is redirected to a cross-origin response with Access-Control-Allow-Origin=* (with star)");
> 
>     // The redirect response passes the access check.
>     async_test(t => {
>-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow.py",
>+      runTest(t, "/xhr/resources/access-control-basic-allow.py",
>           withoutCredentials, succeeds)
>     }, "Request without credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin");
> 
>     // The redirect response passes the access check.
>     async_test(t => {
>-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow.py",
>+      runTest(t, "/xhr/resources/access-control-basic-allow.py",
>           withCredentials, succeeds)
>     }, "Request with credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin");
> 
>     // forbidding credentials. The redirect response passes the access check.
>     async_test(t => {
>-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow-no-credentials.py",
>+      runTest(t, "/xhr/resources/access-control-basic-allow-no-credentials.py",
>           withoutCredentials, succeeds)
>     }, "Request without credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin (no credentials)");
> 
>     // forbidding credentials. The redirect response fails the access check.
>     async_test(t => {
>-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow-no-credentials.py",
>+      runTest(t, "/xhr/resources/access-control-basic-allow-no-credentials.py",
>           withCredentials, fails)
>     }, "Request with credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin (no credentials)");
>     </script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.htm
>similarity index 85%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.htm
>index bf16c3c8a1c..a77846f4f5f 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.htm
>@@ -11,7 +11,7 @@
>     function runTest(test, destination, parameters, customHeader, local, expectSuccess) {
>       const xhr = new XMLHttpRequest();
>       const url = (local ? get_host_info().HTTP_ORIGIN : get_host_info().HTTP_REMOTE_ORIGIN) +
>-        "/XMLHttpRequest/resources/redirect-cors.py?location=" + destination + "&" +  parameters;
>+        "/xhr/resources/redirect-cors.py?location=" + destination + "&" +  parameters;
> 
>       xhr.open("GET", url, true);
> 
>@@ -41,21 +41,21 @@
>     // The redirect response fails the access check because the redirect lacks a CORS header.
>     async_test(t => {
>       runTest(t, get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow-star.py", "",
>+          "/xhr/resources/access-control-basic-allow-star.py", "",
>           withoutCustomHeader, remote, fails)
>     }, "Request is redirected without CORS headers to a response with Access-Control-Allow-Origin=*");
> 
>     // The redirect response passes the access check.
>     async_test(t => {
>       runTest(t, get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow-star.py", "allow_origin=true",
>+          "/xhr/resources/access-control-basic-allow-star.py", "allow_origin=true",
>           withoutCustomHeader, remote, succeeds)
>     }, "Request is redirected to a response with Access-Control-Allow-Origin=*");
> 
>     // The redirect response fails the access check because user info was sent.
>     async_test(t => {
>       runTest(t, get_host_info().HTTP_REMOTE_ORIGIN.replace("http://", "http://username:password@") +
>-          "/XMLHttpRequest/resources/access-control-basic-allow-star.py", "allow_origin=true",
>+          "/xhr/resources/access-control-basic-allow-star.py", "allow_origin=true",
>           withoutCustomHeader, remote, fails)
>     }, "Request with user info is redirected to a response with Access-Control-Allow-Origin=*");
> 
>@@ -67,21 +67,21 @@
>     // The preflighted redirect response fails the access check because of preflighting.
>     async_test(t => {
>       runTest(t, get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow-star.py",
>+          "/xhr/resources/access-control-basic-allow-star.py",
>           "allow_origin=true&redirect_preflight=true", withCustomHeader, remote, fails)
>     }, "Preflighted request is redirected to a response with Access-Control-Allow-Origin=*");
> 
>     // The preflighted redirect response fails the access check after successful preflighting.
>     async_test(t => {
>       runTest(t, get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow-star.py",
>+          "/xhr/resources/access-control-basic-allow-star.py",
>           "allow_origin=true&allow_header=x-test&redirect_preflight=true",
>           withCustomHeader, remote, fails)
>     }, "Preflighted request is redirected to a response with Access-Control-Allow-Origin=* and header allowed");
> 
>     // The same-origin redirect response passes the access check.
>     async_test(t => {
>-      runTest(t, get_host_info().HTTP_ORIGIN + "/XMLHttpRequest/resources/pass.txt",
>+      runTest(t, get_host_info().HTTP_ORIGIN + "/xhr/resources/pass.txt",
>           "", withCustomHeader, local, succeeds)
>     }, "Request is redirected to a same-origin resource file");
>     </script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.htm
>similarity index 66%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.htm
>index dcdf40044cb..a10bc1f5446 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.htm
>@@ -29,31 +29,31 @@
>     }
>     test(t => {
>       runSync(t, "resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow.py")
>+          "/xhr/resources/access-control-basic-allow.py")
>     }, "Local sync redirect to remote origin");
>     async_test(t => {
>       runAsync(t, "resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow.py")
>+          "/xhr/resources/access-control-basic-allow.py")
>     }, "Local async redirect to remote origin");
>     test(t => {
>       runSync(t, get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/redirect-cors.py?location=" + get_host_info().HTTP_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow.py&allow_origin=true")
>+          "/xhr/resources/redirect-cors.py?location=" + get_host_info().HTTP_ORIGIN +
>+          "/xhr/resources/access-control-basic-allow.py&allow_origin=true")
>     }, "Remote sync redirect to local origin");
>     async_test(t => {
>       runAsync(t, get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/redirect-cors.py?location=" + get_host_info().HTTP_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow.py&allow_origin=true")
>+          "/xhr/resources/redirect-cors.py?location=" + get_host_info().HTTP_ORIGIN +
>+          "/xhr/resources/access-control-basic-allow.py&allow_origin=true")
>     }, "Remote async redirect to local origin");
>     test(t => {
>       runSync(t, get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow.py&allow_origin=true")
>+          "/xhr/resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
>+          "/xhr/resources/access-control-basic-allow.py&allow_origin=true")
>     }, "Remote sync redirect to same remote origin");
>     async_test(t => {
>       runAsync(t, get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow.py&allow_origin=true")
>+          "/xhr/resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
>+          "/xhr/resources/access-control-basic-allow.py&allow_origin=true")
>     }, "Remote async redirect to same remote origin");
>     </script>
>   </body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header-data-url-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header-data-url-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header-data-url-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header-data-url-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header-data-url.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header-data-url.htm
>similarity index 91%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header-data-url.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header-data-url.htm
>index d73f56b017b..0d66ad787af 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header-data-url.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header-data-url.htm
>@@ -8,7 +8,7 @@
>   </head>
>   <body>
>     <script type="text/javascript">
>-const url = get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-origin-header.py";
>+const url = get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-origin-header.py";
> async_test(function(test) {
>   window.addEventListener("message", test.step_func(function(evt) {
>     if (evt.data == "ready") {
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.htm
>similarity index 82%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.htm
>index 87b7e4755f9..aedd20740ee 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-access-control-origin-header.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.htm
>@@ -10,7 +10,7 @@
>     async_test(function(test) {
>       const xhr = new XMLHttpRequest;
> 
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-origin-header.py", false);
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-origin-header.py", false);
>       xhr.send();
> 
>       assert_equals(xhr.responseText, "PASS: Cross-domain access allowed.\n" +
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-async-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-async.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.htm
>similarity index 91%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-async.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.htm
>index d9e03210d0c..142181e9ac0 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-async.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.htm
>@@ -21,7 +21,7 @@
>       xhr.onerror = test.unreached_func("FAIL: Network error.");
> 
>       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-allow.py", true);
>+          "/xhr/resources/access-control-basic-allow.py", true);
>       xhr.send();
>     }, "Basic async cross-origin XHR request");
>     </script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-async-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-async.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.htm
>similarity index 92%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-async.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.htm
>index 57721aa684b..e468c82ccab 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-async.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.htm
>@@ -18,7 +18,7 @@
>       xhr.onerror = test.unreached_func("Unexpected error.");
> 
>       xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-put-allow.py");
>+          "/xhr/resources/access-control-basic-put-allow.py");
>       xhr.setRequestHeader("Content-Type", "text/plain; charset=UTF-8");
>       xhr.send("PASS: PUT data received");
>     }, "Allow async PUT request");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.htm
>similarity index 83%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.htm
>index 08f41117f87..2612265173e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.htm
>@@ -11,7 +11,7 @@
>     test(function() {
>       const xhr = new XMLHttpRequest;
> 
>-      xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-put-allow.py", false);
>+      xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-put-allow.py", false);
> 
>       xhr.setRequestHeader("Content-Type", "text/plain; charset=UTF-8");
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-header-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-header-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-header.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
>similarity index 75%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
>index 5a1e396e52f..306eb02b3eb 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
>@@ -20,7 +20,7 @@
>         firstRequest();
>       });
> 
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, true);
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/reset-token.py?token=" + uuid, true);
>       xhr.send();
> 
>       function firstRequest() {
>@@ -28,7 +28,7 @@
>           assert_equals(xhr.responseText, "PASS: First PUT request.");
>           secondRequest();
>         });
>-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
>+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
>         xhr.send();
>       }
> 
>@@ -38,7 +38,7 @@
>           test.done();
>         });
>         // Send a header not included in the inital cache.
>-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
>+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
>         xhr.setRequestHeader("x-test", "headerValue");
>         xhr.send();
>       }
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-method-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-method-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-method.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
>similarity index 78%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
>index 058943e839d..f8a99a25560 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
>@@ -20,7 +20,7 @@
>         firstRequest();
>       });
> 
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, true);
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/reset-token.py?token=" + uuid, true);
>       xhr.send();
> 
>       function firstRequest() {
>@@ -28,7 +28,7 @@
>           assert_equals(xhr.responseText, "PASS: First PUT request.");
>           secondRequest();
>         });
>-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
>+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
>         xhr.send();
>       }
> 
>@@ -38,7 +38,7 @@
>           test.done();
>         });
>         // Send a header not included in the inital cache.
>-        xhr.open("XMETHOD", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
>+        xhr.open("XMETHOD", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
>         xhr.send();
>       }
>     }, "Preflight cache should be invalidated by changed method");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-timeout-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-timeout-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-timeout.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.htm
>similarity index 74%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-timeout.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.htm
>index 56702c01d0e..ccd961f2108 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache-timeout.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.htm
>@@ -20,7 +20,7 @@
>         firstRequest();
>       });
> 
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, true);
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/reset-token.py?token=" + uuid, true);
>       xhr.send();
> 
>       function firstRequest() {
>@@ -28,7 +28,7 @@
>           assert_equals(xhr.responseText, "PASS: First PUT request.");
>           step_timeout(secondRequest, 3000); // 3 seconds
>         });
>-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-timeout.py?token=" + uuid, true);
>+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-timeout.py?token=" + uuid, true);
>         xhr.send();
>       }
> 
>@@ -37,7 +37,7 @@
>           assert_equals(xhr.responseText, "PASS: Second OPTIONS request was sent.");
>           test.done();
>         });
>-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-timeout.py?token=" + uuid, true);
>+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-timeout.py?token=" + uuid, true);
>         xhr.send();
>       }
>     }, "Preflight cache should be invalidated on timeout");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.htm
>similarity index 75%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.htm
>index ad38a6bdb1d..b8deda4349e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-preflight-cache.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.htm
>@@ -20,7 +20,7 @@
>         firstRequest();
>       });
> 
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, true);
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/reset-token.py?token=" + uuid, true);
>       xhr.send();
> 
>       function firstRequest() {
>@@ -28,7 +28,7 @@
>           assert_equals(xhr.responseText, "PASS: First PUT request.");
>           secondRequest();
>         });
>-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache.py?token=" + uuid, true);
>+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache.py?token=" + uuid, true);
>         xhr.send();
>       }
> 
>@@ -36,7 +36,7 @@
>         xhr.onload = test.step_func_done(function() {
>           assert_equals(xhr.responseText, "PASS: Second PUT request. Preflight worked.");
>         });
>-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache.py?token=" + uuid, true);
>+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache.py?token=" + uuid, true);
>         xhr.send();
>       }
>     }, "Preflight cache should allow second request");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-star-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-star-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-star.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.htm
>similarity index 80%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-star.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.htm
>index fac25e297b5..d05222f2002 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow-star.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.htm
>@@ -11,7 +11,7 @@
>     const xhr = new XMLHttpRequest;
> 
>     test(function(test) {
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-allow-star.py", false);
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-allow-star.py", false);
> 
>       xhr.send();
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.htm
>similarity index 81%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.htm
>index f7e67babdf1..61c02ed5428 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-allow.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.htm
>@@ -11,7 +11,7 @@
>     test(function() {
>       const xhr = new XMLHttpRequest;
> 
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-allow.py", false);
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-allow.py", false);
> 
>       xhr.send();
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers.htm
>similarity index 86%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers.htm
>index 1d570a3c93e..20b875b9bdd 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers.htm
>@@ -11,7 +11,7 @@
>     test(function() {
>       const xhr = new XMLHttpRequest;
> 
>-      xhr.open("POST", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-cors-safelisted-request-headers.py", false);
>+      xhr.open("POST", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-cors-safelisted-request-headers.py", false);
> 
>       xhr.setRequestHeader("Accept", "*");
>       xhr.setRequestHeader("Accept-Language", "ru");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-response-headers-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-response-headers-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-response-headers-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-response-headers-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-response-headers.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-response-headers.htm
>similarity index 92%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-response-headers.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-response-headers.htm
>index c795083ece9..a5c470b74f5 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-response-headers.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-response-headers.htm
>@@ -12,7 +12,7 @@
>       const xhr = new XMLHttpRequest;
> 
>       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-whitelist-response-headers.py", false);
>+          "/xhr/resources/access-control-basic-whitelist-response-headers.py", false);
>       xhr.send();
> 
>       assert_not_equals(xhr.getResponseHeader("cache-control"), null);
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-denied-expected.txt
>new file mode 100644
>index 00000000000..9431f150552
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-denied-expected.txt
>@@ -0,0 +1,6 @@
>+CONSOLE MESSAGE: line 25: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>+CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
>+
>+PASS Same-origin request accepted 
>+PASS Cross-origin request denied 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-denied.htm
>similarity index 77%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-denied.htm
>index 924bdd55a69..535762d0eda 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-denied.htm
>@@ -8,7 +8,7 @@
>   </head>
>   <body>
>     <script type="text/javascript">
>-    const path = "/XMLHttpRequest/resources/access-control-basic-denied.py";
>+    const path = "/xhr/resources/access-control-basic-denied.py";
> 
>     test(function() {
>       const xhr = new XMLHttpRequest;
>@@ -22,12 +22,8 @@
>       const xhr = new XMLHttpRequest;
> 
>       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + path, false);
>-      try {
>-        xhr.send();
>-        assert_unreached("Error should occur here");
>-      } catch(e) {
>-        assert_equals(xhr.status, 0);
>-      }
>+      assert_throws("NetworkError", () => xhr.send());
>+      assert_equals(xhr.status, 0);
>     }, "Cross-origin request denied");
>     </script>
>   </body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-get-fail-non-simple-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-get-fail-non-simple-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm
>similarity index 73%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm
>index ccd9f7cab03..a4fe23460d1 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm
>@@ -12,19 +12,14 @@
>       const xhr = new XMLHttpRequest;
> 
>       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-options-not-supported.py", false);
>+          "/xhr/resources/access-control-basic-options-not-supported.py", false);
> 
>       // Non-CORS-safelisted header
>       xhr.setRequestHeader("x-test", "foobar");
> 
>       // This fails because the server-side script is not prepared for an OPTIONS request
>-      try {
>-        xhr.send();
>-      } catch(e) {
>-        assert_equals(xhr.status, 0);
>-        return;
>-      }
>-      assert_unreached("Preflighted request was not denied.");
>+      assert_throws("NetworkError", () => xhr.send());
>+      assert_equals(xhr.status, 0);
>     }, "Preflighted cross-origin request denied");
>     </script>
>   </body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type-expected.txt
>new file mode 100644
>index 00000000000..d5715079397
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type-expected.txt
>@@ -0,0 +1,5 @@
>+CONSOLE MESSAGE: line 25: Request header field Content-Type is not allowed by Access-Control-Allow-Headers.
>+CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-put-allow.py due to access control checks.
>+
>+PASS Deny cross-origin request with non-CORS-safelisted content type 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm
>similarity index 68%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm
>index bff0cf569c5..062f8b0bb5b 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm
>@@ -12,23 +12,18 @@
>       const xhr = new XMLHttpRequest;
> 
>       xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-put-allow.py", false);
>+          "/xhr/resources/access-control-basic-put-allow.py", false);
>       xhr.setRequestHeader("Content-Type", "text/plain");
>       xhr.send("PASS: PUT data received");
> 
>       assert_equals(xhr.responseText, "PASS: Cross-domain access allowed.\nPASS: PUT data received");
> 
>       xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-put-allow.py", false);
>+          "/xhr/resources/access-control-basic-put-allow.py", false);
>       xhr.setRequestHeader("Content-Type", "application/xml");
> 
>-      try {
>-        xhr.send("FAIL: PUT data received");
>-      } catch(e) {
>-        assert_equals(xhr.status, 0, "Cross-domain access was denied in 'send'.");
>-        return;
>-      }
>-      assert_unreached("Cross-domain access was not denied in 'send'.");
>+      assert_throws("NetworkError", () => xhr.send("FAIL: PUT data received"));
>+      assert_equals(xhr.status, 0, "Cross-domain access was denied in 'send'.");
>     }, "Deny cross-origin request with non-CORS-safelisted content type");
>     </script>
>   </body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-success-no-content-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-success-no-content-type-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-success-no-content-type-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-success-no-content-type-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-success-no-content-type.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-success-no-content-type.htm
>similarity index 84%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-success-no-content-type.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-success-no-content-type.htm
>index 8785a44504b..7e7a7d3a3e8 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-success-no-content-type.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-success-no-content-type.htm
>@@ -11,7 +11,7 @@
>     async_test(function(test) {
>       const xhr = new XMLHttpRequest;
> 
>-      xhr.open("POST", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-options-not-supported.py");
>+      xhr.open("POST", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-options-not-supported.py");
> 
>       xhr.onerror = test.unreached_func("Network error.");
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm
>similarity index 71%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm
>index 9867c796d68..0a6df932aa4 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm
>@@ -12,7 +12,7 @@
>       const xhr = new XMLHttpRequest;
> 
>       xhr.open("POST", get_host_info().HTTP_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-options-not-supported.py", false);
>+          "/xhr/resources/access-control-basic-options-not-supported.py", false);
> 
>       xhr.setRequestHeader("Content-Type", "application/xml");
> 
>@@ -25,17 +25,12 @@
>       const xhr = new XMLHttpRequest;
> 
>       xhr.open("POST", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-options-not-supported.py", false);
>+          "/xhr/resources/access-control-basic-options-not-supported.py", false);
> 
>       xhr.setRequestHeader("Content-Type", "application/xml");
> 
>-      try {
>-        xhr.send();
>-      } catch(e) {
>-        assert_equals(xhr.status, 0, "Cross-domain access was denied in 'send'.");
>-        return;
>-      }
>-      assert_unreached("Cross-domain access was not denied in 'send'.");
>+      assert_throws("NetworkError", () => xhr.send());
>+      assert_equals(xhr.status, 0, "Cross-domain access was denied in 'send'.");
>     }, "CORS request with non-safelisted content type sends preflight and fails");
>     </script>
>   </body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-preflight-denied-expected.txt
>similarity index 71%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-preflight-denied-expected.txt
>index 155457e96ad..2ccf38b8535 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-preflight-denied-expected.txt
>@@ -1,5 +1,5 @@
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> 
> PASS Tests async XHR preflight denial due to lack of CORS headers 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-preflight-denied.htm
>similarity index 93%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-preflight-denied.htm
>index d02bdf0dcde..6475186a068 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-preflight-denied.htm
>@@ -23,7 +23,7 @@
>       xhr.onload = test.unreached_func("Request succeeded unexpectedly");
> 
>       xhr.open("FOO", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-basic-denied.py");
>+          "/xhr/resources/access-control-basic-denied.py");
>       xhr.send();
>     });
>     </script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-header-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-header-denied-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-header-denied-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-header-denied-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-header-denied.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-header-denied.htm
>similarity index 93%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-header-denied.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-header-denied.htm
>index 84a60eb6f63..a00cc588981 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-header-denied.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-header-denied.htm
>@@ -11,7 +11,7 @@
>     <script type="text/javascript">
>     const uuid = token();
>     const url = get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
>+          "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
> 
>     async_test((test) => {
>       let xhr = new XMLHttpRequest;
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-method-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-method-denied-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-method-denied-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-method-denied-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-method-denied.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-method-denied.htm
>similarity index 93%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-method-denied.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-method-denied.htm
>index eb36110f496..a0425a4bb16 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-method-denied.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-method-denied.htm
>@@ -11,7 +11,7 @@
>     <script type="text/javascript">
>     const uuid = token();
>     const url = get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
>+          "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
> 
>     async_test((test) => {
>       let xhr = new XMLHttpRequest;
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-not-supported-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-not-supported-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-not-supported-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-not-supported-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-not-supported.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-not-supported.htm
>similarity index 91%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-not-supported.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-not-supported.htm
>index e1607d4389a..a4dc06d5515 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-not-supported.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-not-supported.htm
>@@ -11,7 +11,7 @@
>     <script type="text/javascript">
> const uuid = token();
> const url = get_host_info().HTTP_REMOTE_ORIGIN +
>-      "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
>+      "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
> 
> async_test((test) => {
>   let xhr = new XMLHttpRequest;
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-async-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-async-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-async-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-async.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-async.htm
>similarity index 91%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-async.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-async.htm
>index d9ccc102826..ad7117fdf98 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-async.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-async.htm
>@@ -12,7 +12,7 @@
>       const xhr = new XMLHttpRequest;
> 
>       xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-auth-basic.py?uid=fooUser",
>+          "/xhr/resources/access-control-auth-basic.py?uid=fooUser",
>           true, "fooUser", "barPass");
>       xhr.withCredentials = true;
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-sync-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-sync-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-sync-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-sync-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-sync.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-sync.htm
>similarity index 79%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-sync.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-sync.htm
>index d0b99018160..3844d023d9f 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-credential-sync.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-sync.htm
>@@ -11,7 +11,7 @@
>     test(() => {
>       const xhr = new XMLHttpRequest;
> 
>-      xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-auth-basic.py?uid=fooUser", false, "fooUser", "barPass");
>+      xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-auth-basic.py?uid=fooUser", false, "fooUser", "barPass");
> 
>       xhr.withCredentials = true;
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-async-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-async-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-async-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-async.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-async.htm
>similarity index 85%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-async.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-async.htm
>index 6e05cfe385c..ffea72ac3b2 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-async.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-async.htm
>@@ -14,12 +14,12 @@ async_test((test) => {
>   const uuid = token();
> 
>   xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-      "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, false);
>+      "/xhr/resources/reset-token.py?token=" + uuid, false);
>   xhr.send();
> 
>   xhr = new XMLHttpRequest;
>   xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-      "/XMLHttpRequest/resources/no-custom-header-on-preflight.py?token=" + uuid);
>+      "/xhr/resources/no-custom-header-on-preflight.py?token=" + uuid);
>   xhr.setRequestHeader("x-test", "foobar");
> 
>   xhr.onerror = test.unreached_func("Unexpected error");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-sync-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-sync-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-sync-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-sync-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-sync.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-sync.htm
>similarity index 83%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-sync.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-sync.htm
>index 85fe446ceee..2ae9fe80022 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-headers-sync.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-sync.htm
>@@ -14,12 +14,12 @@
>       const uuid = token();
> 
>       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, false);
>+          "/xhr/resources/reset-token.py?token=" + uuid, false);
>       xhr.send();
> 
>       xhr = new XMLHttpRequest;
>       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/no-custom-header-on-preflight.py?token=" + uuid, false);
>+          "/xhr/resources/no-custom-header-on-preflight.py?token=" + uuid, false);
>       xhr.setRequestHeader("x-test", "foobar");
>       xhr.send();
>       assert_equals(xhr.responseText, "PASS");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-lowercase-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-lowercase-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-lowercase-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-lowercase-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-lowercase.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-lowercase.htm
>similarity index 84%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-lowercase.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-lowercase.htm
>index d88cac8f967..7dc4608f57e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-lowercase.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-lowercase.htm
>@@ -11,7 +11,7 @@
>     async_test(function(test) {
>       const xhr = new XMLHttpRequest;
> 
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-preflight-request-header-lowercase.py");
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-preflight-request-header-lowercase.py");
> 
>       xhr.setRequestHeader("X-Test", "foobar");
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-sorted-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-sorted-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-sorted-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-sorted-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-sorted.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-sorted.htm
>similarity index 86%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-sorted.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-sorted.htm
>index 2423b80cd8e..830e0fbc4f4 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-header-sorted.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-sorted.htm
>@@ -10,7 +10,7 @@
> <script>
> async_test((test) => {
>   const xhr = new XMLHttpRequest();
>-  const url = get_host_info().HTTP_REMOTE_ORIGIN + '/XMLHttpRequest/resources/access-control-preflight-request-header-sorted.py';
>+  const url = get_host_info().HTTP_REMOTE_ORIGIN + '/xhr/resources/access-control-preflight-request-header-sorted.py';
>   xhr.open('GET', url);
>   xhr.setRequestHeader("X-Custom-Test", "foobar");
>   xhr.setRequestHeader("X-Custom-ua", "foobar");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-headers-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-headers-origin-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-headers-origin-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-headers-origin-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-headers-origin.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-headers-origin.htm
>similarity index 90%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-headers-origin.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-headers-origin.htm
>index 67aeda9eeee..fc11abc04fb 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-headers-origin.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-headers-origin.htm
>@@ -11,7 +11,7 @@
> async_test((test) => {
>   const xhr = new XMLHttpRequest;
>   const url = get_host_info().HTTP_REMOTE_ORIGIN +
>-      "/XMLHttpRequest/resources/access-control-preflight-request-headers-origin.py";
>+      "/xhr/resources/access-control-preflight-request-headers-origin.py";
> 
>   xhr.open("GET", url);
>   xhr.setRequestHeader("x-pass", "PASS");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-301-expected.txt
>similarity index 58%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-301-expected.txt
>index 784532bd9ad..e4816b99ce1 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-301-expected.txt
>@@ -1,5 +1,5 @@
> CONSOLE MESSAGE: Preflight response is not successful
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=301 due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-preflight-request-invalid-status.py?code=301 due to access control checks.
> 
> PASS Request with 301 preflight response 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-301.htm
>similarity index 83%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-301.htm
>index 669f7db80d2..62fc4803b43 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-301.htm
>@@ -11,7 +11,7 @@
>     async_test((test) => {
>       const xhr = new XMLHttpRequest;
> 
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=301");
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-preflight-request-invalid-status.py?code=301");
> 
>       xhr.setRequestHeader("x-pass", "pass");
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-400-expected.txt
>similarity index 58%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-400-expected.txt
>index 95c44a23f9b..4d5c60cd484 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-400-expected.txt
>@@ -1,5 +1,5 @@
> CONSOLE MESSAGE: Preflight response is not successful
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=400 due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-preflight-request-invalid-status.py?code=400 due to access control checks.
> 
> PASS Request with 400 preflight response 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-400.htm
>similarity index 83%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-400.htm
>index 38520999783..9e76d9e1308 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-400.htm
>@@ -11,7 +11,7 @@
>     async_test((test) => {
>       const xhr = new XMLHttpRequest;
> 
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=400");
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-preflight-request-invalid-status.py?code=400");
> 
>       xhr.setRequestHeader("x-pass", "pass");
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-501-expected.txt
>similarity index 58%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-501-expected.txt
>index 806e9c7ef93..7045eca7272 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-501-expected.txt
>@@ -1,5 +1,5 @@
> CONSOLE MESSAGE: Preflight response is not successful
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=501 due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-preflight-request-invalid-status.py?code=501 due to access control checks.
> 
> PASS Request with 501 preflight response 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-501.htm
>similarity index 83%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-501.htm
>index 5f3c5e62c61..f2ed85bc17e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-501.htm
>@@ -11,7 +11,7 @@
>     async_test((test) => {
>       const xhr = new XMLHttpRequest;
> 
>-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=501");
>+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-preflight-request-invalid-status.py?code=501");
> 
>       xhr.setRequestHeader("x-pass", "pass");
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-must-not-contain-cookie-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-must-not-contain-cookie-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-must-not-contain-cookie-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-must-not-contain-cookie-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-must-not-contain-cookie.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-must-not-contain-cookie.htm
>similarity index 87%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-must-not-contain-cookie.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-must-not-contain-cookie.htm
>index c7cb5cde42a..6dd8e6db888 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-must-not-contain-cookie.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-must-not-contain-cookie.htm
>@@ -13,7 +13,7 @@
>         const xhr = new XMLHttpRequest;
>         // Delete all preexisting cookies and set a cookie named "foo"
>         xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-            "/XMLHttpRequest/resources/access-control-cookie.py?cookie_name=foo");
>+            "/xhr/resources/access-control-cookie.py?cookie_name=foo");
>         xhr.withCredentials = true;
>         xhr.send();
>         xhr.onerror = test.unreached_func("Unexpected error.");
>@@ -27,7 +27,7 @@
>         const xhr = new XMLHttpRequest;
>         // Request to server-side file fails if cookie is included in preflight
>         xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-          "/XMLHttpRequest/resources/access-control-preflight-request-must-not-contain-cookie.py");
>+          "/xhr/resources/access-control-preflight-request-must-not-contain-cookie.py");
>         xhr.withCredentials = true;
>         xhr.setRequestHeader("X-Proprietary-Header", "foo");
>         xhr.onerror = test.unreached_func("Unexpected error.");
>@@ -43,7 +43,7 @@
>         const xhr = new XMLHttpRequest;
>         // Delete all cookies
>         xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-            "/XMLHttpRequest/resources/access-control-cookie.py");
>+            "/xhr/resources/access-control-cookie.py");
>         xhr.withCredentials = true;
>         xhr.send();
>         xhr.onerror = test.unreached_func("Unexpected error.");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-header-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-header-denied-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-header-denied-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-header-denied-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-header-denied.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm
>similarity index 65%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-header-denied.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm
>index 422c625e99c..7948c18a2ef 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-header-denied.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm
>@@ -11,7 +11,7 @@
>     <script type="text/javascript">
> const uuid = token();
> const url = get_host_info().HTTP_REMOTE_ORIGIN +
>-    "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
>+    "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
> 
> test(() => {
>   let xhr = new XMLHttpRequest;
>@@ -22,17 +22,12 @@ test(() => {
>   xhr.open("GET", url + "&command=header", false);
>   xhr.setRequestHeader("x-test", "foo");
> 
>-  try {
>-    xhr.send();
>-  } catch(e) {
>-    xhr = new XMLHttpRequest;
>-    xhr.open("GET", url + "&command=complete", false);
>-    xhr.send();
>-    assert_equals(xhr.responseText, "Request successfully blocked.");
>-    return;
>-  }
>+  assert_throws("NetworkError", () => xhr.send());
> 
>-  assert_unreached("Cross-domain access with custom header allowed without throwing exception");
>+  xhr = new XMLHttpRequest;
>+  xhr.open("GET", url + "&command=complete", false);
>+  xhr.send();
>+  assert_equals(xhr.responseText, "Request successfully blocked.");
> }, "Sync request denied at preflight");
>     </script>
>   </body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-method-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-method-denied-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-method-denied-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-method-denied-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-method-denied.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm
>similarity index 62%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-method-denied.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm
>index cd2999a82a5..a54c308d9f1 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-method-denied.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm
>@@ -11,7 +11,7 @@
>     <script type="text/javascript">
> const uuid = token();
> const url = get_host_info().HTTP_REMOTE_ORIGIN +
>-      "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
>+      "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
> 
> test(() => {
>   let xhr = new XMLHttpRequest;
>@@ -21,17 +21,12 @@ test(() => {
>   xhr = new XMLHttpRequest;
>   xhr.open("DELETE", url + "&command=method", false);
> 
>-  try {
>-    xhr.send();
>-  } catch(e) {
>-    xhr = new XMLHttpRequest;
>-    xhr.open("GET", url + "&command=complete", false);
>-    xhr.send();
>-    assert_equals(xhr.responseText, "Request successfully blocked.");
>-    return;
>-  }
>+  assert_throws("NetworkError", () => xhr.send());
> 
>-  assert_unreached("Cross-domain access with non-CORS-safelisted method allowed without throwing exception");
>+  xhr = new XMLHttpRequest;
>+  xhr.open("GET", url + "&command=complete", false);
>+  xhr.send();
>+  assert_equals(xhr.responseText, "Request successfully blocked.");
> });
>     </script>
>   </body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-not-supported-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-not-supported-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-not-supported-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-not-supported-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-not-supported.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm
>similarity index 62%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-not-supported.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm
>index a0b079e0789..bb08296304f 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-not-supported.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm
>@@ -11,7 +11,7 @@
>     <script type="text/javascript">
> const uuid = token();
> const url = get_host_info().HTTP_REMOTE_ORIGIN +
>-      "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
>+      "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
> 
> test(() => {
>   let xhr = new XMLHttpRequest;
>@@ -21,17 +21,12 @@ test(() => {
>   xhr = new XMLHttpRequest;
>   xhr.open("PUT", url, false);
> 
>-  try {
>-    xhr.send("");
>-  } catch(e) {
>-    xhr = new XMLHttpRequest;
>-    xhr.open("GET", url + "&command=complete", false);
>-    xhr.send();
>-    assert_equals(xhr.responseText, "Request successfully blocked.");
>-    return;
>-  }
>+  assert_throws("NetworkError", () => xhr.send(""));
> 
>-  assert_unreached("Cross-domain access allowed without throwing exception");
>+  xhr = new XMLHttpRequest;
>+  xhr.open("GET", url + "&command=complete", false);
>+  xhr.send();
>+  assert_equals(xhr.responseText, "Request successfully blocked.");
> });
>     </script>
>   </body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-recursive-failed-request-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-recursive-failed-request-expected.txt
>similarity index 65%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-recursive-failed-request-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-recursive-failed-request-expected.txt
>index 92c94c853ce..41d736eeda1 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-recursive-failed-request-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-recursive-failed-request-expected.txt
>@@ -1,23 +1,23 @@
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/access-control-basic-denied.py due to access control checks.
> 
> PASS Recursively repeated CORS requests with failed preflights should never result in unexpected behavior 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-recursive-failed-request.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-recursive-failed-request.htm
>similarity index 93%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-recursive-failed-request.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-recursive-failed-request.htm
>index e29a34a6d03..2c2bcef48b9 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-recursive-failed-request.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-recursive-failed-request.htm
>@@ -27,7 +27,7 @@ async_test((test) => {
>     });
> 
>     xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-        "/XMLHttpRequest/resources/access-control-basic-denied.py");
>+        "/xhr/resources/access-control-basic-denied.py");
>     xhr.send();
>   }
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body-sync-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body-sync-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body-sync-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body-sync-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body-sync.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body-sync.htm
>similarity index 90%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body-sync.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body-sync.htm
>index 559b7d21ad3..d4c90aece06 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body-sync.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body-sync.htm
>@@ -12,7 +12,7 @@ test(() => {
>   const xhr = new XMLHttpRequest;
> 
>   xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN+
>-      "/XMLHttpRequest/resources/access-control-allow-with-body.py", false);
>+      "/xhr/resources/access-control-allow-with-body.py", false);
>   xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
>   xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
>   xhr.send();
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body.htm
>similarity index 92%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body.htm
>index ab89cefd76e..3ab0521106b 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-body.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body.htm
>@@ -19,7 +19,7 @@ async_test((test) => {
>   });
> 
>   xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-      "/XMLHttpRequest/resources/access-control-allow-with-body.py");
>+      "/xhr/resources/access-control-allow-with-body.py");
>   xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
>   xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
>   xhr.send();
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-exposed-headers-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-exposed-headers-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-exposed-headers-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-exposed-headers-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-exposed-headers.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-exposed-headers.htm
>similarity index 95%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-exposed-headers.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-exposed-headers.htm
>index 23cd0fbb1c8..c6f7bf5c6a6 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-response-with-exposed-headers.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-exposed-headers.htm
>@@ -12,7 +12,7 @@ async_test((test) => {
>   const xhr = new XMLHttpRequest;
> 
>   xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
>-      "/XMLHttpRequest/resources/pass.txt?pipe=" +
>+      "/xhr/resources/pass.txt?pipe=" +
>       "header(Cache-Control,no-cache)|" +
>       "header(Access-Control-Max-Age,0)|" +
>       "header(Access-Control-Allow-Origin,*)|" +
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow-origin-null-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow-origin-null-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow-origin-null-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow-origin-null-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow-origin-null.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow-origin-null.htm
>similarity index 85%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow-origin-null.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow-origin-null.htm
>index 5c647dfa270..ae966683233 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow-origin-null.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow-origin-null.htm
>@@ -13,7 +13,7 @@ async_test((test) => {
>     if (evt.data === "ready") {
>       document.getElementById("frame").contentWindow.postMessage(
>           get_host_info().HTTP_ORIGIN +
>-          "/XMLHttpRequest/resources/pass.txt?pipe=" +
>+          "/xhr/resources/pass.txt?pipe=" +
>           "header(Cache-Control,no-store)|" +
>           "header(Content-Type,text/plain)|" +
>           "header(Access-Control-Allow-Credentials,true)|" +
>@@ -26,7 +26,7 @@ async_test((test) => {
>   }), false);
> });
>     </script>
>-    <iframe id="frame" sandbox="allow-scripts" src="/XMLHttpRequest/resources/access-control-sandboxed-iframe.html">
>+    <iframe id="frame" sandbox="allow-scripts" src="/xhr/resources/access-control-sandboxed-iframe.html">
>     </iframe>
>   </body>
> </html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow.htm
>similarity index 85%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow.htm
>index 21413f38663..a3dbed420fe 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-allow.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow.htm
>@@ -13,7 +13,7 @@ async_test((test) => {
>     if (evt.data === "ready") {
>       document.getElementById("frame").contentWindow.postMessage(
>           get_host_info().HTTP_ORIGIN +
>-          "/XMLHttpRequest/resources/pass.txt?pipe=" +
>+          "/xhr/resources/pass.txt?pipe=" +
>           "header(Cache-Control,no-store)|" +
>           "header(Content-Type,text/plain)|" +
>           "header(Access-Control-Allow-Credentials,true)|" +
>@@ -26,7 +26,7 @@ async_test((test) => {
>   }), false);
> });
>     </script>
>-    <iframe id="frame" sandbox="allow-scripts" src="/XMLHttpRequest/resources/access-control-sandboxed-iframe.html">
>+    <iframe id="frame" sandbox="allow-scripts" src="/xhr/resources/access-control-sandboxed-iframe.html">
>     </iframe>
>   </body>
> </html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-expected.txt
>similarity index 65%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-expected.txt
>index da453664871..5c3915f0e5e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-expected.txt
>@@ -1,5 +1,5 @@
> CONSOLE MESSAGE: line 12: Origin null is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: line 12: XMLHttpRequest cannot load http://localhost:8800/XMLHttpRequest/resources/pass.txt?pipe=header(Cache-Control,no-store)|header(Content-Type,text/plain) due to access control checks.
>+CONSOLE MESSAGE: line 12: XMLHttpRequest cannot load http://localhost:8800/xhr/resources/pass.txt?pipe=header(Cache-Control,no-store)|header(Content-Type,text/plain) due to access control checks.
> 
> 
> PASS Check that path exists and is accessible via local XHR request 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
>similarity index 55%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
>index 2da47a4a198..ce4b5e234e2 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
>@@ -1,5 +1,5 @@
> CONSOLE MESSAGE: line 12: Origin null is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: line 12: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/pass.txt?pipe=header(Cache-Control,no-store)|header(Content-Type,text/plain)header(Access-Control-Allow-Credentials,true)|header(Access-Control-Allow-Origin,http://localhost:8800) due to access control checks.
>+CONSOLE MESSAGE: line 12: XMLHttpRequest cannot load http://127.0.0.1:8800/xhr/resources/pass.txt?pipe=header(Cache-Control,no-store)|header(Content-Type,text/plain)header(Access-Control-Allow-Credentials,true)|header(Access-Control-Allow-Origin,http://localhost:8800) due to access control checks.
> 
> 
> PASS Check that path exists and is accessible via CORS XHR request 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm
>similarity index 89%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm
>index 7c375f60668..a703a922e27 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm
>@@ -8,7 +8,7 @@
>   </head>
>   <body>
>     <script type="text/javascript">
>-const path = "/XMLHttpRequest/resources/pass.txt?pipe=" +
>+const path = "/xhr/resources/pass.txt?pipe=" +
>     "header(Cache-Control,no-store)|" +
>     "header(Content-Type,text/plain)" +
>     "header(Access-Control-Allow-Credentials,true)|" +
>@@ -37,7 +37,7 @@ async_test((test) => {
>   }), false);
> }, "Sandboxed iframe is denied CORS access to server that allows parent origin");
>     </script>
>-    <iframe id="frame" sandbox="allow-scripts" src="/XMLHttpRequest/resources/access-control-sandboxed-iframe.html">
>+    <iframe id="frame" sandbox="allow-scripts" src="/xhr/resources/access-control-sandboxed-iframe.html">
>     </iframe>
>   </body>
> </html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied.htm
>similarity index 88%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied.htm
>index a87dd7d1f25..5b629917041 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied.htm
>@@ -8,7 +8,7 @@
>   </head>
>   <body>
>     <script type="text/javascript">
>-const path = "/XMLHttpRequest/resources/pass.txt?pipe=" +
>+const path = "/xhr/resources/pass.txt?pipe=" +
>     "header(Cache-Control,no-store)|" +
>     "header(Content-Type,text/plain)";
> 
>@@ -35,7 +35,7 @@ async_test((test) => {
>   }), false);
> }, "Sandboxed iframe is denied access to path");
>     </script>
>-    <iframe id="frame" sandbox="allow-scripts" src="/XMLHttpRequest/resources/access-control-sandboxed-iframe.html">
>+    <iframe id="frame" sandbox="allow-scripts" src="/xhr/resources/access-control-sandboxed-iframe.html">
>     </iframe>
>   </body>
> </html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/allow-lists-starting-with-comma-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/allow-lists-starting-with-comma-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/allow-lists-starting-with-comma-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/allow-lists-starting-with-comma-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/allow-lists-starting-with-comma.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/allow-lists-starting-with-comma.htm
>similarity index 84%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/allow-lists-starting-with-comma.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/allow-lists-starting-with-comma.htm
>index 4a4e5e2218c..ece699bf5d7 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/allow-lists-starting-with-comma.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/allow-lists-starting-with-comma.htm
>@@ -10,7 +10,7 @@
>   <script type="text/javascript">
>     async_test(function(test) {
>       const client = new XMLHttpRequest();
>-      let url = "XMLHttpRequest/resources/access-control-allow-lists.py?headers=,y-lol,x-print,%20,,,y-print&origin=" +
>+      let url = "xhr/resources/access-control-allow-lists.py?headers=,y-lol,x-print,%20,,,y-print&origin=" +
>           get_host_info().HTTP_ORIGIN;
>       client.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + '/' + url, false);
>       client.setRequestHeader('x-print', 'unicorn')
>@@ -21,7 +21,7 @@
>       assert_equals(response['x-print'], "unicorn");
>       assert_equals(response['y-print'], "narwhal");
> 
>-      url = "XMLHttpRequest/resources/access-control-allow-lists.py?methods=,,PUT,GET&origin=" +
>+      url = "xhr/resources/access-control-allow-lists.py?methods=,,PUT,GET&origin=" +
>           get_host_info().HTTP_ORIGIN;
>       client.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + '/' + url, false);
>       // Sending PUT request
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/anonymous-mode-unsupported-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/anonymous-mode-unsupported-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/anonymous-mode-unsupported-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/anonymous-mode-unsupported-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/anonymous-mode-unsupported.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/anonymous-mode-unsupported.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/anonymous-mode-unsupported.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/anonymous-mode-unsupported.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/close-worker-with-xhr-in-progress-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/close-worker-with-xhr-in-progress-expected.txt
>new file mode 100644
>index 00000000000..130db81db86
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/close-worker-with-xhr-in-progress-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS Terminating a worker with a XHR in progress doesn't crash 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/close-worker-with-xhr-in-progress.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/close-worker-with-xhr-in-progress.html
>new file mode 100644
>index 00000000000..4d03bea028f
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/close-worker-with-xhr-in-progress.html
>@@ -0,0 +1,26 @@
>+<!doctype html>
>+<html>
>+<head>
>+<script src="/resources/testharness.js"></script>
>+<script src="/resources/testharnessreport.js"></script>
>+<script>
>+async_test(t => {
>+  function workerCode(origin) {
>+    const xhr = new XMLHttpRequest();
>+    xhr.open('GET', origin + '/xhr/resources/image.gif?pipe=trickle(100:d2)', true);
>+    xhr.responseType = 'blob';
>+    xhr.send();
>+    postMessage('sent');
>+  }
>+
>+  const workerBlob = new Blob([workerCode.toString() + ";workerCode('" + location.origin + "');"], {type:"application/javascript"});
>+  const w = new Worker(URL.createObjectURL(workerBlob));
>+  w.onmessage = t.step_func(e => {
>+    assert_equals(e.data, 'sent');
>+    t.step_timeout(t.step_func(() => {
>+      w.terminate();
>+      t.step_timeout(t.step_func_done(() => {}), 500);
>+    }, 100));
>+  });
>+}, 'Terminating a worker with a XHR in progress doesn\'t crash');
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/data-uri-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/data-uri-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/data-uri-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/data-uri-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/data-uri.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/data-uri.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/data-uri.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/data-uri.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-abort-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-abort-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-abort.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-abort.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error-order.sub-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error-order.sub-expected.txt
>new file mode 100644
>index 00000000000..47de75f3a44
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error-order.sub-expected.txt
>@@ -0,0 +1,4 @@
>+Blocked access to external URL http://nonexistent.localhost:8800/
>+
>+FAIL XMLHttpRequest: event - error (order of events) assert_equals: expected "upload.loadstart(0,12,true)" but got "upload.loadstart(0,0,false)"
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error-order.sub.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error-order.sub.html
>new file mode 100644
>index 00000000000..252a90bb621
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error-order.sub.html
>@@ -0,0 +1,35 @@
>+ï»¿<!DOCTYPE html>
>+<html>
>+<head>
>+    <meta name="assert" content="Check the order of events fired when the request has failed.">
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <script src="resources/xmlhttprequest-event-order.js"></script>
>+    <title>XMLHttpRequest: event - error (order of events)</title>
>+</head>
>+
>+<body>
>+    <div id="log"></div>
>+
>+    <script type="text/javascript">
>+        var test = async_test();
>+
>+        test.step(function()
>+        {
>+            var xhr = new XMLHttpRequest();
>+            prepare_xhr_for_event_order_test(xhr);
>+
>+            xhr.addEventListener("loadend", function() {
>+                test.step(function() {
>+                    // no progress events due to CORS failure
>+                    assert_xhr_event_order_matches([1, "loadstart(0,0,false)", "upload.loadstart(0,12,true)", 2, 4, "upload.error(0,0,false)", "upload.loadend(0,0,false)", "error(0,0,false)", "loadend(0,0,false)"]);
>+                    test.done();
>+                });
>+            });
>+
>+            xhr.open("POST", "http://nonexistent.{{host}}:{{ports[http][0]}}", true);
>+            xhr.send("Test Message");
>+        });
>+    </script>
>+</body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-error.sub-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-error.sub-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-error.sub.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.html
>similarity index 89%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-error.sub.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.html
>index 3171c49d7a8..5f275600006 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-error.sub.html
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.html
>@@ -18,7 +18,7 @@ async_test(function (t) {
>     t.done();
>   });
> 
>-  client.open("GET", "http://nonexistent-origin.{{host}}:{{ports[http][0]}}");
>+  client.open("GET", "http://nonexistent.{{host}}:{{ports[http][0]}}");
>   client.send("null");
> }, document.title);
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-load-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-load-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-load-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-load.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-load.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadend-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadend-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadend.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadend.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadstart-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadstart-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadstart-upload-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadstart-upload-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadstart-upload.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadstart-upload.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadstart.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-loadstart.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-progress-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-progress-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-progress.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-progress.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-readystate-sync-open-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-readystate-sync-open-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-readystate-sync-open.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-readystate-sync-open.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-readystatechange-loaded-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-readystatechange-loaded-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-readystatechange-loaded.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-readystatechange-loaded.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-timeout-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-timeout-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order-expected.txt
>new file mode 100644
>index 00000000000..bc30c4e2582
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order-expected.txt
>@@ -0,0 +1,3 @@
>+
>+FAIL XMLHttpRequest: event - timeout (order of events) assert_equals: expected "upload.loadstart(0,12,true)" but got "upload.loadstart(0,0,false)"
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.htm
>new file mode 100644
>index 00000000000..d4dc78010a7
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.htm
>@@ -0,0 +1,37 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <meta name="assert" content="Check the order of events fired when the request has failed.">
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <script src="resources/xmlhttprequest-event-order.js"></script>
>+    <title>XMLHttpRequest: event - timeout (order of events)</title>
>+</head>
>+
>+<body>
>+    <div id="log"></div>
>+
>+    <script type="text/javascript">
>+        var test = async_test();
>+
>+        test.step(function()
>+        {
>+            var xhr = new XMLHttpRequest();
>+            prepare_xhr_for_event_order_test(xhr);
>+            xhr.addEventListener("loadend", function() {
>+                test.step(function() {
>+                    assert_xhr_event_order_matches([1, "loadstart(0,0,false)", "upload.loadstart(0,12,true)", 4, "upload.timeout(0,0,false)", "upload.loadend(0,0,false)", "timeout(0,0,false)", "loadend(0,0,false)"]);
>+                    test.done();
>+                });
>+            });
>+
>+            xhr.timeout = 5;
>+            xhr.open("POST", "resources/delay.py?ms=20000");
>+            xhr.send("Test Message");
>+            test.step_timeout(() => {
>+              assert_unreached("ontimeout not called.");
>+            }, 10);
>+        });
>+    </script>
>+</body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-timeout.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-timeout.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin-expected.txt
>new file mode 100644
>index 00000000000..4fdf53bb597
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin-expected.txt
>@@ -0,0 +1,6 @@
>+
>+PASS Upload events registered on time (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
>+PASS Upload events registered on time (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
>+PASS Upload events registered too late (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
>+PASS Upload events registered too late (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm
>similarity index 92%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm
>index 293f7bf2b9c..5e558a27b78 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm
>@@ -7,7 +7,7 @@
> <script src="/common/get-host-info.sub.js"></script>
> <div id="log"></div>
> <script>
>-const remote = get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/corsenabled.py",
>+const remote = get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/corsenabled.py",
>       redirect = "resources/redirect.py?code=307&location=" + remote;
> 
> [remote, redirect].forEach(url => {
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-expected.txt
>new file mode 100644
>index 00000000000..4fdf53bb597
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-expected.txt
>@@ -0,0 +1,6 @@
>+
>+PASS Upload events registered on time (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
>+PASS Upload events registered on time (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
>+PASS Upload events registered too late (http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
>+PASS Upload events registered too late (resources/redirect.py?code=307&location=http://127.0.0.1:8800/xhr/resources/corsenabled.py) 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.htm
>new file mode 100644
>index 00000000000..697d4cbd3f6
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.htm
>@@ -0,0 +1,33 @@
>+<!doctype html>
>+<html lang=en>
>+<meta charset=utf-8>
>+<title>XMLHttpRequest: upload progress event</title>
>+<script src="/resources/testharness.js"></script>
>+<script src="/resources/testharnessreport.js"></script>
>+<script src="/common/get-host-info.sub.js"></script>
>+<div id="log"></div>
>+<script>
>+const remote = get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/corsenabled.py",
>+      redirect = "resources/redirect.py?code=307&location=" + remote;
>+
>+[remote, redirect].forEach(url => {
>+  async_test(test => {
>+    const client = new XMLHttpRequest();
>+    client.upload.onprogress = test.step_func_done();
>+    client.onload = test.unreached_func();
>+    client.open("POST", url);
>+    client.send("On time: " + url);
>+  }, "Upload events registered on time (" + url + ")");
>+});
>+
>+[remote, redirect].forEach(url => {
>+  async_test(test => {
>+    const client = new XMLHttpRequest();
>+    client.onload = test.step_func_done();
>+    client.open("POST", url);
>+    client.send("Too late: " + url);
>+    client.upload.onloadstart = test.unreached_func(); // registered too late
>+    client.upload.onprogress = test.unreached_func(); // registered too late
>+  }, "Upload events registered too late (" + url + ")");
>+});
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-content-length-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-content-length-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-content-length-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-content-length-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-content-length.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-content-length.html
>new file mode 100644
>index 00000000000..4748ce390fc
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-content-length.html
>@@ -0,0 +1,32 @@
>+<!doctype html>
>+<html>
>+  <head>
>+    <title>ProgressEvent: firing events for HTTP with Content-Length</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+  </head>
>+  <body>
>+    <div id="log"></div>
>+    <script>
>+      async_test(t => {
>+        const xhr = new XMLHttpRequest();
>+        let progressHappened = false;
>+
>+        xhr.onprogress = t.step_func(pe => {
>+          assert_equals(pe.type, "progress");
>+          assert_greater_than_equal(pe.loaded, 0, "loaded");
>+          assert_true(pe.lengthComputable, "lengthComputable");
>+          assert_equals(pe.total, 1300, "total");
>+          progressHappened = true;
>+        });
>+
>+        xhr.onloadend = t.step_func_done(() => {
>+          assert_true(progressHappened);
>+        });
>+
>+        xhr.open("GET", "resources/trickle.py?ms=0&count=100&specifylength=1", true);
>+        xhr.send(null);
>+      });
>+    </script>
>+  </body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-no-content-length-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-no-content-length-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-no-content-length-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-no-content-length-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-no-content-length.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-no-content-length.html
>new file mode 100644
>index 00000000000..ddf7dd800a2
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-no-content-length.html
>@@ -0,0 +1,35 @@
>+<!doctype html>
>+<html>
>+  <head>
>+    <title>ProgressEvent: firing events for HTTP with no Content-Length</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+  </head>
>+  <body>
>+    <div id="log"></div>
>+    <script>
>+      async_test(t => {
>+        const xhr = new XMLHttpRequest();
>+        let progressHappened = false;
>+
>+        xhr.onprogress = t.step_func(pe => {
>+          assert_equals(pe.type, "progress");
>+          assert_greater_than_equal(pe.loaded, 0, "loaded");
>+          assert_false(pe.lengthComputable, "lengthComputable");
>+          assert_equals(pe.total, 0, "total");
>+          progressHappened = true;
>+        });
>+
>+        // "loadstart", "error", "abort", "load" tests are out of scope.
>+        // They SHOULD be tested in each spec that implement ProgressEvent.
>+
>+        xhr.onloadend = t.step_func_done(() => {
>+          assert_true(progressHappened);
>+        });
>+
>+        xhr.open("GET", "resources/trickle.py?ms=0&count=100", true);
>+        xhr.send(null);
>+      });
>+    </script>
>+  </body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/folder.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/folder.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/folder.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/folder.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-blob-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-blob-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-blob-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-blob-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-blob.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-blob.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-blob.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-blob.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-delete-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-delete-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-delete-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-delete-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-delete.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-delete.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-delete.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-delete.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-foreach-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-foreach-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-foreach-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-foreach-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-foreach.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-foreach.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-foreach.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-foreach.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-get-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-get-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-get-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-get-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-get.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-get.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-get.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-get.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-has-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-has-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-has-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-has-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-has.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-has.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-has.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-has.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-set-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-set-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-set-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-set-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-set.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-set.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata-set.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-set.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/formdata.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/formdata.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cl-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-cl-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cl-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-cl-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cl.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-cl.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cl.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-cl.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cookies-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-cookies-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cookies-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-cookies-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cookies.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-cookies.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cookies.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-cookies.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt
>similarity index 66%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt
>index 2cef77eb3d3..3c705c31c43 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt
>@@ -1,4 +1,5 @@
> 
> PASS XMLHttpRequest: getAllResponseHeaders() 
> PASS XMLHttpRequest: getAllResponseHeaders() 1 
>+PASS XMLHttpRequest: getAllResponseHeaders() 2 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-status-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-status-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-status-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-status-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-status.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-status.htm
>new file mode 100644
>index 00000000000..a02ab457452
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-status.htm
>@@ -0,0 +1,33 @@
>+<!DOCTYPE html>
>+<html>
>+  <head>
>+    <title>XMLHttpRequest: getAllResponseHeaders() excludes status</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getallresponseheaders" data-tested-assertations="/following::OL[1]/LI[1] /following::OL[1]/LI[3]" />
>+  </head>
>+  <body>
>+    <div id="log"></div>
>+    <script>
>+      async_test(function() {
>+        var client = new XMLHttpRequest()
>+        assert_equals(client.getAllResponseHeaders(), "")
>+
>+        client.onreadystatechange = this.step_func(function() {
>+          var headers = client.getAllResponseHeaders().toLowerCase()
>+          if(client.readyState == 1) {
>+            assert_equals(headers, "")
>+          }
>+          if(client.readyState > 1) {
>+            assert_false(headers.indexOf("200 ok") != -1)
>+            assert_false(headers.indexOf("http/1.") != -1)
>+          }
>+          if(client.readyState == 4)
>+            this.done()
>+        })
>+        client.open("GET", "resources/headers.py")
>+        client.send(null)
>+      })
>+  </script>
>+ </body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders.htm
>similarity index 70%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders.htm
>index 5d83ba4f57a..7b54e9e16f8 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders.htm
>@@ -9,6 +9,7 @@ async_test((t) => {
>   client.onload = t.step_func_done(() => {
>     assert_equals(client.getAllResponseHeaders(), "foo-test: 1, 2, 3\r\n")
>   })
>+  client.onerror = t.unreached_func("unexpected error")
>   client.open("GET", "resources/headers-basic.asis")
>   client.send(null)
> })
>@@ -18,7 +19,15 @@ async_test((t) => {
>   client.onload = t.step_func_done(() => {
>     assert_equals(client.getAllResponseHeaders(), "also-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n")
>   })
>+  client.onerror = t.unreached_func("unexpected error")
>   client.open("GET", "resources/headers.asis")
>   client.send(null)
> })
>+
>+test(() => {
>+  const client = new XMLHttpRequest
>+  client.open("GET", "resources/header-content-length.asis", false)
>+  client.send()
>+  assert_equals(client.getAllResponseHeaders(), "content-length: 0\r\n")
>+})
> </script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-chunked-trailer-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-chunked-trailer-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-chunked-trailer.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-chunked-trailer.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-cookies-and-more-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-cookies-and-more-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-cookies-and-more-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-cookies-and-more-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-cookies-and-more.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-cookies-and-more.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-cookies-and-more.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-cookies-and-more.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-error-state-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-error-state-expected.txt
>new file mode 100644
>index 00000000000..4f1ae6946ed
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-error-state-expected.txt
>@@ -0,0 +1,5 @@
>+Blocked access to external URL http://www1.localhost:8800/xhr/resources/nocors/folder.txt
>+CONSOLE MESSAGE: line 32: XMLHttpRequest cannot load http://www1.localhost:8800/xhr/resources/nocors/folder.txt due to access control checks.
>+
>+PASS XMLHttpRequest: getResponseHeader() in error state (failing cross-origin test) 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-error-state.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-error-state.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-error-state.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-error-state.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-server-date-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-server-date-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-server-date-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-server-date-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-server-date.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-server-date.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-server-date.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-server-date.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-special-characters-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-special-characters-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-special-characters-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-special-characters-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-special-characters.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-special-characters.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-special-characters.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-special-characters.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-unsent-opened-state-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-unsent-opened-state-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-unsent-opened-state-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-unsent-opened-state-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-unsent-opened-state.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-unsent-opened-state.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-unsent-opened-state.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-unsent-opened-state.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-async-expected.txt
>new file mode 100644
>index 00000000000..8260a8692c8
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-async-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS Async request has User-Agent header 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-async.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-async.htm
>new file mode 100644
>index 00000000000..8c1d0b663f4
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-async.htm
>@@ -0,0 +1,26 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <title>Test that async requests (both OPTIONS preflight and regular) are sent with the User-Agent header</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <script src="/common/get-host-info.sub.js"></script>
>+</head>
>+<body>
>+<script type="text/javascript">
>+  async_test((test) => {
>+    let xhr = new XMLHttpRequest;
>+    xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/header-user-agent.py");
>+    xhr.setRequestHeader("x-test", "foobar");
>+
>+    xhr.onerror = test.unreached_func("Unexpected error");
>+
>+    xhr.onload = test.step_func_done(() => {
>+      assert_equals(xhr.responseText, "PASS");
>+    });
>+
>+    xhr.send();
>+  }, "Async request has User-Agent header");
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-sync-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-sync-expected.txt
>new file mode 100644
>index 00000000000..db68d213fe0
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-sync-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS Sync request has User-Agent header 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-sync.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-sync.htm
>new file mode 100644
>index 00000000000..d88aac2805d
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-sync.htm
>@@ -0,0 +1,20 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <title>Test that sync requests (both OPTIONS preflight and regular) are sent with the User-Agent header</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <script src="/common/get-host-info.sub.js"></script>
>+</head>
>+<body>
>+<script type="text/javascript">
>+  test(function() {
>+    let xhr = new XMLHttpRequest;
>+    xhr.open("post", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/header-user-agent.py", false);
>+    xhr.setRequestHeader("x-test", "foobar");
>+    xhr.send();
>+    assert_equals(xhr.responseText, "PASS");
>+  }, "Sync request has User-Agent header");
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/headers-normalize-response-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/headers-normalize-response-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/headers-normalize-response-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/headers-normalize-response-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/headers-normalize-response.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/headers-normalize-response.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/headers-normalize-response.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/headers-normalize-response.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/historical-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/historical-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/historical-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/historical-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/historical.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/historical.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/historical.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/historical.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any-expected.txt
>new file mode 100644
>index 00000000000..6ba2927cb7b
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any-expected.txt
>@@ -0,0 +1,4 @@
>+CONSOLE MESSAGE: line 5: ReferenceError: Can't find variable: idl_test
>+
>+FAIL Untitled ReferenceError: Can't find variable: idl_test
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any.worker.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.js
>new file mode 100644
>index 00000000000..f36f0ce0296
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.js
>@@ -0,0 +1,20 @@
>+// META: global=sharedworker
>+// META: script=/resources/WebIDLParser.js
>+// META: script=/resources/idlharness.js
>+
>+idl_test(
>+  ['xhr'],
>+  ['dom', 'html'],
>+  idl_array => {
>+    idl_array.add_objects({
>+      XMLHttpRequest: ['new XMLHttpRequest()'],
>+      XMLHttpRequestUpload: ['(new XMLHttpRequest()).upload'],
>+      FormData: ['new FormData()'],
>+      ProgressEvent: ['new ProgressEvent("type")'],
>+    });
>+    if (self.Window) {
>+      self.form = document.createElement('form');
>+      idl_array.add_objects({ FormData: ['new FormData(form)'] });
>+    }
>+  }
>+);
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.worker-expected.txt
>new file mode 100644
>index 00000000000..e0e16cc7057
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.worker-expected.txt
>@@ -0,0 +1,5 @@
>+CONSOLE MESSAGE: line 1774: TypeError: null is not an object (evaluating 'this.message_target.removeEventListener')
>+CONSOLE MESSAGE: line 5: ReferenceError: Can't find variable: idl_test
>+
>+FAIL Untitled ReferenceError: Can't find variable: idl_test
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.worker.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.worker.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/interfaces-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/interfaces-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/interfaces-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/interfaces-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/interfaces.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/interfaces.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/interfaces.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/interfaces.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/loadstart-and-state-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/loadstart-and-state-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/loadstart-and-state-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/loadstart-and-state-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/loadstart-and-state.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/loadstart-and-state.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/loadstart-and-state.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/loadstart-and-state.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/no-utf16-json-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/no-utf16-json-expected.txt
>new file mode 100644
>index 00000000000..bc0274d913a
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/no-utf16-json-expected.txt
>@@ -0,0 +1,3 @@
>+
>+FAIL JSON asa UTF-16 with BOM should decode as UTF-8 (and, therefore, fail) assert_equals: expected null but got object "[object Object]"
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/no-utf16-json.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/no-utf16-json.htm
>new file mode 100644
>index 00000000000..03bbc108047
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/no-utf16-json.htm
>@@ -0,0 +1,19 @@
>+<!doctype html>
>+<meta charset=utf-8>
>+<title>XMLHttpRequest: responseType "json" should be decoded as UTF-8 even when there's a UTF-16 BOM</title>
>+<script src="/resources/testharness.js"></script>
>+<script src="/resources/testharnessreport.js"></script>
>+    <link rel="help" href="https://infra.spec.whatwg.org/#parse-json-from-bytes" data-tested-assertations="following::ol/li[1]" />
>+<div id="log"></div>
>+
>+<script>
>+  async_test(function() {
>+    var client = new XMLHttpRequest();
>+    client.responseType = 'json';
>+    client.onload = this.step_func_done(function(e) {
>+      assert_equals(client.response, null);
>+    });
>+    client.open("GET", "resources/utf16-bom.json");
>+    client.send(null);
>+  }, 'JSON asa UTF-16 with BOM should decode as UTF-8 (and, therefore, fail)');
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-after-abort-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-after-abort-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-after-abort-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-after-abort-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-after-abort.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-after-abort.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-after-abort.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-after-abort.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-after-setrequestheader-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-after-setrequestheader-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-after-setrequestheader-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-after-setrequestheader-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-after-setrequestheader.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-after-setrequestheader.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-after-setrequestheader.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-after-setrequestheader.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-event-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-event-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-event-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-event-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-event.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-event.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-event.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-event.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-processing-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-processing-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-processing-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-processing-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-processing.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-processing.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort-processing.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-processing.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-during-abort.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-bogus-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-bogus-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-bogus-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-bogus-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-bogus.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-bogus.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-bogus.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-bogus.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-case-insensitive-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-case-insensitive-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-case-insensitive-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-case-insensitive-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-case-insensitive.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-case-insensitive.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-case-insensitive.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-case-insensitive.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-case-sensitive-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-case-sensitive-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-case-sensitive-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-case-sensitive-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-case-sensitive.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-case-sensitive.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-case-sensitive.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-case-sensitive.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-insecure-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-insecure-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-insecure-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-insecure-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-insecure.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-insecure.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-insecure.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-insecure.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-responsetype-set-sync-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-responsetype-set-sync-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-responsetype-set-sync-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-responsetype-set-sync-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-responsetype-set-sync.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-responsetype-set-sync.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-method-responsetype-set-sync.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-responsetype-set-sync.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-open-send-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-open-send-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-open-send-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-open-send-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-open-send.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-open-send.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-open-send.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-open-send.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-open-sync-send-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-open-sync-send-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-open-sync-send-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-open-sync-send-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-open-sync-send.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-open-sync-send.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-open-sync-send.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-open-sync-send.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/open-parameters-toString-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-parameters-toString-expected.txt
>new file mode 100644
>index 00000000000..4fe3f85d1c5
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-parameters-toString-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS XMLHttpRequest: open() attempts to toString its string parameters 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/open-parameters-toString.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-parameters-toString.htm
>new file mode 100644
>index 00000000000..c059482cbf6
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-parameters-toString.htm
>@@ -0,0 +1,54 @@
>+<!doctype html>
>+<title>XMLHttpRequest: open() attempts to toString its string parameters</title>
>+<script src="/resources/testharness.js"></script>
>+<script src="/resources/testharnessreport.js"></script>
>+<div id="log"></div>
>+<script>
>+test(() => {
>+  let log = [];
>+  let expected = [
>+    'method',
>+    'url',
>+    // NOTE: 'async' intentionally missing
>+    'username',
>+    'password',
>+  ];
>+
>+  let xhr = new XMLHttpRequest;
>+  xhr.open(
>+    {
>+      toString() {
>+        log.push('method');
>+        return 'get';
>+      },
>+    },
>+    {
>+      toString() {
>+        log.push('url');
>+        return location.href;
>+      },
>+    },
>+    // NOTE: ToBoolean should not invoke valueOf
>+    {
>+      valueOf() {
>+        log.push('async');
>+        return true;
>+      },
>+    },
>+    {
>+      toString() {
>+        log.push('username');
>+        return 'username';
>+      },
>+    },
>+    {
>+      toString() {
>+        log.push('password');
>+        return 'password';
>+      },
>+    }
>+  );
>+
>+  assert_array_equals(log, expected);
>+});
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-referer-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-referer-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-referer-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-referer-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-referer.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-referer.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-referer.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-referer.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-send-during-abort-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-send-during-abort-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-send-during-abort-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-send-during-abort-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-send-during-abort.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-send-during-abort.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-send-during-abort.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-send-during-abort.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-send-open-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-send-open-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-send-open-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-send-open-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-send-open.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-send-open.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-send-open.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-send-open.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-sync-open-send-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-sync-open-send-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-sync-open-send-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-sync-open-send-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-sync-open-send.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-sync-open-send.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-sync-open-send.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-sync-open-send.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-about-blank-window-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-about-blank-window-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-about-blank-window-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-about-blank-window-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-about-blank-window.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-about-blank-window.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-about-blank-window.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-about-blank-window.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-inserted-after-open-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-inserted-after-open-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-inserted-after-open-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-inserted-after-open-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-inserted-after-open.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-inserted-after-open.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-inserted-after-open.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-inserted-after-open.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-inserted-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-inserted-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-inserted-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-inserted-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-inserted.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-inserted.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base-inserted.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-inserted.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-base.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-bogus-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-bogus-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-bogus-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-bogus-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-bogus.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-bogus.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-bogus.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-bogus.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-encoding-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-encoding-expected.txt
>new file mode 100644
>index 00000000000..faee0dc473f
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-encoding-expected.txt
>@@ -0,0 +1,4 @@
>+
>+PASS percent encode characters 
>+FAIL lone surrogate assert_equals: expected "%26%2365533%3B" but got "%26%2355357%3B"
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-encoding.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-encoding.htm
>similarity index 78%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-encoding.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-encoding.htm
>index 7acdac86ad6..5155a57d65a 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-encoding.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-encoding.htm
>@@ -5,7 +5,6 @@
>     <title>XMLHttpRequest: open() - URL encoding</title>
>     <script src="/resources/testharness.js"></script>
>     <script src="/resources/testharnessreport.js"></script>
>-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[7] following::ol/li[14]/ul/li[2]" />
>   </head>
>   <body>
>     <div id="log"></div>
>@@ -14,14 +13,14 @@
>         var client = new XMLHttpRequest()
>         client.open("GET", "resources/content.py?\u00DF", false) // This is the German "eszett" character
>         client.send()
>-        assert_equals(client.getResponseHeader("x-request-query"), "%C3%9F")
>+        assert_equals(client.getResponseHeader("x-request-query"), "%DF")
>       }, "percent encode characters");
>       test(function() {
>         var client = new XMLHttpRequest()
>         client.open("GET", "resources/content.py?\uD83D", false)
>         client.send()
>-        assert_equals(client.getResponseHeader("x-request-query"), "%EF%BF%BD")
>-      }, "lone surrogate should return U+FFFD");
>+        assert_equals(client.getResponseHeader("x-request-query"), "%26%2365533%3B");
>+      }, "lone surrogate");
>     </script>
>   </body>
> </html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-fragment-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-fragment-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-fragment-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-fragment-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-fragment.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-fragment.htm
>similarity index 82%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-fragment.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-fragment.htm
>index 6b3fdeb8ae8..03f4016797c 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-fragment.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-fragment.htm
>@@ -19,19 +19,19 @@
>         var client = new XMLHttpRequest()
>         client.open("GET", "resources/requri.py#foobar", false)
>         client.send(null)
>-        assert_regexp_match(client.responseText, /XMLHttpRequest\/resources\/requri\.py$/)
>+        assert_regexp_match(client.responseText, /xhr\/resources\/requri\.py$/)
>       }, 'make sure fragment is removed from URL before request')
>       test(function() {
>         var client = new XMLHttpRequest()
>         client.open("GET", "resources/requri.py?help=#foobar", false)
>         client.send(null)
>-        assert_regexp_match(client.responseText, /XMLHttpRequest\/resources\/requri\.py\?help=$/)
>+        assert_regexp_match(client.responseText, /xhr\/resources\/requri\.py\?help=$/)
>       }, 'make sure fragment is removed from URL before request (with query string)')
>       test(function() {
>         var client = new XMLHttpRequest()
>         client.open("GET", "resources/requri.py?" +encodeURIComponent("#foobar"), false)
>         client.send(null)
>-        assert_regexp_match(client.responseText, /XMLHttpRequest\/resources\/requri\.py\?%23foobar$/)
>+        assert_regexp_match(client.responseText, /xhr\/resources\/requri\.py\?%23foobar$/)
>       }, 'make sure escaped # is not removed')
>     </script>
>   </body>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-javascript-window-2-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-javascript-window-2-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-javascript-window-2-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-javascript-window-2-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-javascript-window-2.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-javascript-window-2.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-javascript-window-2.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-javascript-window-2.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-javascript-window-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-javascript-window-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-javascript-window-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-javascript-window-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-javascript-window.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-javascript-window.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-javascript-window.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-javascript-window.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-2-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-2-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-2-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-2-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-2.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-2.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-2.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-2.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-3-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-3-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-3-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-3-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-3.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-3.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-3.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-3.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-4-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-4-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-4-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-4-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-4.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-4.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-4.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-4.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-5-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-5-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-5-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-5-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-5.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-5.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-5.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-5.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-6-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-6-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-6-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-6-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-6.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-6.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-6.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-6.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-sharedworker-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-sharedworker-origin-expected.txt
>new file mode 100644
>index 00000000000..a74debc6ab6
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-sharedworker-origin-expected.txt
>@@ -0,0 +1,4 @@
>+CONSOLE MESSAGE: line 10: ReferenceError: Can't find variable: SharedWorker
>+
>+FAIL XMLHttpRequest: redirected classic shared worker scripts, origin and referrer ReferenceError: Can't find variable: SharedWorker
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-sharedworker-origin.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-sharedworker-origin.htm
>new file mode 100644
>index 00000000000..02699919585
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-sharedworker-origin.htm
>@@ -0,0 +1,11 @@
>+<!DOCTYPE html>
>+<meta charset="utf-8">
>+<title>XMLHttpRequest: redirected classic shared worker scripts, origin and referrer</title>
>+<script src="/resources/testharness.js"></script>
>+<script src="/resources/testharnessreport.js"></script>
>+<div id="log"></div>
>+<script>
>+var finalWorkerURL = "workerxhr-origin-referrer.js";
>+var url = "resources/redirect.py?location=" + encodeURIComponent(finalWorkerURL);
>+fetch_tests_from_worker(new SharedWorker(url));
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-worker-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-worker-origin-expected.txt
>new file mode 100644
>index 00000000000..c5d8fb1fa0d
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-worker-origin-expected.txt
>@@ -0,0 +1,6 @@
>+Blocked access to external URL http://www2.localhost:8800/xhr/resources/inspect-headers.py?filter_name=origin&cors
>+
>+FAIL Referer header assert_equals: expected "Referer: http://localhost:8800/xhr/resources/workerxhr-origin-referrer.js\n" but got "Referer: http://localhost:8800/xhr/resources/redirect.py?location=workerxhr-origin-referrer.js\n"
>+FAIL Origin header assert_equals: expected "Origin: http://localhost:8800\n" but got ""
>+PASS Request URL test 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-redirected-worker-origin.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-worker-origin.htm
>similarity index 79%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-redirected-worker-origin.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-worker-origin.htm
>index e5e5a4e8ecf..a0e064840f4 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-redirected-worker-origin.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-worker-origin.htm
>@@ -1,6 +1,6 @@
> <!DOCTYPE html>
> <meta charset="utf-8">
>-<title>XMLHttpRequest: redirected worker scripts, origin and referrer</title>
>+<title>XMLHttpRequest: redirected classic dedicated worker scripts, origin and referrer</title>
> <script src="/resources/testharness.js"></script>
> <script src="/resources/testharnessreport.js"></script>
> <div id="log"></div>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-origin-expected.txt
>similarity index 51%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-origin-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-origin-expected.txt
>index 3723c68f812..0f4b78e40d8 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-origin-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-origin-expected.txt
>@@ -1,4 +1,4 @@
>-Blocked access to external URL http://www2.localhost:8800/XMLHttpRequest/resources/inspect-headers.py?filter_name=origin&cors
>+Blocked access to external URL http://www2.localhost:8800/xhr/resources/inspect-headers.py?filter_name=origin&cors
> 
> PASS Referer header 
> FAIL Origin header assert_equals: expected "Origin: http://localhost:8800\n" but got ""
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-origin.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-origin.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-origin.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-origin.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-simple-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-simple-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-simple-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-simple-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-simple.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-simple.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-simple.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-simple.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-user-password-non-same-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-user-password-non-same-origin-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-user-password-non-same-origin-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-user-password-non-same-origin-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-user-password-non-same-origin.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/open-user-password-non-same-origin.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/open-user-password-non-same-origin.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/open-user-password-non-same-origin.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob-expected.txt
>new file mode 100644
>index 00000000000..4be74486caa
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob-expected.txt
>@@ -0,0 +1,5 @@
>+
>+FAIL Use text/xml as fallback MIME type assert_equals: expected "text/xml" but got ""
>+PASS Use text/xml as fallback MIME type, 2 
>+FAIL Loading dataâ¦ promise_test: Unhandled rejection with value: object "TypeError: undefined is not a function (near '...tests.forEach...')"
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob.html
>new file mode 100644
>index 00000000000..db4b880d1ac
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob.html
>@@ -0,0 +1,56 @@
>+<!doctype html>
>+<title>XMLHttpRequest: overrideMimeType() and responseType = "blob"</title>
>+<meta charset="utf-8">
>+<script src="/resources/testharness.js"></script>
>+<script src="/resources/testharnessreport.js"></script>
>+<div id="log"></div>
>+<script>
>+async_test(t => {
>+  const client = new XMLHttpRequest();
>+  client.onload = t.step_func_done(() => {
>+    assert_equals(client.getResponseHeader("Content-Type"), "");
>+    assert_equals(client.response.type, "text/xml");
>+  });
>+  client.open("GET", "resources/status.py");
>+  client.responseType = "blob";
>+  client.send();
>+}, "Use text/xml as fallback MIME type");
>+
>+async_test(t => {
>+  const client = new XMLHttpRequest();
>+  client.onload = t.step_func_done(() => {
>+    assert_equals(client.getResponseHeader("Content-Type"), "");
>+    assert_equals(client.response.type, "text/xml");
>+  })
>+  client.open("GET", "resources/status.py?content=thisshouldnotmakeadifferencebutdoes");
>+  client.responseType = "blob";
>+  client.send();
>+}, "Use text/xml as fallback MIME type, 2");
>+
>+promise_test(() => {
>+  // Don't load generated-mime-types.json as sending them all over the network would be prohibitive
>+  return fetch("../mimesniff/mime-types/resources/mime-types.json").then(res => res.json()).then(runTests);
>+}, "Loading dataâ¦");
>+
>+function runTests(tests) {
>+  let index = 0;
>+  tests.forEach((val) => {
>+    if(typeof val === "string") {
>+      return;
>+    }
>+    index++;
>+    async_test(t => {
>+      const client = new XMLHttpRequest(),
>+            expectedOutput = val.output !== null ? val.output : "application/octet-stream";
>+      client.onload = t.step_func_done(() => {
>+        assert_equals(client.getResponseHeader("Content-Type"), "");
>+        assert_equals(client.response.type, expectedOutput);
>+      });
>+      client.open("GET", "resources/status.py");
>+      client.responseType = "blob";
>+      client.overrideMimeType(val.input);
>+      client.send();
>+    }, index + ") MIME types need to be parsed and serialized: " + val.input);
>+  });
>+}
>+</script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-done-state-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-done-state-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.worker-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.js
>new file mode 100644
>index 00000000000..bdf49e1ca52
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.js
>@@ -0,0 +1,20 @@
>+// META title= XMLHttpRequest: overrideMimeType() in DONE state</title>
>+
>+/**
>+ * Spec: <https://xhr.spec.whatwg.org/#the-overridemimetype()-method>; data-tested-assertations="/following::ol/li[1]"
>+ */
>+var test = async_test();
>+var client = new XMLHttpRequest();
>+client.onreadystatechange = test.step_func( function() {
>+  if (client.readyState !== 4) return;
>+  var text = client.responseText;
>+  assert_not_equals(text, "");
>+  assert_throws("InvalidStateError", function() { client.overrideMimeType('application/xml;charset=Shift-JIS'); });
>+  if (GLOBAL.isWindow()) {
>+    assert_equals(client.responseXML, null);
>+  }
>+  assert_equals(client.responseText, text);
>+  test.done();
>+});
>+client.open("GET", "resources/status.py?type="+encodeURIComponent('text/plain;charset=iso-8859-1')+'&content=%3Cmsg%3E%83%65%83%58%83%67%3C%2Fmsg%3E');
>+client.send();
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.worker-expected.txt
>new file mode 100644
>index 00000000000..c2c15e0b8a0
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.worker-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS Untitled 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.worker.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.worker.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-done-state.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-done-state.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-edge-cases.window-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-edge-cases.window-expected.txt
>new file mode 100644
>index 00000000000..ee09a112a6a
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-edge-cases.window-expected.txt
>@@ -0,0 +1,5 @@
>+
>+FAIL overrideMimeType() state needs to be reset across requests assert_equals: expected "ÃÃ°" but got "\ufffd\ufffd"
>+PASS If charset is not overridden by overrideMimeType() the original continues to be used 
>+FAIL Charset can be overridden by overrideMimeType() with a bogus charset assert_equals: expected "\ufffd\ufffd" but got "ÃÃ°"
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-edge-cases.window.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-edge-cases.window.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-edge-cases.window.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-edge-cases.window.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-edge-cases.window.js
>new file mode 100644
>index 00000000000..192a696759c
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-edge-cases.window.js
>@@ -0,0 +1,40 @@
>+const testURL = "resources/status.py?type=" + encodeURIComponent("text/plain;charset=windows-1252") + "&content=%C2%F0";
>+
>+async_test(t => {
>+  const client = new XMLHttpRequest();
>+  let secondTime = false;
>+  client.onload = t.step_func(() => {
>+    if(!secondTime) {
>+      assert_equals(client.responseText, "\uFFFD\uFFFD");
>+      secondTime = true;
>+      client.open("GET", testURL);
>+      client.send();
>+    } else {
>+      assert_equals(client.responseText, "ÃÃ°");
>+      t.done();
>+    }
>+  });
>+  client.open("GET", testURL);
>+  client.overrideMimeType("text/plain;charset=UTF-8")
>+  client.send();
>+}, "overrideMimeType() state needs to be reset across requests");
>+
>+async_test(t => {
>+  const client = new XMLHttpRequest();
>+  client.onload = t.step_func_done(() => {
>+    assert_equals(client.responseText, "ÃÃ°")
>+  });
>+  client.open("GET", testURL);
>+  client.overrideMimeType("text/xml");
>+  client.send();
>+}, "If charset is not overridden by overrideMimeType() the original continues to be used");
>+
>+async_test(t => {
>+  const client = new XMLHttpRequest();
>+  client.onload = t.step_func_done(() => {
>+    assert_equals(client.responseText, "\uFFFD\uFFFD")
>+  });
>+  client.open("GET", testURL);
>+  client.overrideMimeType("text/plain;charset=342");
>+  client.send();
>+}, "Charset can be overridden by overrideMimeType() with a bogus charset");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-headers-received-state-force-shiftjis-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-headers-received-state-force-shiftjis-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-headers-received-state-force-shiftjis.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-headers-received-state-force-shiftjis.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-invalid-mime-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-invalid-mime-type-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-invalid-mime-type-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-invalid-mime-type-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-invalid-mime-type.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-invalid-mime-type.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-invalid-mime-type.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-invalid-mime-type.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-loading-state-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-loading-state-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-loading-state-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-loading-state-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-loading-state.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-loading-state.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-loading-state.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-loading-state.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-open-state-force-utf-8-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-open-state-force-utf-8-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-open-state-force-utf-8-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-open-state-force-utf-8-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-open-state-force-utf-8.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-open-state-force-utf-8.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-open-state-force-xml-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-open-state-force-xml-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-open-state-force-xml-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-open-state-force-xml-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-open-state-force-xml.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-open-state-force-xml.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-open-state-force-xml.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-open-state-force-xml.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/preserve-ua-header-on-redirect-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/preserve-ua-header-on-redirect-expected.txt
>new file mode 100644
>index 00000000000..4072e4b3778
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/preserve-ua-header-on-redirect-expected.txt
>@@ -0,0 +1,4 @@
>+
>+PASS XMLHttpRequest: User-Agent header is preserved on redirect 
>+FAIL XMLHttpRequest: User-Agent header is preserved on redirect 1 assert_equals: expected "User-Agent: TEST\n" but got "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14) AppleWebKit/605.1.15 (KHTML, like Gecko)\n"
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/preserve-ua-header-on-redirect.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/preserve-ua-header-on-redirect.htm
>new file mode 100644
>index 00000000000..fad883c1ef0
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/preserve-ua-header-on-redirect.htm
>@@ -0,0 +1,43 @@
>+<!doctype html>
>+<html>
>+  <head>
>+    <title>XMLHttpRequest: User-Agent header is preserved on redirect</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+  </head>
>+  <body>
>+    <div id="log"></div>
>+    <script>
>+      var test = async_test()
>+      test.step(function() {
>+        var client = new XMLHttpRequest()
>+          client.onreadystatechange = function() {
>+            test.step(function() {
>+              if(client.readyState == 4) {
>+                assert_equals(client.responseText, 'User-Agent: '+navigator.userAgent+'\n')
>+                test.done()
>+              }
>+            })
>+          }
>+        client.open("POST", "resources/redirect.py?location="+encodeURIComponent("inspect-headers.py?filter_name=user-agent"))
>+        client.send(null)
>+      })
>+
>+      var test2 = async_test()
>+      test2.step(function() {
>+        var client = new XMLHttpRequest()
>+          client.onreadystatechange = function() {
>+            test2.step(function() {
>+              if(client.readyState == 4) {
>+                assert_equals(client.responseText, 'User-Agent: TEST\n')
>+                test2.done()
>+              }
>+            })
>+          }
>+        client.open("POST", "resources/redirect.py?location="+encodeURIComponent("inspect-headers.py?filter_name=user-agent"))
>+        client.setRequestHeader("User-Agent", "TEST")
>+        client.send(null)
>+      })
>+    </script>
>+  </body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progress-events-response-data-gzip-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/progress-events-response-data-gzip-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progress-events-response-data-gzip-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/progress-events-response-data-gzip-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progress-events-response-data-gzip.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/progress-events-response-data-gzip.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progress-events-response-data-gzip.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/progress-events-response-data-gzip.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progressevent-constructor-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/progressevent-constructor-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progressevent-constructor-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/progressevent-constructor-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progressevent-constructor.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/progressevent-constructor.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progressevent-constructor.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/progressevent-constructor.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progressevent-interface-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/progressevent-interface-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progressevent-interface-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/progressevent-interface-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progressevent-interface.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/progressevent-interface.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/progressevent-interface.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/progressevent-interface.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/readme.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/readme.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/readme.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/readme.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/accept-language.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/accept-language.py
>similarity index 99%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/accept-language.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/accept-language.py
>index e0fd30c1195..dd00f4b2ee7 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/accept-language.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/accept-language.py
>@@ -1,4 +1,3 @@
> def main(request, response):
>     return [("Content-Type", "text/plain"),
>             request.headers.get("Accept-Language", "NO")]
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/accept.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/accept.py
>new file mode 100644
>index 00000000000..a033ebec646
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/accept.py
>@@ -0,0 +1,2 @@
>+def main(request, response):
>+    return [("Content-Type", "text/plain")], request.headers.get("accept", "NO")
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-allow-lists.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-allow-lists.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-allow-lists.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-allow-lists.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-allow-with-body.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-allow-with-body.py
>new file mode 100644
>index 00000000000..7c7f45c6901
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-allow-with-body.py
>@@ -0,0 +1,15 @@
>+def main(request, response):
>+    headers = {
>+        "Cache-Control": "no-store",
>+        "Access-Control-Allow-Headers": "X-Requested-With",
>+        "Access-Control-Max-Age": 0,
>+        "Access-Control-Allow-Origin": "*",
>+        "Access-Control-Allow-Methods": "*",
>+        "Vary": "Accept-Encoding",
>+        "Content-Type": "text/plain"
>+    }
>+
>+    for (name, value) in headers.items():
>+        response.headers.set(name, value)
>+
>+    response.content = "PASS"
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-auth-basic.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-auth-basic.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-auth-basic.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-auth-basic.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-allow-no-credentials.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-allow-no-credentials.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-allow-no-credentials.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-allow-no-credentials.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-allow-star.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-allow-star.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-allow-star.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-allow-star.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-allow.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-allow.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-allow.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-allow.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-cors-safelisted-request-headers.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-cors-safelisted-request-headers.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-cors-safelisted-request-headers.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-cors-safelisted-request-headers.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-denied.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-denied.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-denied.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-denied.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-options-not-supported.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-options-not-supported.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-options-not-supported.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-options-not-supported.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-preflight-cache-invalidation.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-preflight-cache-invalidation.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-preflight-cache-timeout.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-preflight-cache-timeout.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-preflight-cache-timeout.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-preflight-cache-timeout.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-preflight-cache.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-preflight-cache.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-preflight-cache.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-preflight-cache.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-put-allow.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-put-allow.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-basic-put-allow.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-put-allow.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-whitelist-response-headers.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-whitelist-response-headers.py
>new file mode 100644
>index 00000000000..4dac7533197
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-whitelist-response-headers.py
>@@ -0,0 +1,19 @@
>+def main(request, response):
>+    headers = {
>+        # CORS-safelisted
>+        "content-type": "text/plain",
>+        "cache-control": "no cache",
>+        "content-language": "en",
>+        "expires": "Fri, 30 Oct 1998 14:19:41 GMT",
>+        "last-modified": "Tue, 15 Nov 1994 12:45:26 GMT",
>+        "pragma": "no-cache",
>+
>+        # Non-CORS-safelisted
>+        "x-test": "foobar",
>+
>+        "Access-Control-Allow-Origin": "*"
>+    }
>+    for header in headers:
>+        response.headers.set(header, headers[header])
>+
>+    response.content = "PASS: Cross-domain access allowed."
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-cookie.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-cookie.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-cookie.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-cookie.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-origin-header.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-origin-header.py
>similarity index 55%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-origin-header.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-origin-header.py
>index e7b95e95fd4..f5128776d2b 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-origin-header.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-origin-header.py
>@@ -1,9 +1,9 @@
> #!/usr/bin/env python
> def main(request, response):
>-    response.headers.set("Content-Type", "text/plain");
>-    response.headers.set("Cache-Control", "no-cache, no-store");
>-    response.headers.set("Access-Control-Allow-External", "true");
>-    response.headers.set("Access-Control-Allow-Origin", "*");
>+    response.headers.set("Content-Type", "text/plain")
>+    response.headers.set("Cache-Control", "no-cache, no-store")
>+    response.headers.set("Access-Control-Allow-External", "true")
>+    response.headers.set("Access-Control-Allow-Origin", "*")
> 
>     response.content = "PASS: Cross-domain access allowed.\n"
>-    response.content += "HTTP_ORIGIN: " + request.headers.get("origin");
>+    response.content += "HTTP_ORIGIN: " + request.headers.get("origin")
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-denied.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-denied.py
>similarity index 99%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-denied.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-denied.py
>index fd221a6248b..889ee6b0eca 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-denied.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-denied.py
>@@ -47,4 +47,3 @@ def main(request, response):
>     else:
>         resetState(token)
>         fail("Unknown Error.")
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-header-lowercase.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-header-lowercase.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-header-lowercase.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-header-lowercase.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-header-sorted.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-header-sorted.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-header-sorted.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-header-sorted.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-headers-origin.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-headers-origin.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-headers-origin.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-headers-origin.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-invalid-status.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-invalid-status.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-must-not-contain-cookie.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-must-not-contain-cookie.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-preflight-request-must-not-contain-cookie.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-must-not-contain-cookie.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-sandboxed-iframe.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-sandboxed-iframe.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/access-control-sandboxed-iframe.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-sandboxed-iframe.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth1/auth.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth1/auth.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth1/auth.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth1/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth1/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth1/w3c-import.log
>new file mode 100644
>index 00000000000..6c16c4d760a
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth1/w3c-import.log
>@@ -0,0 +1,17 @@
>+The tests in this directory were imported from the W3C repository.
>+Do NOT modify these tests directly in WebKit.
>+Instead, create a pull request on the WPT github:
>+	https://github.com/web-platform-tests/wpt
>+
>+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>+
>+Do NOT modify or remove this file.
>+
>+------------------------------------------------------------------------
>+Properties requiring vendor prefixes:
>+None
>+Property values requiring vendor prefixes:
>+None
>+------------------------------------------------------------------------
>+List of files:
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth1/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth2/auth.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth2/auth.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth2/auth.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth2/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth2/corsenabled.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth2/corsenabled.py
>similarity index 59%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth2/corsenabled.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth2/corsenabled.py
>index c8e230078f7..b06bd3d9aac 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth2/corsenabled.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth2/corsenabled.py
>@@ -1,13 +1,16 @@
> import imp
> import os
> 
>+here = os.path.dirname(__file__)
>+
>+
> def main(request, response):
>-    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"));
>-    response.headers.set('Access-Control-Allow-Credentials', 'true');
>-    response.headers.set('Access-Control-Allow-Methods', 'GET');
>-    response.headers.set('Access-Control-Allow-Headers', 'authorization, x-user, x-pass');
>-    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user');
>-    auth = imp.load_source("", os.path.abspath("XMLHttpRequest/resources/authentication.py"))
>+    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"))
>+    response.headers.set('Access-Control-Allow-Credentials', 'true')
>+    response.headers.set('Access-Control-Allow-Methods', 'GET')
>+    response.headers.set('Access-Control-Allow-Headers', 'authorization, x-user, x-pass')
>+    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user')
>+    auth = imp.load_source("", os.path.abspath(os.path.join(here, os.pardir, "authentication.py")))
>     if request.method == "OPTIONS":
>         return ""
>     else:
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth2/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth2/w3c-import.log
>new file mode 100644
>index 00000000000..a964fe7bf4a
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth2/w3c-import.log
>@@ -0,0 +1,18 @@
>+The tests in this directory were imported from the W3C repository.
>+Do NOT modify these tests directly in WebKit.
>+Instead, create a pull request on the WPT github:
>+	https://github.com/web-platform-tests/wpt
>+
>+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>+
>+Do NOT modify or remove this file.
>+
>+------------------------------------------------------------------------
>+Properties requiring vendor prefixes:
>+None
>+Property values requiring vendor prefixes:
>+None
>+------------------------------------------------------------------------
>+List of files:
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth2/auth.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth2/corsenabled.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth3/auth.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth3/auth.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth3/auth.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth3/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth3/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth3/w3c-import.log
>new file mode 100644
>index 00000000000..471f848224b
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth3/w3c-import.log
>@@ -0,0 +1,17 @@
>+The tests in this directory were imported from the W3C repository.
>+Do NOT modify these tests directly in WebKit.
>+Instead, create a pull request on the WPT github:
>+	https://github.com/web-platform-tests/wpt
>+
>+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>+
>+Do NOT modify or remove this file.
>+
>+------------------------------------------------------------------------
>+Properties requiring vendor prefixes:
>+None
>+Property values requiring vendor prefixes:
>+None
>+------------------------------------------------------------------------
>+List of files:
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth3/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth4/auth.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth4/auth.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth4/auth.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth4/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth4/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth4/w3c-import.log
>new file mode 100644
>index 00000000000..44290bcf56c
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth4/w3c-import.log
>@@ -0,0 +1,17 @@
>+The tests in this directory were imported from the W3C repository.
>+Do NOT modify these tests directly in WebKit.
>+Instead, create a pull request on the WPT github:
>+	https://github.com/web-platform-tests/wpt
>+
>+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>+
>+Do NOT modify or remove this file.
>+
>+------------------------------------------------------------------------
>+Properties requiring vendor prefixes:
>+None
>+Property values requiring vendor prefixes:
>+None
>+------------------------------------------------------------------------
>+List of files:
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth4/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth5/auth.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth5/auth.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth5/auth.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth5/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth1/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth5/w3c-import.log
>similarity index 80%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth1/w3c-import.log
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth5/w3c-import.log
>index f656b922255..7d0ea474ae0 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth1/w3c-import.log
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth5/w3c-import.log
>@@ -1,7 +1,7 @@
> The tests in this directory were imported from the W3C repository.
> Do NOT modify these tests directly in WebKit.
> Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>+	https://github.com/web-platform-tests/wpt
> 
> Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
> 
>@@ -14,4 +14,4 @@ Property values requiring vendor prefixes:
> None
> ------------------------------------------------------------------------
> List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth1/auth.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth5/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth6/auth.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth6/auth.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth6/auth.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth6/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth3/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth6/w3c-import.log
>similarity index 80%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth3/w3c-import.log
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth6/w3c-import.log
>index 5e60bde3ffc..3c8f3866374 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth3/w3c-import.log
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth6/w3c-import.log
>@@ -1,7 +1,7 @@
> The tests in this directory were imported from the W3C repository.
> Do NOT modify these tests directly in WebKit.
> Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>+	https://github.com/web-platform-tests/wpt
> 
> Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
> 
>@@ -14,4 +14,4 @@ Property values requiring vendor prefixes:
> None
> ------------------------------------------------------------------------
> List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth3/auth.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth6/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth7/corsenabled.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth7/corsenabled.py
>similarity index 58%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth7/corsenabled.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth7/corsenabled.py
>index ce22697390d..998922d0760 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth7/corsenabled.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth7/corsenabled.py
>@@ -1,20 +1,18 @@
> import imp
> import os
> 
>+here = os.path.dirname(__file__)
>+
> def main(request, response):
>-    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"));
>-    response.headers.set('Access-Control-Allow-Credentials', 'true');
>-    response.headers.set('Access-Control-Allow-Methods', 'GET');
>-    response.headers.set('Access-Control-Allow-Headers', 'authorization, x-user, x-pass');
>-    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user');
>-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
>-                                            "XMLHttpRequest",
>-                                            "resources",
>+    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"))
>+    response.headers.set('Access-Control-Allow-Credentials', 'true')
>+    response.headers.set('Access-Control-Allow-Methods', 'GET')
>+    response.headers.set('Access-Control-Allow-Headers', 'authorization, x-user, x-pass')
>+    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user')
>+    auth = imp.load_source("", os.path.join(here,
>+                                            os.pardir,
>                                             "authentication.py"))
>     if request.method == "OPTIONS":
>         return ""
>     else:
>         return auth.main(request, response)
>-
>-
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth4/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth7/w3c-import.log
>similarity index 80%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth4/w3c-import.log
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth7/w3c-import.log
>index 066ba50bcf1..4f3943130fc 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth4/w3c-import.log
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth7/w3c-import.log
>@@ -1,7 +1,7 @@
> The tests in this directory were imported from the W3C repository.
> Do NOT modify these tests directly in WebKit.
> Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>+	https://github.com/web-platform-tests/wpt
> 
> Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
> 
>@@ -14,4 +14,4 @@ Property values requiring vendor prefixes:
> None
> ------------------------------------------------------------------------
> List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth4/auth.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth7/corsenabled.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth8/corsenabled-no-authorize.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth8/corsenabled-no-authorize.py
>similarity index 59%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth8/corsenabled-no-authorize.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth8/corsenabled-no-authorize.py
>index cb40efb081b..947422fbfc5 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth8/corsenabled-no-authorize.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth8/corsenabled-no-authorize.py
>@@ -1,20 +1,19 @@
> import imp
> import os
> 
>+here = os.path.dirname(__file__)
>+
>+
> def main(request, response):
>-    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"));
>-    response.headers.set('Access-Control-Allow-Credentials', 'true');
>-    response.headers.set('Access-Control-Allow-Methods', 'GET');
>-    response.headers.set('Access-Control-Allow-Headers', 'x-user, x-pass');
>-    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user');
>-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
>-                                            "XMLHttpRequest",
>-                                            "resources",
>+    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"))
>+    response.headers.set('Access-Control-Allow-Credentials', 'true')
>+    response.headers.set('Access-Control-Allow-Methods', 'GET')
>+    response.headers.set('Access-Control-Allow-Headers', 'x-user, x-pass')
>+    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user')
>+    auth = imp.load_source("", os.path.join(here,
>+                                            os.pardir,
>                                             "authentication.py"))
>     if request.method == "OPTIONS":
>         return ""
>     else:
>         return auth.main(request, response)
>-
>-
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth8/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth8/w3c-import.log
>new file mode 100644
>index 00000000000..cc6cea2dc38
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth8/w3c-import.log
>@@ -0,0 +1,17 @@
>+The tests in this directory were imported from the W3C repository.
>+Do NOT modify these tests directly in WebKit.
>+Instead, create a pull request on the WPT github:
>+	https://github.com/web-platform-tests/wpt
>+
>+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>+
>+Do NOT modify or remove this file.
>+
>+------------------------------------------------------------------------
>+Properties requiring vendor prefixes:
>+None
>+Property values requiring vendor prefixes:
>+None
>+------------------------------------------------------------------------
>+List of files:
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth8/corsenabled-no-authorize.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth9/auth.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth9/auth.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth9/auth.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth9/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth9/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth9/w3c-import.log
>new file mode 100644
>index 00000000000..d5126bf1675
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth9/w3c-import.log
>@@ -0,0 +1,17 @@
>+The tests in this directory were imported from the W3C repository.
>+Do NOT modify these tests directly in WebKit.
>+Instead, create a pull request on the WPT github:
>+	https://github.com/web-platform-tests/wpt
>+
>+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>+
>+Do NOT modify or remove this file.
>+
>+------------------------------------------------------------------------
>+Properties requiring vendor prefixes:
>+None
>+Property values requiring vendor prefixes:
>+None
>+------------------------------------------------------------------------
>+List of files:
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/auth9/auth.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/authentication.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/authentication.py
>similarity index 81%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/authentication.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/authentication.py
>index 4f65fa23d2c..f5bef5ba826 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/authentication.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/authentication.py
>@@ -1,9 +1,4 @@
> def main(request, response):
>-    if "logout" in request.GET:
>-        return ((401, "Unauthorized"),
>-                [("WWW-Authenticate", 'Basic realm="test"')],
>-                "Logged out, hopefully")
>-
>     session_user = request.auth.username
>     session_pass = request.auth.password
>     expected_user_name = request.headers.get("X-User", None)
>@@ -28,5 +23,4 @@ def main(request, response):
>         headers = [('XHR-USER', expected_user_name),
>                    ('SES-USER', session_user),
>                    ("X-challenge", challenge)]
>-        return headers, session_user + "\n" + session_pass;
>-
>+        return headers, session_user + "\n" + session_pass
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/base.xml b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/base.xml
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/base.xml
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/base.xml
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/chunked.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/chunked.py
>similarity index 75%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/chunked.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/chunked.py
>index 7e8433bd869..1e87c1ca561 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/chunked.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/chunked.py
>@@ -4,9 +4,9 @@ def main(request, response):
>               "Yet another (third) chunk\r\n",
>               "Yet another (fourth) chunk\r\n",
>               ]
>-    response.headers.set("Transfer-Encoding", "chunked");
>-    response.headers.set("Trailer", "X-Test-Me");
>-    response.headers.set("Content-Type", "text/plain");
>+    response.headers.set("Transfer-Encoding", "chunked")
>+    response.headers.set("Trailer", "X-Test-Me")
>+    response.headers.set("Content-Type", "text/plain")
>     response.write_status_headers()
> 
>     for value in chunks:
>@@ -15,4 +15,3 @@ def main(request, response):
>         response.writer.write("\r\n")
>     response.writer.write("0\r\n")
>     response.writer.write("X-Test-Me: Trailer header value\r\n\r\n")
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/conditional.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/conditional.py
>similarity index 94%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/conditional.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/conditional.py
>index 90bedf99529..5a11a31a4d6 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/conditional.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/conditional.py
>@@ -19,7 +19,7 @@ def main(request, response):
>         response.headers.set("Access-Control-Allow-Origin", "*")
> 
>     if ((match is not None and match == tag) or
>-        (modified is not None and modified == date)):
>+            (modified is not None and modified == date)):
>         response.status = (304, "SUPERCOOL")
>         return ""
>     else:
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/content.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/content.py
>similarity index 88%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/content.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/content.py
>index d7c62ab6d86..3786f3aa075 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/content.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/content.py
>@@ -2,7 +2,7 @@ def main(request, response):
>     response_ctype = ''
> 
>     if "response_charset_label" in request.GET:
>-      response_ctype = ";charset=" + request.GET.first("response_charset_label")
>+        response_ctype = ";charset=" + request.GET.first("response_charset_label")
> 
>     headers = [("Content-type", "text/plain" + response_ctype),
>                ("X-Request-Method", request.method),
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/corsenabled.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/corsenabled.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/corsenabled.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/corsenabled.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/delay.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/delay.py
>similarity index 88%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/delay.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/delay.py
>index 0fa1276f878..8f97db6f4fc 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/delay.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/delay.py
>@@ -2,6 +2,6 @@ import time
> 
> def main(request, response):
>     delay = float(request.GET.first("ms", 500))
>-    time.sleep(delay / 1E3);
>+    time.sleep(delay / 1E3)
> 
>     return [("Access-Control-Allow-Origin", "*"), ("Access-Control-Allow-Methods", "YO"), ("Content-type", "text/plain")], "TEST_DELAY"
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/echo-headers.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/echo-headers.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/echo-headers.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/echo-headers.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/echo-method.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/echo-method.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/echo-method.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/echo-method.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/empty-div-utf8-html.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/empty-div-utf8-html.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/empty-div-utf8-html.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/empty-div-utf8-html.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/folder.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/folder.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/folder.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/folder.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/form.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/form.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/form.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/form.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/gzip.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/gzip.py
>similarity index 97%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/gzip.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/gzip.py
>index 87dd5bec097..f17f92e4cc1 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/gzip.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/gzip.py
>@@ -9,7 +9,7 @@ def main(request, response):
> 
>     out = StringIO()
>     with gzip_module.GzipFile(fileobj=out, mode="w") as f:
>-      f.write(output)
>+        f.write(output)
>     output = out.getvalue()
> 
>     headers = [("Content-type", "text/plain"),
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/header-content-length.asis b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-content-length.asis
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/header-content-length.asis
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-content-length.asis
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-user-agent.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-user-agent.py
>new file mode 100644
>index 00000000000..4778de40268
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-user-agent.py
>@@ -0,0 +1,15 @@
>+def main(request, response):
>+    response.headers.set("Access-Control-Allow-Origin", "*")
>+    response.headers.set("Access-Control-Max-Age", 0)
>+    response.headers.set('Access-Control-Allow-Headers', "x-test")
>+
>+    if request.method == "OPTIONS":
>+        if not request.headers.get("User-Agent"):
>+            response.content = "FAIL: User-Agent header missing in preflight request."
>+            response.status = 400
>+    else:
>+        if request.headers.get("User-Agent"):
>+            response.content = "PASS"
>+        else:
>+            response.content = "FAIL: User-Agent header missing in request"
>+            response.status = 400
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/headers-basic.asis b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-basic.asis
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/headers-basic.asis
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-basic.asis
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/headers.asis b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers.asis
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/headers.asis
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers.asis
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/headers.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers.py
>similarity index 94%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/headers.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers.py
>index cefa8ee65f7..602db35a3cb 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/headers.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers.py
>@@ -1,4 +1,4 @@
>- # -*- coding: utf-8 -*-
>+# -*- coding: utf-8 -*-
> 
> def main(request, response):
>     response.headers.set("Content-Type", "text/plain")
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/image.gif b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/image.gif
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/image.gif
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/image.gif
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/img-utf8-html.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/img-utf8-html.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/img-utf8-html.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/img-utf8-html.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/img.jpg b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/img.jpg
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/img.jpg
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/img.jpg
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/infinite-redirects.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/infinite-redirects.py
>similarity index 93%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/infinite-redirects.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/infinite-redirects.py
>index 1ec0ae27dcf..a85c410218e 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/infinite-redirects.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/infinite-redirects.py
>@@ -2,9 +2,9 @@ def main(request, response):
>     location = "%s://%s%s" % (request.url_parts.scheme,
>                               request.url_parts.netloc,
>                               request.url_parts.path)
>-    page = "alternate";
>-    type = 302;
>-    mix = 0;
>+    page = "alternate"
>+    type = 302
>+    mix = 0
>     if request.GET.first("page", None) == "alternate":
>         page = "default"
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/init.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/init.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/init.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/init.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/inspect-headers.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/inspect-headers.py
>index a8f1258fa25..12dd33595f0 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/inspect-headers.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/inspect-headers.py
>@@ -15,7 +15,7 @@ def get_response(raw_headers, filter_value, filter_name):
>             if value == filter_value:
>                 result += name + ","
>         elif name.lower() == filter_name:
>-            result += name + ": " + value + "\n";
>+            result += name + ": " + value + "\n"
>     return result
> 
> def main(request, response):
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/invalid-utf8-html.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/invalid-utf8-html.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/invalid-utf8-html.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/invalid-utf8-html.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/last-modified.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/last-modified.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/last-modified.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/last-modified.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/no-custom-header-on-preflight.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/no-custom-header-on-preflight.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/no-custom-header-on-preflight.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/no-custom-header-on-preflight.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/nocors/folder.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/nocors/folder.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/nocors/folder.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/nocors/folder.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth5/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/nocors/w3c-import.log
>similarity index 80%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth5/w3c-import.log
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/nocors/w3c-import.log
>index f3776fbd3fc..072e9a00d60 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth5/w3c-import.log
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/nocors/w3c-import.log
>@@ -1,7 +1,7 @@
> The tests in this directory were imported from the W3C repository.
> Do NOT modify these tests directly in WebKit.
> Instead, create a pull request on the WPT github:
>-	https://github.com/w3c/web-platform-tests
>+	https://github.com/web-platform-tests/wpt
> 
> Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
> 
>@@ -14,4 +14,4 @@ Property values requiring vendor prefixes:
> None
> ------------------------------------------------------------------------
> List of files:
>-/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/auth5/auth.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/nocors/folder.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/parse-headers.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/parse-headers.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/parse-headers.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/parse-headers.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/pass.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/pass.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/pass.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/pass.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/redirect-cors.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/redirect-cors.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/redirect-cors.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/redirect-cors.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/redirect.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/redirect.py
>similarity index 89%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/redirect.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/redirect.py
>index 3e0cd529a51..2af9f2ee8a9 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/redirect.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/redirect.py
>@@ -2,11 +2,11 @@ import time
> 
> def main(request, response):
>     code = int(request.GET.first("code", 302))
>-    location = request.GET.first("location", request.url_parts.path +"?followed")
>+    location = request.GET.first("location", request.url_parts.path + "?followed")
> 
>     if "delay" in request.GET:
>         delay = float(request.GET.first("delay"))
>-        time.sleep(delay / 1E3);
>+        time.sleep(delay / 1E3)
> 
>     if "followed" in request.GET:
>         return [("Content:Type", "text/plain")], "MAGIC HAPPENED"
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/requri.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/requri.py
>similarity index 99%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/requri.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/requri.py
>index eaa562dff24..a3f7bfda351 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/requri.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/requri.py
>@@ -3,4 +3,3 @@ def main(request, response):
>         return request.url
>     else:
>         return request.request_path
>-
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/reset-token.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/reset-token.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/reset-token.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/reset-token.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/responseType-document-in-worker.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/responseType-document-in-worker.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/responseType-document-in-worker.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/responseType-document-in-worker.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/responseXML-unavailable-in-worker.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/responseXML-unavailable-in-worker.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/responseXML-unavailable-in-worker.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/responseXML-unavailable-in-worker.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/send-after-setting-document-domain-window-1.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-1.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/send-after-setting-document-domain-window-1.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-1.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/send-after-setting-document-domain-window-2.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-2.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/send-after-setting-document-domain-window-2.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-2.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/send-after-setting-document-domain-window-helper.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-helper.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/send-after-setting-document-domain-window-helper.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-helper.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/shift-jis-html.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/shift-jis-html.py
>similarity index 67%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/shift-jis-html.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/shift-jis-html.py
>index 92d06ca78c4..fab78c0b3ac 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/shift-jis-html.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/shift-jis-html.py
>@@ -1,6 +1,6 @@
> def main(request, response):
>     headers = [("Content-type", "text/html;charset=shift-jis")]
>     # Shift-JIS bytes for katakana TE SU TO ('test')
>-    content =  chr(0x83) + chr(0x65) + chr(0x83) + chr(0x58) + chr(0x83) + chr(0x67);
>+    content = chr(0x83) + chr(0x65) + chr(0x83) + chr(0x58) + chr(0x83) + chr(0x67)
> 
>     return headers, content
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/status.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/status.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/status.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/status.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/trickle.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/trickle.py
>similarity index 95%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/trickle.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/trickle.py
>index 5a46c5e82e6..418e2459921 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/trickle.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/trickle.py
>@@ -9,7 +9,7 @@ def main(request, response):
>     time.sleep(delay)
>     response.headers.set("Content-type", "text/plain")
>     response.write_status_headers()
>-    time.sleep(delay);
>+    time.sleep(delay)
>     for i in xrange(count):
>         response.writer.write_content(chunk)
>         time.sleep(delay)
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/upload.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/upload.py
>similarity index 91%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/upload.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/upload.py
>index 27cee598b71..304bea9e5ef 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/upload.py
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/upload.py
>@@ -2,7 +2,7 @@ def main(request, response):
>     content = []
> 
>     for key, values in sorted(item for item in request.POST.items() if not hasattr(item[1][0], "filename")):
>-         content.append("%s=%s," % (key, values[0]))
>+        content.append("%s=%s," % (key, values[0]))
>     content.append("\n")
> 
>     for key, values in sorted(item for item in request.POST.items() if hasattr(item[1][0], "filename")):
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/utf16-bom.json b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/utf16-bom.json
>new file mode 100644
>index 0000000000000000000000000000000000000000..5fd0a585a30dc9c7ac0bc7d3ee76eb26c4177a84
>GIT binary patch
>literal 30
>hcmezWubM%LA&ns)2$dMDfH;XEk)a4k*D`Q1004d(20H)%
>
>literal 0
>HcmV?d00001
>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/utf16.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/utf16.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/utf16.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/utf16.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/w3c-import.log
>new file mode 100644
>index 00000000000..cd3cd90bc96
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/w3c-import.log
>@@ -0,0 +1,102 @@
>+The tests in this directory were imported from the W3C repository.
>+Do NOT modify these tests directly in WebKit.
>+Instead, create a pull request on the WPT github:
>+	https://github.com/web-platform-tests/wpt
>+
>+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>+
>+Do NOT modify or remove this file.
>+
>+------------------------------------------------------------------------
>+Properties requiring vendor prefixes:
>+None
>+Property values requiring vendor prefixes:
>+None
>+------------------------------------------------------------------------
>+List of files:
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/accept-language.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/accept.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-allow-lists.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-allow-with-body.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-auth-basic.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-allow-no-credentials.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-allow-star.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-allow.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-cors-safelisted-request-headers.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-denied.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-options-not-supported.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-preflight-cache-invalidation.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-preflight-cache-timeout.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-preflight-cache.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-put-allow.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-basic-whitelist-response-headers.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-cookie.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-origin-header.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-denied.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-header-lowercase.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-header-sorted.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-headers-origin.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-invalid-status.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-preflight-request-must-not-contain-cookie.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/access-control-sandboxed-iframe.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/authentication.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/base.xml
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/chunked.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/conditional.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/content.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/corsenabled.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/delay.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/echo-headers.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/echo-method.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/empty-div-utf8-html.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/folder.txt
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/form.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/gzip.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-content-length.asis
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-user-agent.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-basic.asis
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers.asis
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/image.gif
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/img-utf8-html.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/img.jpg
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/infinite-redirects.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/init.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/inspect-headers.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/invalid-utf8-html.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/last-modified.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/no-custom-header-on-preflight.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/parse-headers.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/pass.txt
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/redirect-cors.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/redirect.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/requri.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/reset-token.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/responseType-document-in-worker.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/responseXML-unavailable-in-worker.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-1.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-2.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/send-after-setting-document-domain-window-helper.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/shift-jis-html.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/status.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/trickle.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/upload.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/utf16-bom.json
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/utf16.txt
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/well-formed.xml
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/win-1252-html.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/win-1252-xml.py
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/workerxhr-origin-referrer.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/workerxhr-simple.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-event-order.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-aborted.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-abortedonmain.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-overrides.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-overridesexpires.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-runner.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-simple.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-synconmain.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-synconworker.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-twice.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/zlib.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/well-formed.xml b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/well-formed.xml
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/well-formed.xml
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/well-formed.xml
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/win-1252-html.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/win-1252-html.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/win-1252-html.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/win-1252-html.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/win-1252-xml.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/win-1252-xml.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/win-1252-xml.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/win-1252-xml.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/workerxhr-origin-referrer.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/workerxhr-origin-referrer.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/workerxhr-origin-referrer.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/workerxhr-origin-referrer.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/workerxhr-simple.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/workerxhr-simple.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/workerxhr-simple.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/workerxhr-simple.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-event-order.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-event-order.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-event-order.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-event-order.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-aborted.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-aborted.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-aborted.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-aborted.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-abortedonmain.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-abortedonmain.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-abortedonmain.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-abortedonmain.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-overrides.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-overrides.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overridesexpires.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-overridesexpires.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overridesexpires.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-overridesexpires.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-runner.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-runner.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-runner.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-runner.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-simple.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-simple.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-simple.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-simple.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-synconmain.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-synconmain.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-synconmain.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-synconmain.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-synconworker.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-synconworker.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-synconworker.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-synconworker.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-twice.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-twice.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-twice.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout-twice.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/xmlhttprequest-timeout.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/zlib.py b/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/zlib.py
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/resources/zlib.py
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/resources/zlib.py
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-arraybuffer-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-arraybuffer-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-arraybuffer-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-arraybuffer-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-arraybuffer.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-arraybuffer.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-arraybuffer.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-arraybuffer.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-blob-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-blob-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-blob-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-blob-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-blob.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-blob.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-blob.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-blob.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-deflate-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-deflate-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-deflate-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-deflate-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-deflate.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-deflate.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-deflate.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-deflate.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-gzip-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-gzip-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-gzip-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-gzip-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-gzip.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-gzip.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-gzip.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-gzip.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-progress-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-progress-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-progress-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-progress-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-progress.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-progress.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-data-progress.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-progress.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-invalid-responsetype-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-invalid-responsetype-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-invalid-responsetype-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-invalid-responsetype-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-invalid-responsetype.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-invalid-responsetype.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-invalid-responsetype.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-invalid-responsetype.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-json-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-json-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-json-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-json-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-json.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-json.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-json.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-json.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-method-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-method-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-method-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-method-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-method.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/response-method.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/response-method.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/response-method.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseText-status-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responseText-status-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseText-status-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responseText-status-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseText-status.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/responseText-status.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseText-status.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responseText-status.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseType-document-in-worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responseType-document-in-worker-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseType-document-in-worker-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responseType-document-in-worker-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseType-document-in-worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/responseType-document-in-worker.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseType-document-in-worker.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responseType-document-in-worker.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseXML-unavailable-in-worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responseXML-unavailable-in-worker-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseXML-unavailable-in-worker-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responseXML-unavailable-in-worker-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseXML-unavailable-in-worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/responseXML-unavailable-in-worker.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseXML-unavailable-in-worker.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responseXML-unavailable-in-worker.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsedocument-decoding-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsedocument-decoding-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsedocument-decoding-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsedocument-decoding-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsedocument-decoding.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsedocument-decoding.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsedocument-decoding.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsedocument-decoding.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetext-decoding-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetext-decoding-expected.txt
>similarity index 96%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetext-decoding-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsetext-decoding-expected.txt
>index 0aa2b94e05f..e1fe16a9785 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetext-decoding-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetext-decoding-expected.txt
>@@ -30,6 +30,7 @@ PASS XMLHttpRequest: responseText decoding (text/plain %FE%FF%FE%FF  text)
> PASS XMLHttpRequest: responseText decoding (text/plain %EF%BB%BF  text) 
> PASS XMLHttpRequest: responseText decoding (text/plain %EF%BB%BF%EF%BB%BF  text) 
> PASS XMLHttpRequest: responseText decoding (text/plain %C2  text) 
>+FAIL XMLHttpRequest: responseText decoding (text/plain;charset=bogus %C2  text) assert_equals: expected "\ufffd" but got "Ã"
> PASS XMLHttpRequest: responseText decoding (text/xml %FE%FF  text) 
> PASS XMLHttpRequest: responseText decoding (text/xml %FE%FF%FE%FF  text) 
> PASS XMLHttpRequest: responseText decoding (text/xml %EF%BB%BF  text) 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetext-decoding.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetext-decoding.htm
>similarity index 98%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetext-decoding.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsetext-decoding.htm
>index c7e37832c34..fae01048ba3 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetext-decoding.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetext-decoding.htm
>@@ -82,6 +82,7 @@
>       request("text/plain", "%EF%BB%BF", "", "text");
>       request("text/plain", "%EF%BB%BF%EF%BB%BF", "\uFEFF", "text");
>       request("text/plain", "%C2", "\uFFFD", "text");
>+      request("text/plain;charset=bogus", "%C2", "\uFFFD", "text");
>       request("text/xml", "%FE%FF", "", "text");
>       request("text/xml", "%FE%FF%FE%FF", "\uFEFF", "text");
>       request("text/xml", "%EF%BB%BF", "", "text");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetype-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetype-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any-expected.txt
>new file mode 100644
>index 00000000000..4a4342945e6
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any-expected.txt
>@@ -0,0 +1,58 @@
>+CONSOLE MESSAGE: line 1253: XMLHttpRequest.responseType cannot be changed for synchronous HTTP(S) requests made from the window context.
>+CONSOLE MESSAGE: line 1253: XMLHttpRequest.responseType cannot be changed for synchronous HTTP(S) requests made from the window context.
>+CONSOLE MESSAGE: line 1253: XMLHttpRequest.responseType cannot be changed for synchronous HTTP(S) requests made from the window context.
>+CONSOLE MESSAGE: line 1253: XMLHttpRequest.responseType cannot be changed for synchronous HTTP(S) requests made from the window context.
>+CONSOLE MESSAGE: line 1253: XMLHttpRequest.responseType cannot be changed for synchronous HTTP(S) requests made from the window context.
>+CONSOLE MESSAGE: line 1253: XMLHttpRequest.responseType cannot be changed for synchronous HTTP(S) requests made from the window context.
>+
>+PASS Initial value of responseType 
>+PASS Set responseType to "" when readyState is UNSENT. 
>+PASS Set responseType to "" when readyState is OPENED. 
>+PASS Set responseType to "" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "" when readyState is LOADING. 
>+PASS Set responseType to "" when readyState is DONE. 
>+PASS Set responseType to "" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "json" when readyState is UNSENT. 
>+PASS Set responseType to "json" when readyState is OPENED. 
>+PASS Set responseType to "json" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "json" when readyState is LOADING. 
>+PASS Set responseType to "json" when readyState is DONE. 
>+PASS Set responseType to "json" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "json" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "document" when readyState is UNSENT. 
>+PASS Set responseType to "document" when readyState is OPENED. 
>+PASS Set responseType to "document" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "document" when readyState is LOADING. 
>+PASS Set responseType to "document" when readyState is DONE. 
>+PASS Set responseType to "document" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "document" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "arraybuffer" when readyState is UNSENT. 
>+PASS Set responseType to "arraybuffer" when readyState is OPENED. 
>+PASS Set responseType to "arraybuffer" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "arraybuffer" when readyState is LOADING. 
>+PASS Set responseType to "arraybuffer" when readyState is DONE. 
>+PASS Set responseType to "arraybuffer" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "arraybuffer" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "blob" when readyState is UNSENT. 
>+PASS Set responseType to "blob" when readyState is OPENED. 
>+PASS Set responseType to "blob" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "blob" when readyState is LOADING. 
>+PASS Set responseType to "blob" when readyState is DONE. 
>+PASS Set responseType to "blob" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "blob" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "text" when readyState is UNSENT. 
>+PASS Set responseType to "text" when readyState is OPENED. 
>+PASS Set responseType to "text" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "text" when readyState is LOADING. 
>+PASS Set responseType to "text" when readyState is DONE. 
>+PASS Set responseType to "text" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "text" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "nosuchtype" when readyState is UNSENT. 
>+PASS Set responseType to "nosuchtype" when readyState is OPENED. 
>+PASS Set responseType to "nosuchtype" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "nosuchtype" when readyState is LOADING. 
>+PASS Set responseType to "nosuchtype" when readyState is DONE. 
>+PASS Set responseType to "nosuchtype" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "nosuchtype" when readyState is DONE and the sync flag is set. 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.js
>new file mode 100644
>index 00000000000..88bd9189ebe
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.js
>@@ -0,0 +1,135 @@
>+// META: title=XMLHttpRequest.responseType
>+
>+/**
>+ * Author: Mathias Bynens <http://mathiasbynens.be/>
>+ * Author: Ms2ger <mailto:Ms2ger@gmail.com>
>+ *
>+ * Spec: <https://xhr.spec.whatwg.org/#the-responsetype-attribute>
>+ */
>+test(function() {
>+  var xhr = new XMLHttpRequest();
>+  assert_equals(xhr.responseType, '');
>+}, 'Initial value of responseType');
>+
>+var types = ['', 'json', 'document', 'arraybuffer', 'blob', 'text', "nosuchtype"];
>+
>+function isIgnoredType(type) {
>+  if (type == "nosuchtype") {
>+    return true;
>+  }
>+
>+  if (type != "document") {
>+    return false;
>+  }
>+
>+  // "document" is ignored only on workers.
>+  return GLOBAL.isWorker();
>+}
>+
>+function expectedType(type) {
>+  if (!isIgnoredType(type)) {
>+    return type;
>+  }
>+
>+  return "";
>+}
>+
>+types.forEach(function(type) {
>+  test(function() {
>+    var xhr = new XMLHttpRequest();
>+    xhr.responseType = type;
>+    assert_equals(xhr.responseType, expectedType(type));
>+  }, 'Set responseType to ' + format_value(type) + ' when readyState is UNSENT.');
>+
>+  test(function() {
>+    var xhr = new XMLHttpRequest();
>+    xhr.open('get', '/');
>+    xhr.responseType = type;
>+    assert_equals(xhr.responseType, expectedType(type));
>+  }, 'Set responseType to ' + format_value(type) + ' when readyState is OPENED.');
>+
>+  async_test(function() {
>+    var xhr = new XMLHttpRequest();
>+    xhr.open('get', '/');
>+    xhr.onreadystatechange = this.step_func(function() {
>+      if (xhr.readyState === XMLHttpRequest.HEADERS_RECEIVED) {
>+        xhr.responseType = type;
>+        assert_equals(xhr.responseType, expectedType(type));
>+        this.done();
>+      }
>+    });
>+    xhr.send();
>+  }, 'Set responseType to ' + format_value(type) + ' when readyState is HEADERS_RECEIVED.');
>+
>+  async_test(function() {
>+    var xhr = new XMLHttpRequest();
>+    xhr.open('get', '/');
>+    xhr.onreadystatechange = this.step_func(function() {
>+      if (xhr.readyState === XMLHttpRequest.LOADING) {
>+        if (isIgnoredType(type)) {
>+          xhr.responseType = type;
>+        } else {
>+          assert_throws("InvalidStateError", function() {
>+            xhr.responseType = type;
>+          });
>+        }
>+        assert_equals(xhr.responseType, "");
>+        this.done();
>+      }
>+    });
>+    xhr.send();
>+  }, 'Set responseType to ' + format_value(type) + ' when readyState is LOADING.');
>+
>+  async_test(function() {
>+    var xhr = new XMLHttpRequest();
>+    xhr.open('get', '/');
>+    xhr.onreadystatechange = this.step_func(function() {
>+      if (xhr.readyState === XMLHttpRequest.DONE) {
>+        var text = xhr.responseText;
>+        assert_not_equals(text, "");
>+        if (isIgnoredType(type)) {
>+          xhr.responseType = type;
>+        } else {
>+          assert_throws("InvalidStateError", function() {
>+            xhr.responseType = type;
>+          });
>+        }
>+        assert_equals(xhr.responseType, "");
>+        assert_equals(xhr.responseText, text);
>+        this.done();
>+      }
>+    });
>+    xhr.send();
>+  }, 'Set responseType to ' + format_value(type) + ' when readyState is DONE.');
>+
>+  // Note: the case of setting responseType first, and then calling synchronous
>+  // open(), is tested in open-method-responsetype-set-sync.htm.
>+  test(function() {
>+    var xhr = new XMLHttpRequest();
>+    xhr.open('get', '/', false);
>+    if (GLOBAL.isWorker() || isIgnoredType(type)) {
>+      // Setting responseType on workers is valid even for a sync XHR.
>+      xhr.responseType = type;
>+      assert_equals(xhr.responseType, expectedType(type));
>+    } else {
>+      assert_throws("InvalidAccessError", function() {
>+        xhr.responseType = type;
>+      });
>+    }
>+  }, 'Set responseType to ' + format_value(type) + ' when readyState is OPENED and the sync flag is set.');
>+
>+  test(function() {
>+    var xhr = new XMLHttpRequest();
>+    xhr.open('get', '/', false);
>+    xhr.send();
>+    assert_equals(xhr.readyState, XMLHttpRequest.DONE);
>+    if (isIgnoredType(type)) {
>+      xhr.responseType = type;
>+    } else {
>+      assert_throws("InvalidStateError", function() {
>+        xhr.responseType = type;
>+      });
>+    }
>+    assert_equals(xhr.responseType, "");
>+  }, 'Set responseType to ' + format_value(type) + ' when readyState is DONE and the sync flag is set.');
>+});
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.worker-expected.txt
>new file mode 100644
>index 00000000000..6fa0c7e38c8
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.worker-expected.txt
>@@ -0,0 +1,52 @@
>+
>+PASS Initial value of responseType 
>+PASS Set responseType to "" when readyState is UNSENT. 
>+PASS Set responseType to "" when readyState is OPENED. 
>+PASS Set responseType to "" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "" when readyState is LOADING. 
>+PASS Set responseType to "" when readyState is DONE. 
>+PASS Set responseType to "" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "json" when readyState is UNSENT. 
>+PASS Set responseType to "json" when readyState is OPENED. 
>+PASS Set responseType to "json" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "json" when readyState is LOADING. 
>+PASS Set responseType to "json" when readyState is DONE. 
>+PASS Set responseType to "json" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "json" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "document" when readyState is UNSENT. 
>+PASS Set responseType to "document" when readyState is OPENED. 
>+PASS Set responseType to "document" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "document" when readyState is LOADING. 
>+PASS Set responseType to "document" when readyState is DONE. 
>+PASS Set responseType to "document" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "document" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "arraybuffer" when readyState is UNSENT. 
>+PASS Set responseType to "arraybuffer" when readyState is OPENED. 
>+PASS Set responseType to "arraybuffer" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "arraybuffer" when readyState is LOADING. 
>+PASS Set responseType to "arraybuffer" when readyState is DONE. 
>+PASS Set responseType to "arraybuffer" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "arraybuffer" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "blob" when readyState is UNSENT. 
>+PASS Set responseType to "blob" when readyState is OPENED. 
>+PASS Set responseType to "blob" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "blob" when readyState is LOADING. 
>+PASS Set responseType to "blob" when readyState is DONE. 
>+PASS Set responseType to "blob" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "blob" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "text" when readyState is UNSENT. 
>+PASS Set responseType to "text" when readyState is OPENED. 
>+PASS Set responseType to "text" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "text" when readyState is LOADING. 
>+PASS Set responseType to "text" when readyState is DONE. 
>+PASS Set responseType to "text" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "text" when readyState is DONE and the sync flag is set. 
>+PASS Set responseType to "nosuchtype" when readyState is UNSENT. 
>+PASS Set responseType to "nosuchtype" when readyState is OPENED. 
>+PASS Set responseType to "nosuchtype" when readyState is HEADERS_RECEIVED. 
>+PASS Set responseType to "nosuchtype" when readyState is LOADING. 
>+PASS Set responseType to "nosuchtype" when readyState is DONE. 
>+PASS Set responseType to "nosuchtype" when readyState is OPENED and the sync flag is set. 
>+PASS Set responseType to "nosuchtype" when readyState is DONE and the sync flag is set. 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.worker.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.worker.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetype.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsetype.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseurl-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responseurl-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseurl-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responseurl-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseurl.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/responseurl.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responseurl.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responseurl.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-basic-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-basic-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-basic-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-basic-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-basic.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-basic.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-basic.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-basic.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-document-properties-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-document-properties-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-document-properties-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-document-properties-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-document-properties.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-document-properties.htm
>similarity index 91%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-document-properties.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-document-properties.htm
>index 30bf7d03741..b008348e58f 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-document-properties.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-document-properties.htm
>@@ -24,12 +24,9 @@
>         readyState:'complete',
>         location:null,
>         defaultView:null,
>-        body:undefined,
>-        images: undefined,
>+        body:null,
>         doctype:null,
>-        forms:undefined,
>         all:undefined,
>-        links: undefined,
>         cookie:''
>       }
> 
>@@ -94,13 +91,19 @@
>         assert_equals(client.responseXML.cookie, "")
>       }, 'cookie (after setting it)')
> 
>-      test(function() {
>-        assert_equals(typeof(client.responseXML.styleSheets), "object")
>-      }, 'styleSheets')
>+      var objectProps = [
>+        "styleSheets",
>+        "implementation",
>+        "images",
>+        "forms",
>+        "links",
>+      ];
> 
>-      test(function() {
>-        assert_equals(typeof(client.responseXML.implementation), "object")
>-      }, 'implementation')
>+      for (let prop of objectProps) {
>+        test(function() {
>+          assert_equals(typeof(client.responseXML[prop]), "object")
>+        }, prop + " should be an object")
>+      }
>     </script>
>   </body>
> </html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-get-twice-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-get-twice-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-get-twice-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-get-twice-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-get-twice.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-get-twice.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-get-twice.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-get-twice.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-media-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-media-type-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-media-type-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-media-type-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-media-type.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-media-type.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-media-type.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-media-type.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-non-document-types-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-non-document-types-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-non-document-types-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-non-document-types-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-non-document-types.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-non-document-types.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-non-document-types.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-non-document-types.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-non-well-formed-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-non-well-formed-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-non-well-formed-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-non-well-formed-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-non-well-formed.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-non-well-formed.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-non-well-formed.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-non-well-formed.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/security-consideration.sub-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/security-consideration.sub-expected.txt
>similarity index 75%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/security-consideration.sub-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/security-consideration.sub-expected.txt
>index cae2145bced..1012aa25919 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/security-consideration.sub-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/security-consideration.sub-expected.txt
>@@ -1,5 +1,5 @@
> CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8801/XMLHttpRequest/resources/img.jpg due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8801/xhr/resources/img.jpg due to access control checks.
> 
> PASS ProgressEvent: security consideration 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/security-consideration.sub.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/security-consideration.sub.html
>similarity index 93%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/security-consideration.sub.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/security-consideration.sub.html
>index 5eb7110d41a..a364e2cb8da 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/security-consideration.sub.html
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/security-consideration.sub.html
>@@ -28,7 +28,7 @@
>           assert_equals(pe.total, 0, "total is zero.");
>           this.done();
>         });
>-        xhr.open("GET", "http://{{host}}:{{ports[http][1]}}/XMLHttpRequest/resources/img.jpg", true);
>+        xhr.open("GET", "http://{{host}}:{{ports[http][1]}}/xhr/resources/img.jpg", true);
>         xhr.send(null);
>       })
>     </script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-accept-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-accept-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-accept-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-accept-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-accept-language-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-accept-language-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-accept-language-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-accept-language-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-accept-language.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-accept-language.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-accept-language.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-accept-language.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-accept.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-accept.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-accept.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-accept.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-after-setting-document-domain-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-after-setting-document-domain-expected.txt
>new file mode 100644
>index 00000000000..a9e30588397
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-after-setting-document-domain-expected.txt
>@@ -0,0 +1,7 @@
>+Blocked access to external URL http://www2.localhost:8800/xhr/resources/send-after-setting-document-domain-window-1.htm
>+Blocked access to external URL http://www2.localhost:8800/xhr/resources/send-after-setting-document-domain-window-2.htm
>+
>+Harness Error (TIMEOUT), message = null
>+
>+TIMEOUT All tests ran Test timed out
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-after-setting-document-domain.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-after-setting-document-domain.htm
>new file mode 100644
>index 00000000000..49eeb955533
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-after-setting-document-domain.htm
>@@ -0,0 +1,39 @@
>+<!doctype html>
>+<html>
>+  <head>
>+    <title>XMLHttpRequest: send() with document.domain set</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[3]" />
>+  </head>
>+  <body>
>+    <div id="log"></div>
>+    <script>
>+      var test_base_url = location.protocol+'//www2.'+location.host+"/xhr/resources/",
>+          test_windows = [
>+            window.open(test_base_url + "send-after-setting-document-domain-window-1.htm"),
>+            window.open(test_base_url + "send-after-setting-document-domain-window-2.htm"),
>+          ],
>+          num_tests_left = test_windows.length;
>+
>+      async_test(function(wrapper_test) {
>+        window.addEventListener("message", function(evt) {
>+          // run a shadow test that just forwards the results
>+          async_test(function(test) {
>+            assert_true(evt.data.passed, evt.data.message);
>+            test.done();
>+          }, evt.data.name);
>+
>+          // after last result comes in, close all test
>+          // windows and complete the wrapper test.
>+          if (--num_tests_left == 0) {
>+            for (var i=0; i<test_windows.length; ++i) {
>+              test_windows[i].close();
>+            }
>+            wrapper_test.done();
>+          }
>+        }, false);
>+      }, "All tests ran");
>+    </script>
>+  </body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-expected.txt
>similarity index 50%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-expected.txt
>index 50328c60d08..fd752b80e71 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-expected.txt
>@@ -1,5 +1,5 @@
>-Blocked access to external URL http://www1.localhost:8800/XMLHttpRequest/resources/auth1/corsenabled.py
>-CONSOLE MESSAGE: line 31: XMLHttpRequest cannot load http://www1.localhost:8800/XMLHttpRequest/resources/auth1/corsenabled.py due to access control checks.
>+Blocked access to external URL http://www1.localhost:8800/xhr/resources/auth1/corsenabled.py
>+CONSOLE MESSAGE: line 31: XMLHttpRequest cannot load http://www1.localhost:8800/xhr/resources/auth1/corsenabled.py due to access control checks.
> 
> PASS XMLHttpRequest: send() - "Basic" authenticated CORS requests with user name and password passed to open() (asserts failure) 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled-expected.txt
>new file mode 100644
>index 00000000000..0daea78b38c
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled-expected.txt
>@@ -0,0 +1,4 @@
>+Blocked access to external URL http://www1.localhost:8800/xhr/resources/auth1/auth.py
>+
>+PASS XMLHttpRequest: send() - "Basic" authenticated CORS requests with user name and password passed to open() (asserts failure) 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled.htm
>new file mode 100644
>index 00000000000..070b2ba3212
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled.htm
>@@ -0,0 +1,28 @@
>+<!doctype html>
>+<html>
>+  <head>
>+    <title>XMLHttpRequest: send() - "Basic" authenticated CORS requests with user name and password passed to open() (asserts failure)</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <script src="/common/utils.js"></script>
>+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
>+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
>+  </head>
>+  <body>
>+    <div id="log"></div>
>+    <script>
>+      test(function() {
>+        var client = new XMLHttpRequest(),
>+          urlstart = 'www1.'+location.host + location.pathname.replace(/\/[^\/]*$/, '/')
>+        client.withCredentials = true
>+        user = token()
>+        client.open("GET", location.protocol+'//'+urlstart + "resources/auth1/auth.py", false, user, 'pass')
>+        client.setRequestHeader("x-user", user)
>+        assert_throws("NetworkError", function(){ client.send(null) })
>+        assert_equals(client.responseText, '')
>+        assert_equals(client.status, 0)
>+        assert_equals(client.getResponseHeader('x-challenge'), null)
>+      }, document.title)
>+    </script>
>+  </body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-repeat-no-args-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-repeat-no-args-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-repeat-no-args-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-repeat-no-args-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-repeat-no-args.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-repeat-no-args.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-setrequestheader-and-arguments-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-and-arguments-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-setrequestheader-and-arguments-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-and-arguments-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-setrequestheader-and-arguments.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-and-arguments.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-setrequestheader-and-arguments.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-and-arguments.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session-expected.txt
>new file mode 100644
>index 00000000000..565f5e49703
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session-expected.txt
>@@ -0,0 +1,3 @@
>+
>+FAIL XMLHttpRequest: send() - "Basic" authenticated request using setRequestHeader() when there is an existing session assert_equals: expected "e6d87d1d-ef01-44fa-a52f-cb1c1942f5cc\npass" but got "78f6adf0-a739-4e17-90dc-028058541ba5\nopen-pass"
>+Note: this test will only work as expected once per browsing session. Restart browser to re-test.
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session.htm
>new file mode 100644
>index 00000000000..6e68f098cf5
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session.htm
>@@ -0,0 +1,53 @@
>+<!doctype html>
>+<html>
>+  <head>
>+    <title>XMLHttpRequest: send() - "Basic" authenticated request using setRequestHeader() when there is an existing session</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <script src="/common/utils.js"></script>
>+    
>+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="following::ol[1]/li[6]" />
>+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
>+  </head>
>+  <body>
>+    <div id="log"></div>
>+    <script>
>+      var test = async_test()
>+      test.step(function() {
>+        var client = new XMLHttpRequest(),
>+          urlstart = location.host + location.pathname.replace(/\/[^\/]*$/, '/')
>+        // Initial request: no information is known to the UA about whether resources/auth4/auth.py requires authentication,
>+        // hence it first sends a normal request, gets a 401 response that will not be passed on to the JS, and sends a new
>+        // request with an Authorization header before returning
>+        // (Note: this test will only work as expected if run once per browsing session)
>+        var open_user = token()
>+        client.open("GET", location.protocol+'//'+urlstart + "resources/auth4/auth.py", false, open_user, 'open-pass')
>+        client.setRequestHeader('X-User', open_user)
>+        // initial request - this will get a 401 response and re-try with HTTP auth
>+        client.send(null)
>+        assert_true(client.responseText == (open_user + '\nopen-pass'), 'responseText should contain the right user and password')
>+        assert_equals(client.status, 200)
>+        assert_equals(client.getResponseHeader('x-challenge'), 'DID')
>+        // Another request, this time user,pass is omitted and an Authorization header set explicitly
>+        // Here the URL is known to require authentication (from the request above), and the UA has cached open-user:open-pass credentials
>+        // However, these session credentials should now be overridden by the setRequestHeader() call so the UA should immediately
>+        // send basic Authorization header with credentials user:pass. (This part is perhaps not well specified anywhere)
>+        var user = token();
>+        client.open("GET", location.protocol+'//'+urlstart + "resources/auth4/auth.py", true)
>+        client.setRequestHeader("x-user", user)
>+        client.setRequestHeader('Authorization', 'Basic ' + btoa(user + ":pass"))
>+        client.onreadystatechange = function () {
>+          if (client.readyState < 4) {return}
>+          test.step( function () {
>+            assert_equals(client.responseText, user + '\npass')
>+            assert_equals(client.status, 200)
>+            assert_equals(client.getResponseHeader('x-challenge'), 'DID-NOT')
>+            test.done()
>+          } )
>+        }
>+        client.send(null)
>+      })
>+    </script>
>+    <p>Note: this test will only work as expected once per browsing session. Restart browser to re-test.</p>
>+  </body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-setrequestheader-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-setrequestheader-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-setrequestheader.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-setrequestheader.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-competing-names-passwords-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-competing-names-passwords-expected.txt
>new file mode 100644
>index 00000000000..c503dd5fee4
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-competing-names-passwords-expected.txt
>@@ -0,0 +1,15 @@
>+
>+FAIL XMLHttpRequest user/pass options: user in open() assert_equals: responseText should contain the right user and password expected "b1a2c1c7-4611-4121-8876-320c6d462f58\n" but got "FAIL (did not authorize)"
>+PASS XMLHttpRequest user/pass options: user/pass in open() 
>+PASS XMLHttpRequest user/pass options: another user/pass in open(); must override cached credentials from previous test 
>+PASS XMLHttpRequest user/pass options: pass in URL, user in open() 
>+PASS XMLHttpRequest user/pass options: pass in URL, user/pass in open() 
>+PASS XMLHttpRequest user/pass options: user in URL 
>+FAIL XMLHttpRequest user/pass options: user in URL, pass in open() assert_equals: responseText should contain the right user and password expected "a89b5bdc-8844-4e0c-8b67-bccb90cc5006\n8ae16e77-30e0-4758-8c85-ddbac8ff9923" but got "a89b5bdc-8844-4e0c-8b67-bccb90cc5006\n"
>+PASS XMLHttpRequest user/pass options: user/pass in URL 
>+PASS XMLHttpRequest user/pass options: user in URL and open() 
>+PASS XMLHttpRequest user/pass options: user in URL; user/pass in open() 
>+PASS XMLHttpRequest user/pass options: user/pass in URL; user in open() 
>+FAIL XMLHttpRequest user/pass options: user/pass in URL; pass in open() assert_equals: responseText should contain the right user and password expected "7add18d7-4945-4a7c-b1d3-e50eff2f65c8\nbce2a8d7-ce76-48be-8c8f-ff29647b78ff" but got "7add18d7-4945-4a7c-b1d3-e50eff2f65c8\nbcf673a4-b893-48cd-95ec-3bd4c0d72a84"
>+PASS XMLHttpRequest user/pass options: user/pass in URL and open() 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-competing-names-passwords.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-competing-names-passwords.htm
>new file mode 100644
>index 00000000000..bc6755c7d6d
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-competing-names-passwords.htm
>@@ -0,0 +1,50 @@
>+<!doctype html>
>+<html>
>+  <head>
>+    <title>XMLHttpRequest: send() - "Basic" authenticated requests with competing user name/password options</title>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <script src="/common/utils.js"></script>
>+  </head>
>+  <body>
>+    <div id="log"></div>
>+    <script>
>+      function request(user1, pass1, user2, pass2, name) {
>+        test(function() {
>+          const client = new XMLHttpRequest(),
>+                userwin = user2 || user1,
>+                passwin = pass2 || pass1;
>+          let urlstart = "";
>+          if (user1 || pass1) {
>+            urlstart = "http://";
>+            if (user1) {
>+              urlstart += user1;
>+            }
>+            if (pass1) {
>+              urlstart += ":" + pass1;
>+            }
>+            urlstart += "@" + location.host + location.pathname.replace(/\/[^\/]*$/, '/');
>+          }
>+          client.open("GET", urlstart + "resources/authentication.py", false, user2, pass2);
>+          client.setRequestHeader("x-user", userwin);
>+          client.send(null);
>+          assert_equals(client.responseText, ((userwin||'') + "\n" + (passwin||'')), 'responseText should contain the right user and password');
>+        }, "XMLHttpRequest user/pass options: " + name);
>+      }
>+      // Cannot have just a password
>+      request(null, null, token(), null, "user in open()");
>+      request(null, null, token(), token(), "user/pass in open()");
>+      request(null, null, token(), token(), "another user/pass in open(); must override cached credentials from previous test");
>+      request(null, token(), token(), null, "pass in URL, user in open()");
>+      request(null, token(), token(), token(), "pass in URL, user/pass in open()");
>+      request(token(), null, null, null, "user in URL");
>+      request(token(), null, null, token(), "user in URL, pass in open()");
>+      request(token(), token(), null, null, "user/pass in URL");
>+      request(token(), null, token(), null, "user in URL and open()");
>+      request(token(), null, token(), token(), "user in URL; user/pass in open()");
>+      request(token(), token(), token(), null, "user/pass in URL; user in open()");
>+      request(token(), token(), null, token(), "user/pass in URL; pass in open()");
>+      request(token(), token(), token(), token(), "user/pass in URL and open()");
>+    </script>
>+  </body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-basic-setrequestheader-expected.txt
>similarity index 57%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-basic-setrequestheader-expected.txt
>index d5a62981ea1..b74e48cc8a8 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-basic-setrequestheader-expected.txt
>@@ -1,4 +1,4 @@
>-Blocked access to external URL http://www1.localhost:8800/XMLHttpRequest/resources/auth2/corsenabled.py
>+Blocked access to external URL http://www1.localhost:8800/xhr/resources/auth2/corsenabled.py
> 
> FAIL XMLHttpRequest: send() - "Basic" authenticated CORS request using setRequestHeader() (expects to succeed)  A network error occurred.
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-basic-setrequestheader.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-basic-setrequestheader.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-setrequestheader-no-cred-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-setrequestheader-no-cred-expected.txt
>similarity index 54%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-setrequestheader-no-cred-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-setrequestheader-no-cred-expected.txt
>index 783b53c5ea6..97a6ab5236a 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-setrequestheader-no-cred-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-setrequestheader-no-cred-expected.txt
>@@ -1,5 +1,5 @@
>-Blocked access to external URL http://www1.localhost:8800/XMLHttpRequest/resources/auth7/corsenabled.py
>-Blocked access to external URL http://www1.localhost:8800/XMLHttpRequest/resources/auth8/corsenabled-no-authorize.py
>+Blocked access to external URL http://www1.localhost:8800/xhr/resources/auth7/corsenabled.py
>+Blocked access to external URL http://www1.localhost:8800/xhr/resources/auth8/corsenabled-no-authorize.py
> 
> FAIL CORS request with setRequestHeader auth to URL accepting Authorization header assert_true: responseText should contain the right user and password expected true got false
> PASS CORS request with setRequestHeader auth to URL NOT accepting Authorization header 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-setrequestheader-no-cred.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-setrequestheader-no-cred.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-cors-setrequestheader-no-cred.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-setrequestheader-no-cred.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional-cors-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-conditional-cors-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional-cors-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-conditional-cors-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional-cors.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-conditional-cors.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional-cors.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-conditional-cors.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-conditional-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-conditional-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-conditional.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-conditional.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-charset-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-charset-expected.txt
>new file mode 100644
>index 00000000000..3d11d19c580
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-charset-expected.txt
>@@ -0,0 +1,20 @@
>+
>+FAIL header with invalid MIME type is not changed assert_equals: expected "text; charset=ascii" but got "text; charset=UTF-8"
>+PASS header with invalid MIME type (empty string) is not changed 
>+PASS known charset but bogus header - missing MIME type 
>+PASS bogus charset and bogus header - missing MIME type 
>+PASS Correct text/plain MIME with charset 
>+PASS If no charset= param is given, implementation should not add one - unknown MIME 
>+PASS If no charset= param is given, implementation should not add one - known MIME 
>+PASS If no charset= param is given, implementation should not add one - known MIME, unknown param, two spaces 
>+FAIL charset given but wrong, fix it (unknown MIME, bogus charset) assert_equals: expected "text/x-thepiano;charset=UTF-8" but got "text/x-thepiano;charset= UTF-8"
>+FAIL charset given but wrong, fix it (known MIME, bogus charset) assert_equals: expected "text/plain;charset=UTF-8" but got "text/plain;charset=UTF-8;charset=UTF-8"
>+PASS charset given but wrong, fix it (known MIME, actual charset) 
>+FAIL Multiple charset parameters deduplicate, bogus parameter dropped assert_equals: expected "text/x-pink-unicorn;charset=UTF-8" but got "text/x-pink-unicorn; charset=UTF-8; charset=UTF-8; notrelated; charset=UTF-8"
>+PASS No content type set, give MIME and charset 
>+FAIL charset with space assert_equals: expected "text/plain;charset=UTF-8" but got "text/plain;charset= UTF-8"
>+FAIL charset in double quotes assert_equals: expected "text/plain;charset=UTF-8" but got "text/plain;charset=\"UTF-8\""
>+FAIL charset in double quotes with space assert_equals: expected "text/plain;charset=UTF-8" but got "text/plain;charset=\" UTF-8\""
>+FAIL charset in double quotes with backslashes assert_equals: expected "text/plain;charset=UTF-8" but got "text/plain;charset=\"UTF-8\""
>+FAIL unknown parameters need to be preserved assert_equals: expected "yo/yo;charset=UTF-8;yo=YO;x=y" but got "YO/yo;charset=UTF-8;yo=YO; X=y"
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-charset.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-charset.htm
>similarity index 69%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-charset.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-charset.htm
>index 9e93279d6ba..4e75df23468 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-charset.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-charset.htm
>@@ -15,7 +15,7 @@
>         test(function() {
>         var client = new XMLHttpRequest()
>         client.open("POST", "resources/content.py", false)
>-        if(input)
>+        if(input !== null)
>           client.setRequestHeader("Content-Type", input)
>         client.send("TEST")
>         assert_equals(client.responseText, "TEST")
>@@ -28,6 +28,11 @@
>         "text; charset=ascii",
>         "header with invalid MIME type is not changed"
>       )
>+      request(
>+        "",
>+        "",
>+        "header with invalid MIME type (empty string) is not changed"
>+      )
>       request(
>         "charset=ascii",
>         "charset=ascii",
>@@ -40,7 +45,7 @@
>       )
>       request(
>         "text/plain;charset=utf-8",
>-        "text/plain;charset=utf-8",
>+        "text/plain;charset=UTF-8",
>         "Correct text/plain MIME with charset"
>       )
>       request(
>@@ -53,6 +58,11 @@
>         "text/plain",
>         "If no charset= param is given, implementation should not add one - known MIME"
>       )
>+      request(
>+        "text/plain;  hi=bye",
>+        "text/plain;  hi=bye",
>+        "If no charset= param is given, implementation should not add one - known MIME, unknown param, two spaces"
>+      )
>       request(
>         "text/x-thepiano;charset= waddup",
>         "text/x-thepiano;charset=UTF-8",
>@@ -60,7 +70,7 @@
>       )
>       request(
>         "text/plain;charset=utf-8;charset=waddup",
>-        "text/plain;charset=utf-8;charset=UTF-8",
>+        "text/plain;charset=UTF-8",
>         "charset given but wrong, fix it (known MIME, bogus charset)"
>       )
>       request(
>@@ -70,14 +80,34 @@
>       )
>       request(
>         "text/x-pink-unicorn; charset=windows-1252; charset=bogus; notrelated; charset=ascii",
>-        "text/x-pink-unicorn; charset=UTF-8; charset=UTF-8; notrelated; charset=UTF-8",
>-        "If multiple charset parameters are given, all should be rewritten"
>+        "text/x-pink-unicorn;charset=UTF-8",
>+        "Multiple charset parameters deduplicate, bogus parameter dropped"
>       )
>       request(
>         null,
>         "text/plain;charset=UTF-8",
>         "No content type set, give MIME and charset"
>       )
>+      request(
>+        "text/plain;charset= utf-8",
>+        "text/plain;charset=UTF-8",
>+        "charset with space")
>+      request(
>+        "text/plain;charset=\"utf-8\"",
>+        "text/plain;charset=UTF-8",
>+        "charset in double quotes")
>+      request(
>+        "text/plain;charset=\" utf-8\"",
>+        "text/plain;charset=UTF-8",
>+        "charset in double quotes with space")
>+      request(
>+        "text/plain;charset=\"u\\t\\f-8\"",
>+        "text/plain;charset=UTF-8",
>+        "charset in double quotes with backslashes")
>+      request(
>+        "YO/yo;charset=x;yo=YO; X=y",
>+        "yo/yo;charset=UTF-8;yo=YO;x=y",
>+        "unknown parameters need to be preserved")
>     </script>
>   </body>
> </html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-string-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-string-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-string-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-string-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-string.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-string.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-content-type-string.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-string.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-arraybuffer-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-arraybuffer-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-arraybuffer.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-arraybuffer.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-arraybufferview-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-arraybufferview-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-arraybufferview.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-arraybufferview.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-blob-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-blob-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-blob-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-blob-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-blob.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-blob.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-blob.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-blob.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-es-object-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-es-object-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-es-object.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-es-object.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-formdata-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-formdata-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-formdata.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-formdata.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-unexpected-tostring-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-unexpected-tostring-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-unexpected-tostring-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-unexpected-tostring-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-unexpected-tostring.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-unexpected-tostring.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-data-unexpected-tostring.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-unexpected-tostring.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-basic-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-basic-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-basic-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-basic-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-basic.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-basic.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-basic.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-basic.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document-bogus-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-document-bogus-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document-bogus-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-document-bogus-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document-bogus.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-document-bogus.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document-bogus.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-document-bogus.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-document-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-document-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-document.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-document.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-empty.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-empty.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-none.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-none.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub-expected.txt
>similarity index 59%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub-expected.txt
>index 2f459f58747..31c41c41fb8 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub-expected.txt
>@@ -1,5 +1,5 @@
>-Blocked access to external URL http://nonexistent-origin.localhost:8800/
>-CONSOLE MESSAGE: line 43: XMLHttpRequest cannot load http://nonexistent-origin.localhost:8800/ due to access control checks.
>+Blocked access to external URL http://nonexistent.localhost:8800/
>+CONSOLE MESSAGE: line 43: XMLHttpRequest cannot load http://nonexistent.localhost:8800/ due to access control checks.
> 
> PASS XMLHttpRequest: The send() method: Fire a progress event named error when Network error happens (synchronous flag is unset) 
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub.htm
>similarity index 96%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub.htm
>index c803efa7d0e..c51a05cd201 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub.htm
>@@ -39,7 +39,7 @@
>             xhr.upload.onloadend   = test.step_func(e => { actual.push("upload." + e.type); })
>             xhr.upload.onerror     = test.step_func(e => { actual.push("upload." + e.type); })
> 
>-            xhr.open("POST", "http://nonexistent-origin.{{host}}:{{ports[http][0]}}", true);
>+            xhr.open("POST", "http://nonexistent.{{host}}:{{ports[http][0]}}", true);
>             xhr.send("Test Message");
>         });
>     </script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub-expected.txt
>new file mode 100644
>index 00000000000..c5dd3695f91
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub-expected.txt
>@@ -0,0 +1,5 @@
>+Blocked access to external URL http://nonexistent.localhost:8800/
>+
>+PASS http URL 
>+PASS data URL 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub.htm
>similarity index 93%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub.htm
>index b89958060f3..b9f4fdf99de 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub.htm
>@@ -17,7 +17,7 @@
>         {
>             var xhr = new XMLHttpRequest();
> 
>-            xhr.open("POST", "http://nonexistent-origin.{{host}}:{{ports[http][0]}}", false);
>+            xhr.open("POST", "http://nonexistent.{{host}}:{{ports[http][0]}}", false);
> 
>             assert_throws("NetworkError", function()
>             {
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-loadend-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-loadend-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-loadend-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-loadend-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-loadend.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-loadend.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-loadend.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-loadend.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-loadstart-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-loadstart-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-loadstart-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-loadstart-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-loadstart.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-loadstart.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-loadstart.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-loadstart.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-order-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-order-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-order-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-order-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-order.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-order.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-no-response-event-order.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-order.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-non-same-origin-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-non-same-origin-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-non-same-origin.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-non-same-origin.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-non-same-origin.sub-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-non-same-origin.sub-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.sub.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-non-same-origin.sub.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.sub.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-non-same-origin.sub.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-receive-utf16-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-receive-utf16-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-receive-utf16-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-receive-utf16-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-receive-utf16.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-receive-utf16.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-receive-utf16.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-receive-utf16.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus-sync-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus-sync-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus-sync.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus-sync.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-sync-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-sync-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-sync.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-sync.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-infinite.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-infinite.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-no-location-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-no-location-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-no-location-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-no-location-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-no-location.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-no-location.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-no-location.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-no-location.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm
>similarity index 79%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm
>index 37a90d42cbd..5c1c6387adb 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm
>@@ -15,8 +15,8 @@
>     <div id="log"></div>
> 
>     <script type="text/javascript">
>-    function testRedirectPost(code, shouldResendPost) {
>-        var test = async_test(document.title + " (" + code + ")");
>+    function testRedirectPost(params) {
>+        var test = async_test(document.title + " (" + params.name + ")");
>         var actual = [];
>         // We check upload.onprogress with a boolean because it *might* fire more than once
>         var progressFiredReadyState1 = false;
>@@ -24,13 +24,13 @@
>         var expectedHeaders, expectedEvents;
> 
>         // 307 redirects should resend the POST data, and events and headers will be a little different..
>-        if(shouldResendPost) {
>+        if(params.expectResendPost) {
>             expectedHeaders = {
>-                "X-Request-Content-Length": "11988",
>+                "X-Request-Content-Length": "12000",
>                 "X-Request-Content-Type": "text/plain;charset=UTF-8",
>                 "X-Request-Method": "POST",
>                 "X-Request-Query": "NO",
>-                "Content-Length": "11988"
>+                "Content-Length": "12000"
>             }
>             expectedEvents = [
>                 "xhr onreadystatechange 1",
>@@ -63,6 +63,10 @@
>                 "xhr loadend 4"
>             ];
>         }
>+        // Override expectations if provided.
>+        if(params.expectedContentType)
>+          expectedHeaders["X-Request-Content-Type"] = params.expectedContentType;
>+
>         test.step(function()
>         {
>             var xhr = new XMLHttpRequest();
>@@ -105,20 +109,24 @@
>                 }
> 
>                 assert_array_equals(actual, expectedEvents, "events firing in expected order and states");
>+                if (params.expectedBody)
>+                  assert_equals(xhr.response, params.expectedBody, 'request body was resent');
>                 test.done();
>             });
> 
>-            xhr.open("POST", "./resources/redirect.py?location=content.py&code=" + code, true);
>-            xhr.send((new Array(1000)).join("Test Message"));
>+            xhr.open("POST", "./resources/redirect.py?location=content.py&code=" + params.code, true);
>+            xhr.send(params.body);
>         });
>     }
> 
>+    const stringBody = "Test Message".repeat(1000);
>+    const blobBody = new Blob(new Array(1000).fill("Test Message"));
> 
>-    testRedirectPost(301, false);
>-    testRedirectPost(302, false);
>-    testRedirectPost(303, false);
>-    testRedirectPost(307, true);
>-
>+    testRedirectPost({name: "301", code: 301, expectResendPost: false, body: stringBody});
>+    testRedirectPost({name: "302", code: 302, expectResendPost: false, body: stringBody});
>+    testRedirectPost({name: "303", code: 303, expectResendPost: false, body: stringBody});
>+    testRedirectPost({name: "307 (string)", code: 307, expectResendPost: true,  body: stringBody, expectedBody: stringBody });
>+    testRedirectPost({name: "307 (blob)", code: 307, expectResendPost: true, body: blobBody, expectedBody: stringBody, expectedContentType: "NO" });
>     </script>
> </body>
> </html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-to-cors-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-to-cors-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-to-cors.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-to-cors.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-non-cors-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-to-non-cors-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-non-cors-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-to-non-cors-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-non-cors.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-to-non-cors.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-non-cors.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-to-non-cors.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-event-order-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-event-order-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-event-order-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-event-order-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-event-order.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-event-order.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-event-order.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-event-order.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-loadend-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-loadend-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-loadend-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-loadend-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-loadend.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-loadend.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-loadend.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-loadend.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-loadstart-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-loadstart-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-loadstart-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-loadstart-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-loadstart.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-loadstart.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-loadstart.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-loadstart.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-progress-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-progress-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-progress-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-progress-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-progress.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-progress.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-response-upload-event-progress.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-progress.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-send-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any-expected.txt
>new file mode 100644
>index 00000000000..2a6b6c95dc9
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS XMLHttpRequest: send() - send() 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.js
>new file mode 100644
>index 00000000000..2bfe40436f4
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.js
>@@ -0,0 +1,7 @@
>+test(function() {
>+  var client = new XMLHttpRequest()
>+  client.open("GET", "resources/well-formed.xml")
>+  client.send(null)
>+  assert_throws("InvalidStateError", function() { client.send(null) })
>+  client.abort()
>+}, "XMLHttpRequest: send() - send()");
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.worker-expected.txt
>new file mode 100644
>index 00000000000..2a6b6c95dc9
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.worker-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS XMLHttpRequest: send() - send() 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.worker.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.worker.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.worker-expected.txt
>new file mode 100644
>index 00000000000..c2c15e0b8a0
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.worker-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS Untitled 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.worker.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.worker.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.worker.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.worker.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-send.worker.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.worker.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-blocks-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-blocks-async-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-blocks-async-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-blocks-async-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-blocks-async.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-blocks-async.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-blocks-async.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-blocks-async.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-load-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-load-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-load-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-load-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-load.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-load.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-load.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-load.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-loadend-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-loadend-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-loadend-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-loadend-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-loadend.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-loadend.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-loadend.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-loadend.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-order-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-order-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-order-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-order-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-order.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-order.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-no-response-event-order.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-order.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-response-event-order-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-response-event-order-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-response-event-order-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-response-event-order-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-response-event-order.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-response-event-order.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-response-event-order.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-response-event-order.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-timeout-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-timeout-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-timeout-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-timeout-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-timeout.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-timeout.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-sync-timeout.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-timeout.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-timeout-events-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-timeout-events-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-timeout-events.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-timeout-events.htm
>new file mode 100644
>index 00000000000..eae25681077
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-timeout-events.htm
>@@ -0,0 +1,62 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <script src="/resources/testharness.js"></script>
>+    <script src="/resources/testharnessreport.js"></script>
>+    <title>XMLHttpRequest: The send() method: timeout is not 0 </title>
>+</head>
>+
>+<body>
>+    <div id="log"></div>
>+
>+    <script type="text/javascript">
>+        async_test(t => {
>+            const xhr = new XMLHttpRequest(),
>+                  expect = [4, "", "upload.timeout", "upload.loadend", "timeout", "loadend"];
>+            let actual = [];
>+
>+            xhr.onreadystatechange = t.step_func(() => {
>+                if (xhr.readyState == 4) {
>+                    actual.push(xhr.readyState, xhr.response);
>+                }
>+            });
>+
>+            xhr.onloadend = t.step_func_done(e => {
>+                assert_equals(e.loaded, 0);
>+                assert_equals(e.total, 0);
>+                actual.push(e.type);
>+                assert_array_equals(actual, expect);
>+            });
>+
>+            xhr.ontimeout = t.step_func(e => {
>+                assert_equals(e.loaded, 0);
>+                assert_equals(e.total, 0);
>+                actual.push(e.type);
>+            });
>+
>+
>+            xhr.upload.onloadend = t.step_func(e => {
>+                assert_equals(e.loaded, 0);
>+                assert_equals(e.total, 0);
>+                actual.push("upload." + e.type);
>+            });
>+
>+            xhr.upload.ontimeout = t.step_func(e => {
>+                assert_equals(e.loaded, 0);
>+                assert_equals(e.total, 0);
>+                actual.push("upload." + e.type);
>+            });
>+
>+
>+            let content = "";
>+            for (var i = 0; i < 121026; i++) {
>+                content += "[" + i + "]";
>+            }
>+
>+            xhr.open("POST", "./resources/trickle.py", true);
>+            xhr.timeout = 1;
>+            xhr.send(content);
>+        });
>+    </script>
>+</body>
>+</html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.worker-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.any.worker-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.worker-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.worker.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.worker.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.js
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-usp.js
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.js
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-after-send-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-after-send-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-after-send-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-after-send-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-after-send.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-after-send.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-after-send.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-after-send.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-allow-empty-value-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-allow-empty-value-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-allow-empty-value-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-allow-empty-value-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-allow-empty-value.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-allow-empty-value.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-allow-empty-value.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-allow-empty-value.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-allow-whitespace-in-value-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-allow-whitespace-in-value-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-allow-whitespace-in-value-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-allow-whitespace-in-value-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-allow-whitespace-in-value.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-allow-whitespace-in-value.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-allow-whitespace-in-value.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-allow-whitespace-in-value.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-before-open-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-before-open-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-before-open-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-before-open-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-before-open.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-before-open.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-before-open.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-before-open.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-bogus-name-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-name-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-bogus-name-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-name-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-bogus-name.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-name.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-bogus-name.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-name.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-bogus-value-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-value-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-bogus-value-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-value-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-bogus-value.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-value.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-bogus-value.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-value.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-case-insensitive-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-case-insensitive-expected.txt
>new file mode 100644
>index 00000000000..9bf2beaafad
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-case-insensitive-expected.txt
>@@ -0,0 +1,4 @@
>+
>+PASS XMLHttpRequest: setRequestHeader() - headers that differ in case 
>+FAIL XMLHttpRequest: setRequestHeader() - headers that differ in case 1 assert_regexp_match: expected object "/content-TYPE/" but got "Host: localhost:8800\r\nContent-Type: x/x\r\nConnection: keep-alive\r\nTHIS-IS-A-TEST: 1, 2\r\nAccept: */*\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14) AppleWebKit/605.1.15 (KHTML, like Gecko)\r\nReferer: http://localhost:8800/xhr/setrequestheader-case-insensitive.htm\r\nAccept-Language: en-us\r\nAccept-Encoding: gzip, deflate\r\n"
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-case-insensitive.htm
>similarity index 63%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-case-insensitive.htm
>index 65f7d29170c..1aed30d1c2a 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-case-insensitive.htm
>@@ -18,6 +18,17 @@
>         client.send(null)
>         assert_equals(client.responseText, "x-test,")
>       })
>+
>+      test(() => {
>+        const client = new XMLHttpRequest
>+        client.open("GET", "resources/echo-headers.py", false)
>+        client.setRequestHeader("THIS-IS-A-TEST", "1")
>+        client.setRequestHeader("THIS-is-A-test", "2")
>+        client.setRequestHeader("content-TYPE", "x/x")
>+        client.send()
>+        assert_regexp_match(client.responseText, /content-TYPE/)
>+        assert_regexp_match(client.responseText, /THIS-IS-A-TEST: 1, 2/)
>+      })
>     </script>
>   </body>
> </html>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-allowed-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-allowed-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-allowed.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-allowed.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-forbidden-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-forbidden-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-forbidden-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-forbidden-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-forbidden.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-forbidden.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-forbidden.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-forbidden.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-open-setrequestheader-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-open-setrequestheader-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-open-setrequestheader-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-open-setrequestheader-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-open-setrequestheader.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-open-setrequestheader.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-open-setrequestheader.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-open-setrequestheader.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/status-async-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-async-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/status-async-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-async.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/status-async.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-async.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/status-async.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-basic-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/status-basic-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-basic-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/status-basic-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-basic.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/status-basic.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-basic.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/status-basic.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-error-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/status-error-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-error-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/status-error-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-error.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/status-error.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/status-error.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/status-error.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any-expected.txt
>new file mode 100644
>index 00000000000..98ecb6e2e8c
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS progress event should not be fired by sync XHR 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.js
>new file mode 100644
>index 00000000000..a915e4d4129
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.js
>@@ -0,0 +1,12 @@
>+test(t => {
>+  let xhr = new XMLHttpRequest();
>+  let loadEventFired = false;
>+  xhr.onprogress = t.unreached_func('progress event should not be fired');
>+  xhr.onload = () => {
>+    loadEventFired = true;
>+  };
>+  xhr.open('GET', 'resources/trickle.py?count=4&delay=150', false);
>+  xhr.send();
>+  // Check the load event as a sanity check that the test is working.
>+  assert_true(loadEventFired, 'load event should have fired');
>+}, 'progress event should not be fired by sync XHR');
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.worker-expected.txt
>new file mode 100644
>index 00000000000..98ecb6e2e8c
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.worker-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS progress event should not be fired by sync XHR 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.worker.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.worker.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any-expected.txt
>new file mode 100644
>index 00000000000..7f93c394484
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS Sync XHR should not have a timeout 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.js b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.js
>new file mode 100644
>index 00000000000..d23fbb8c66d
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.js
>@@ -0,0 +1,16 @@
>+// META: global=sharedworker
>+// META: timeout=long
>+
>+// This is a regression test for https://crbug.com/844268, when a timeout of 10
>+// seconds was applied to XHR in Chrome. There should be no timeout unless the
>+// "timeout" parameter is set on the object.
>+test(t => {
>+  let xhr = new XMLHttpRequest();
>+
>+  // For practical reasons, we can't wait forever. 12 seconds is long enough to
>+  // reliably reproduce the bug in Chrome.
>+  xhr.open('GET', 'resources/trickle.py?ms=1000&count=12', false);
>+
>+  // The test will fail if this throws.
>+  xhr.send();
>+}, 'Sync XHR should not have a timeout');
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.worker-expected.txt
>new file mode 100644
>index 00000000000..7f93c394484
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.worker-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS Sync XHR should not have a timeout 
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.worker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.worker.html
>new file mode 100644
>index 00000000000..2382913528e
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.worker.html
>@@ -0,0 +1 @@
>+
>\ No newline at end of file
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/template-element-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/template-element-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/template-element-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/template-element-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/template-element.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/template-element.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/template-element.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/template-element.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-cors-async-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-cors-async-expected.txt
>new file mode 100644
>index 00000000000..d52cdb814a6
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-cors-async-expected.txt
>@@ -0,0 +1,5 @@
>+Blocked access to external URL http://www2.localhost:8800/xhr/resources/corsenabled.py?delay=2&code=200
>+CONSOLE MESSAGE: line 40: XMLHttpRequest cannot load http://www2.localhost:8800/xhr/resources/corsenabled.py?delay=2&code=200 due to access control checks.
>+
>+FAIL XMLHttpRequest: timeout event and cross-origin request assert_true: timeout event should fire expected true got false
>+
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-cors-async.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-cors-async.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-cors-async.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-cors-async.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-multiple-fetches-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-multiple-fetches-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-multiple-fetches-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-multiple-fetches-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-multiple-fetches.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-multiple-fetches.html
>similarity index 90%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-multiple-fetches.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-multiple-fetches.html
>index d2ab4d2c1d3..30d6b736c56 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-multiple-fetches.html
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-multiple-fetches.html
>@@ -18,7 +18,7 @@ async_test(t => {
> 
> async_test(t => {
>   const client = new XMLHttpRequest
>-  client.open("YO", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/delay.py")
>+  client.open("YO", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/delay.py")
>   client.timeout = 1000
>   client.send()
>   client.ontimeout = t.step_func_done(() => {
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-sync-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-sync-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-sync-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-sync-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-sync.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-sync.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/timeout-sync.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-sync.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/xhr/w3c-import.log
>new file mode 100644
>index 00000000000..0e371336afe
>--- /dev/null
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/w3c-import.log
>@@ -0,0 +1,304 @@
>+The tests in this directory were imported from the W3C repository.
>+Do NOT modify these tests directly in WebKit.
>+Instead, create a pull request on the WPT github:
>+	https://github.com/web-platform-tests/wpt
>+
>+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
>+
>+Do NOT modify or remove this file.
>+
>+------------------------------------------------------------------------
>+Properties requiring vendor prefixes:
>+None
>+Property values requiring vendor prefixes:
>+None
>+------------------------------------------------------------------------
>+List of files:
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/FormData-append.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/META.yml
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/README.md
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/XMLHttpRequest-withCredentials.any.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-receive.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-send.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-stop.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-after-timeout.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-done.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-headers-received.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-loading.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-open.any.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-unsent.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-during-upload.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-abort.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-listeners.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-loadend.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-event-order.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-abort.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/abort-upload-event-loadend.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-and-redirects.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header-data-url.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-access-control-origin-header.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-async.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method-async.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-non-cors-safelisted-method.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache-timeout.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-preflight-cache.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow-star.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-allow.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-response-headers.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-denied.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-success-no-content-type.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-basic-preflight-denied.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-header-denied.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-method-denied.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-async-not-supported.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-async.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-credential-sync.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-async.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-headers-sync.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-lowercase.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-header-sorted.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-headers-origin.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-301.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-400.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-invalid-status-501.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-request-must-not-contain-cookie.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-recursive-failed-request.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body-sync.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-body.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-response-with-exposed-headers.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow-origin-null.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-allow.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/access-control-sandboxed-iframe-denied.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/allow-lists-starting-with-comma.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/anonymous-mode-unsupported.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/close-worker-with-xhr-in-progress.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/data-uri.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-abort.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error-order.sub.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-error.sub.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-load.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadend.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart-upload.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-loadstart.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-progress.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystate-sync-open.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout-order.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-timeout.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/event-upload-progress.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-content-length.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/firing-events-http-no-content-length.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/folder.txt
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-blob.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-delete.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-foreach.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-get.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-has.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata-set.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/formdata.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-cookies.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-status.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-chunked-trailer.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-cookies-and-more.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-error-state.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-server-date.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-special-characters.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader-unsent-opened-state.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-async.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/header-user-agent-sync.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/headers-normalize-response.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/historical.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/idlharness.any.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/loadstart-and-state.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/no-utf16-json.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-after-abort.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-after-setrequestheader.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-event.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort-processing.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-during-abort.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-bogus.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-case-insensitive.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-case-sensitive.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-insecure.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-method-responsetype-set-sync.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-open-send.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-open-sync-send.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-parameters-toString.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-referer.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-send-during-abort.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-send-open.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-sync-open-send.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-about-blank-window.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-inserted-after-open.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base-inserted.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-base.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-encoding.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-fragment.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-javascript-window-2.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-javascript-window.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-2.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-3.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-4.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-5.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window-6.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-multi-window.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-sharedworker-origin.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-worker-origin.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-origin.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-worker-simple.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/open-user-password-non-same-origin.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-blob.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-done-state.any.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-edge-cases.window.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-headers-received-state-force-shiftjis.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-invalid-mime-type.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-loading-state.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-open-state-force-utf-8.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-open-state-force-xml.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/overridemimetype-unsent-state-force-shiftjis.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/preserve-ua-header-on-redirect.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/progress-events-response-data-gzip.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/progressevent-constructor.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/progressevent-interface.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-arraybuffer.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-blob.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-deflate.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-gzip.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/response-data-progress.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/response-invalid-responsetype.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/response-json.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/response-method.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responseText-status.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responseType-document-in-worker.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responseXML-unavailable-in-worker.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responsedocument-decoding.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetext-decoding.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responsetype.any.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responseurl.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-basic.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-document-properties.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-get-twice.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-media-type.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-non-document-types.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/responsexml-non-well-formed.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/security-consideration.sub.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-accept-language.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-accept.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-after-setting-document-domain.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-not-enabled.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-repeat-no-args.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-and-arguments.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader-existing-session.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic-setrequestheader.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-basic.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-competing-names-passwords.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-basic-setrequestheader.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-authentication-cors-setrequestheader-no-cred.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-conditional-cors.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-conditional.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-charset.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-content-type-string.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybuffer.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-arraybufferview.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-blob.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-es-object.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-formdata.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-data-unexpected-tostring.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-basic.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-document-bogus.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-document.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-empty.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-entity-body-none.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-loadend.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-loadstart.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-no-response-event-order.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-non-same-origin.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-receive-utf16.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus-sync.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-bogus.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-sync.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-infinite.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-no-location.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-to-cors.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-to-non-cors.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-event-order.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-loadend.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-loadstart.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-response-upload-event-progress.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-send.any.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-blocks-async.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-load.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-loadend.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-no-response-event-order.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-response-event-order.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-sync-timeout.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-timeout-events.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/send-usp.any.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-after-send.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-allow-empty-value.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-allow-whitespace-in-value.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-before-open.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-name.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-value.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-case-insensitive.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-allowed.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-forbidden.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-open-setrequestheader.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/status-async.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/status-basic.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/status-error.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-progress.any.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/sync-no-timeout.any.js
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/template-element.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-cors-async.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-multiple-fetches.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/timeout-sync.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-basic.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-eventtarget.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-sync.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error.htm
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts-subframe.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-scripts.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader-subframe.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-aborted.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-abortedonmain.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-overrides.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-overridesexpires.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-reused.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-simple.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-synconmain.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-twice.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-aborted.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overrides.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overridesexpires.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-simple.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-synconworker.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-twice.html
>+/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-unsent.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-basic-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-basic-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-basic-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-basic-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-basic.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-basic.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-basic.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-basic.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-eventtarget-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-eventtarget-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-eventtarget-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-eventtarget-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-eventtarget.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-eventtarget.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-eventtarget.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-eventtarget.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-sync-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-sync-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-sync.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-sync.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error.htm
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-subframe.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts-subframe.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-subframe.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts-subframe.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-defer-scripts.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-scripts-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-scripts-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-scripts-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-scripts-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-scripts.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-scripts.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-scripts.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-block-scripts.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub.html
>similarity index 76%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub.html
>index ade343716b1..5ad5557700d 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub.html
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub.html
>@@ -11,18 +11,21 @@
>   run_all_fp_tests_allow_all(
>       'http://{{domains[www]}}:{{ports[http][0]}}',
>       'sync-xhr',
>-      'InvalidAccessError: Failed to execute \'open\' on \'XMLHttpRequest\': ' +
>-      'Synchronous requests are disabled by Feature Policy.',
>+      'NetworkError',
>       () => {
>         return new Promise((resolve, reject) => {
>           try {
>             var xhr = new XMLHttpRequest();
>             xhr.open("GET", "data:,", false);
>-            xhr.send();
>-            resolve();
>+            try {
>+              xhr.send();
>+            } catch(e) {
>+              reject(e);
>+            }
>           } catch(e) {
>-            reject(e);
>+            reject({"name": "UnexpectedException:" + e.name});
>           }
>+          resolve();
>        });
>       });
>   </script>
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-subframe.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader-subframe.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-subframe.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader-subframe.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-not-hang-scriptloader.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-aborted-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-aborted-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-aborted-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-aborted-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-aborted.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-aborted.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-abortedonmain-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-abortedonmain-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-abortedonmain.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-abortedonmain.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overrides-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-overrides-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overrides-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-overrides-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-overrides.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-overrides.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-overridesexpires-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-overridesexpires-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-overridesexpires.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-overridesexpires.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-reused-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-reused-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-reused-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-reused-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-reused.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-reused.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-reused.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-reused.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-simple-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-simple-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-simple-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-simple-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-simple.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-simple.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-synconmain-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-synconmain-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-synconmain.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-synconmain.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-twice-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-twice-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-twice-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-twice-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-twice.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-twice.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-aborted-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-aborted-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-aborted.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-aborted.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overrides-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overrides-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overrides.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overrides.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overridesexpires-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overridesexpires-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overridesexpires.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-overridesexpires.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-simple-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-simple-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-simple.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-simple.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-synconworker-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-synconworker-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-synconworker.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-synconworker.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-twice-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-twice-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-twice.html
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-timeout-worker-twice.html
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-unsent-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-unsent-expected.txt
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-unsent-expected.txt
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-unsent-expected.txt
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-unsent.htm b/LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-unsent.htm
>similarity index 100%
>rename from LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-unsent.htm
>rename to LayoutTests/imported/w3c/web-platform-tests/xhr/xmlhttprequest-unsent.htm
>diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
>index a4dc890e451..d3eed119f82 100644
>--- a/LayoutTests/platform/gtk/TestExpectations
>+++ b/LayoutTests/platform/gtk/TestExpectations
>@@ -1858,7 +1858,7 @@ webkit.org/b/176757 fast/hidpi/filters-multiple.html [ Pass ImageOnlyFailure ]
> 
> webkit.org/b/177527 [ Release ] fast/hidpi/filters-blur.html [ Pass ImageOnlyFailure ]
> 
>-webkit.org/b/177530 imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm [ Pass Failure ]
>+webkit.org/b/177530 imported/w3c/web-platform-tests/xhr/setrequestheader-header-allowed.htm [ Pass Failure ]
> 
> webkit.org/b/177940 workers/wasm-hashset.html [ Crash Timeout Pass ]
> 
>@@ -1951,7 +1951,7 @@ webkit.org/b/186638 compositing/patterns/direct-pattern-compositing-padding.html
> webkit.org/b/186638 fast/mediastream/media-stream-track-source-failure.html [ Failure Timeout Pass ]
> webkit.org/b/186638 editing/selection/select-bidi-run.html [ Timeout Pass ]
> webkit.org/b/186638 imported/w3c/web-platform-tests/WebCryptoAPI/wrapKey_unwrapKey/wrapKey_unwrapKey.https.worker.html [ Failure Pass ]
>-webkit.org/b/186638 imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events.htm [ Failure Pass ]
>+webkit.org/b/186638 imported/w3c/web-platform-tests/xhr/send-timeout-events.htm [ Failure Pass ]
> webkit.org/b/186638 imported/w3c/web-platform-tests/IndexedDB/interleaved-cursors-large.html [ Failure Pass ]
> webkit.org/b/186638 imported/w3c/web-platform-tests/html/webappapis/timers/negative-settimeout.html [ Failure Pass ]
> webkit.org/b/186638 fast/selectors/hover-invalidation-descendant-dynamic.html [ Failure Pass ]
>@@ -1989,8 +1989,8 @@ webkit.org/b/186750 imported/w3c/web-platform-tests/WebCryptoAPI/derive_bits_key
> 
> webkit.org/b/186847 http/tests/inspector/network/resource-sizes-memory-cache.html [ Pass Failure ]
> 
>-webkit.org/b/186851 imported/w3c/web-platform-tests/XMLHttpRequest/formdata.htm [ Pass Failure ]
>-webkit.org/b/186851 imported/w3c/web-platform-tests/XMLHttpRequest/formdata-blob.htm [ Pass Failure ]
>+webkit.org/b/186851 imported/w3c/web-platform-tests/xhr/formdata.htm [ Pass Failure ]
>+webkit.org/b/186851 imported/w3c/web-platform-tests/xhr/formdata-blob.htm [ Pass Failure ]
> 
> webkit.org/b/187326 fast/selectors/selection-window-inactive-stroke-color.html [ Pass ImageOnlyFailure ]
> 
>@@ -3045,11 +3045,11 @@ webkit.org/b/148936 imported/w3c/web-platform-tests/html/semantics/embedded-cont
> webkit.org/b/149128 fast/text/control-characters [ ImageOnlyFailure ]
> 
> # web-platform-tests XHR tests
>-webkit.org/b/179663 imported/w3c/web-platform-tests/XMLHttpRequest/headers-normalize-response.htm [ Failure ]
>-webkit.org/b/179662 imported/w3c/web-platform-tests/XMLHttpRequest/status-async.htm [ Failure ]
>-webkit.org/b/179662 imported/w3c/web-platform-tests/XMLHttpRequest/status-basic.htm [ Failure ]
>-webkit.org/b/179662 imported/w3c/web-platform-tests/XMLHttpRequest/status-error.htm [ Failure ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/event-readystatechange-loaded.htm [ Slow ]
>+webkit.org/b/179663 imported/w3c/web-platform-tests/xhr/headers-normalize-response.htm [ Failure ]
>+webkit.org/b/179662 imported/w3c/web-platform-tests/xhr/status-async.htm [ Failure ]
>+webkit.org/b/179662 imported/w3c/web-platform-tests/xhr/status-basic.htm [ Failure ]
>+webkit.org/b/179662 imported/w3c/web-platform-tests/xhr/status-error.htm [ Failure ]
>+imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.htm [ Slow ]
> 
> webkit.org/b/151267 imported/blink/compositing/squashing/squashing-reflection-disallowed.html [ ImageOnlyFailure ]
> webkit.org/b/151267 imported/blink/compositing/will-change/stacking-context-creation.html [ ImageOnlyFailure ]
>@@ -3448,13 +3448,13 @@ webkit.org/b/185254 http/tests/cache/disk-cache/redirect-chain-limits.html [ Fai
> webkit.org/b/185254 http/tests/xmlhttprequest/onloadend-event-after-error.html [ Failure ]
> webkit.org/b/185254 http/tests/xmlhttprequest/response-access-on-error.html [ Failure ]
> webkit.org/b/185254 http/tests/xmlhttprequest/state-after-network-error.html [ Failure ]
>-webkit.org/b/185254 imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite.htm [ Failure ]
>-webkit.org/b/185254 imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error.htm [ Failure ]
>+webkit.org/b/185254 imported/w3c/web-platform-tests/xhr/send-redirect-infinite.htm [ Failure ]
>+webkit.org/b/185254 imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error.htm [ Failure ]
> webkit.org/b/185254 http/tests/cache/network-error-during-revalidation.html [ Failure ]
> webkit.org/b/185254 http/tests/xmlhttprequest/XMLHttpRequestException.html [ Failure ]
> webkit.org/b/185254 http/tests/xmlhttprequest/onloadend-event-after-sync-requests.html [ Failure ]
>-webkit.org/b/185254 imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync.htm [ Failure ]
>-webkit.org/b/185254 imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync.htm [ Failure ]
>+webkit.org/b/185254 imported/w3c/web-platform-tests/xhr/send-redirect-infinite-sync.htm [ Failure ]
>+webkit.org/b/185254 imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-sync.htm [ Failure ]
> webkit.org/b/185254 http/tests/xmlhttprequest/connection-error-sync.html [ Failure ]
> 
> webkit.org/b/185548 accessibility/scroll-to-make-visible-iframe-offscreen.html [ Failure ]
>diff --git a/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async-expected.txt b/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async-expected.txt
>rename to LayoutTests/platform/gtk/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt
>diff --git a/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-expected.txt b/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-expected.txt
>rename to LayoutTests/platform/gtk/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt
>diff --git a/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt b/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt
>rename to LayoutTests/platform/gtk/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub-expected.txt
>diff --git a/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-expected.txt b/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/xhr/send-redirect-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-expected.txt
>rename to LayoutTests/platform/gtk/imported/w3c/web-platform-tests/xhr/send-redirect-expected.txt
>diff --git a/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt b/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/gtk/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt
>rename to LayoutTests/platform/gtk/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt
>diff --git a/LayoutTests/platform/ios-device/TestExpectations b/LayoutTests/platform/ios-device/TestExpectations
>index 661de86b72a..d5c8e19559f 100644
>--- a/LayoutTests/platform/ios-device/TestExpectations
>+++ b/LayoutTests/platform/ios-device/TestExpectations
>@@ -74,8 +74,8 @@ imported/blink/compositing/child-transform-layer-with-foreground-layer.html [ Im
> imported/blink/fast/canvas/canvas-unbalanced-save.html [ ImageOnlyFailure ]
> 
> imported/w3c/web-platform-tests/IndexedDB/idbcursor-update-exception-order.htm [ Skip ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync.htm [ Skip ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/send-send.htm [ Skip ]
>+imported/w3c/web-platform-tests/xhr/send-redirect-bogus-sync.htm [ Skip ]
>+imported/w3c/web-platform-tests/xhr/send-send.htm [ Skip ]
> imported/w3c/web-platform-tests/cssom/ttwf-cssom-document-extension.html [ Skip ]
> imported/w3c/web-platform-tests/dom/nodes/Element-childElement-null-xhtml.xhtml [ Skip ]
> imported/w3c/web-platform-tests/dom/nodes/getElementsByClassName-06.htm [ Skip ]
>diff --git a/LayoutTests/platform/ios-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt b/LayoutTests/platform/ios-wk1/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/ios-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt
>rename to LayoutTests/platform/ios-wk1/imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub-expected.txt
>diff --git a/LayoutTests/platform/ios-wk2/TestExpectations b/LayoutTests/platform/ios-wk2/TestExpectations
>index 4c9e7f49277..b9414198b24 100644
>--- a/LayoutTests/platform/ios-wk2/TestExpectations
>+++ b/LayoutTests/platform/ios-wk2/TestExpectations
>@@ -1270,7 +1270,7 @@ webkit.org/b/171638 [ Release ] http/tests/xmlhttprequest/methods.html [ Pass Ti
> 
> webkit.org/b/171830 [ Debug ] http/tests/websocket/tests/hybi/workers/close.html [ Pass Failure ]
> 
>-webkit.org/b/169637 imported/w3c/web-platform-tests/XMLHttpRequest/timeout-multiple-fetches.html [ Pass Failure ]
>+webkit.org/b/169637 imported/w3c/web-platform-tests/xhr/timeout-multiple-fetches.html [ Pass Failure ]
> 
> webkit.org/b/171886 imported/w3c/web-platform-tests/streams/readable-byte-streams/general.html [ Pass Failure ]
> 
>@@ -1290,7 +1290,7 @@ webkit.org/b/171985 [ Release ] workers/bomb.html [ Pass Timeout ]
> webkit.org/b/175939 [ Debug ] editing/execCommand/forward-delete-read-write-canvas.html [ Skip ]
> 
> # <rdar://problem/32826391>
>-imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type.htm [ Failure ]
>+imported/w3c/web-platform-tests/xhr/setrequestheader-content-type.htm [ Failure ]
> 
> webkit.org/b/176240 http/tests/websocket/tests/hybi/handshake-ok-with-legacy-websocket-response-headers.html [ Pass Failure ]
> 
>@@ -1317,8 +1317,6 @@ webkit.org/b/181821 fast/visual-viewport/ios/caret-after-focus-in-fixed.html [ P
> 
> webkit.org/b/182144 [ Debug ] webgl/1.0.3/conformance/rendering/many-draw-calls.html [ Skip ]
> 
>-webkit.org/b/182849 imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm [ Pass Failure ]
>-
> # This is marked as Pass to see if additional logging can reveal the cause of the flakiness.
> webkit.org/b/183714 [ Debug ] http/tests/storageAccess/grant-storage-access-under-opener.html [ Pass ]
> 
>diff --git a/LayoutTests/platform/ios/TestExpectations b/LayoutTests/platform/ios/TestExpectations
>index e4d02f4b083..1542aee5f28 100644
>--- a/LayoutTests/platform/ios/TestExpectations
>+++ b/LayoutTests/platform/ios/TestExpectations
>@@ -2434,7 +2434,7 @@ webkit.org/b/152282 legacy-animation-engine/css3/filters/composited-during-trans
> 
> webkit.org/b/152935 fast/scrolling/scroll-position-on-reload-rtl.html [ Failure ]
> 
>-webkit.org/b/153371 imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm [ Pass Failure ]
>+webkit.org/b/153371 imported/w3c/web-platform-tests/xhr/getresponseheader-chunked-trailer.htm [ Pass Failure ]
> 
> webkit.org/b/169210 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/persisted-user-state-restoration/scroll-restoration-navigation-samedoc.html [ Failure ]
> 
>@@ -2451,7 +2451,7 @@ webkit.org/b/153370 imported/w3c/web-platform-tests/html/dom/documents/dom-tree-
> 
> webkit.org/b/153311 fast/replaced/preferred-widths.html [ Pass Failure ]
> 
>-webkit.org/b/153336 imported/w3c/web-platform-tests/XMLHttpRequest/open-url-multi-window-4.htm [ Pass Failure ]
>+webkit.org/b/153336 imported/w3c/web-platform-tests/xhr/open-url-multi-window-4.htm [ Pass Failure ]
> 
> webkit.org/b/153803 perf/show-hide-table-rows.html [ Pass Failure ]
> 
>@@ -2709,7 +2709,7 @@ imported/w3c/web-platform-tests/dom/nodes/Document-contentType/contentType/conte
> css3/font-variant-petite-caps-synthesis.html [ ImageOnlyFailure ]
> css3/font-variant-small-caps-synthesis.html [ ImageOnlyFailure ]
> 
>-webkit.org/b/161949 imported/w3c/web-platform-tests/XMLHttpRequest/response-method.htm [ Failure ]
>+webkit.org/b/161949 imported/w3c/web-platform-tests/xhr/response-method.htm [ Failure ]
> 
> webkit.org/b/130972 transitions/3d/interrupted-transition.html [ Pass Timeout ]
> webkit.org/b/130972 legacy-animation-engine/transitions/3d/interrupted-transition.html [ Pass Timeout ]
>@@ -2986,7 +2986,7 @@ fast/text/ipa-tone-letters.html [ Failure ]
> # <rdar://problem/33251388> REGRESSION: Multiple imported/w3c/web-platform-tests/ are failing with blobs
> imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any.html [ Failure ]
> imported/w3c/web-platform-tests/fetch/api/basic/request-headers.any.worker.html [ Failure ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type.html [ Failure ]
>+imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type.html [ Failure ]
> 
> # <rdar://problem/33630526> http/tests/websocket/tests/hybi/deflate-frame-parameter.html is failing on iOS 11
> http/tests/websocket/tests/hybi/deflate-frame-parameter.html [ Failure ]
>diff --git a/LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive-expected.txt b/LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive-expected.txt
>rename to LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive-expected.txt
>diff --git a/LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt b/LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt
>rename to LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt
>diff --git a/LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty-expected.txt b/LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty-expected.txt
>rename to LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt
>diff --git a/LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none-expected.txt b/LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none-expected.txt
>rename to LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt
>diff --git a/LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt b/LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/ios/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt
>rename to LayoutTests/platform/ios/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt
>diff --git a/LayoutTests/platform/mac-sierra/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt b/LayoutTests/platform/mac-sierra/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/mac-sierra/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt
>rename to LayoutTests/platform/mac-sierra/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt
>diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
>index c28aeaf80a2..d26ed3b1279 100644
>--- a/LayoutTests/platform/mac-wk1/TestExpectations
>+++ b/LayoutTests/platform/mac-wk1/TestExpectations
>@@ -368,7 +368,8 @@ webkit.org/b/158585 webgl/webgl-backing-store-size-update.html [ Pass Timeout ]
> # rdar://problem/26478296
> [ Sierra+ ] svg/hixie/text/003.html [ Failure ]
> 
>-webkit.org/b/159893 [ Debug ] imported/w3c/web-platform-tests/XMLHttpRequest/event-readystatechange-loaded.htm [ Pass Failure ]
>+webkit.org/b/159893 [ Debug ] imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.htm [ Pass Failure ]
>+webkit.org/b/188816 [ Debug ] imported/w3c/web-platform-tests/xhr/event-upload-progress.htm [ Pass Crash ]
> 
> webkit.org/b/160101 userscripts/window-onerror-for-isolated-world-3.html [ Pass Failure ]
> 
>@@ -426,7 +427,7 @@ css3/viewport-percentage-lengths/vh-auto-size.html [ Skip ]
> 
> webkit.org/b/170877 [ Debug ] webgl/1.0.2/conformance/glsl/misc/shader-with-reserved-words.html [ Pass Timeout ]
> 
>-webkit.org/b/180554 imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm [ Skip ]
>+webkit.org/b/180554 imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm [ Skip ]
> 
> webkit.org/b/187372 imported/w3c/web-platform-tests/IndexedDB/interfaces.any.worker.html [ Pass Timeout Slow ]
> 
>@@ -511,7 +512,7 @@ webkit.org/b/175886 svg/animations/smil-leak-element-instances.svg [ Pass Failur
> 
> webkit.org/b/172397 [ Debug ] legacy-animation-engine/animations/needs-layout.html [ Pass ImageOnlyFailure ]
> 
>-webkit.org/b/179775 imported/w3c/web-platform-tests/XMLHttpRequest/firing-events-http-no-content-length.html [ Pass Failure ]
>+webkit.org/b/179775 imported/w3c/web-platform-tests/xhr/firing-events-http-no-content-length.html [ Pass Failure ]
> 
> webkit.org/b/172044 [ Debug ] imported/w3c/web-platform-tests/IndexedDB/open-request-queue.html [ Pass Timeout ]
> 
>diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt
>rename to LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-expected.txt
>diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/event-error-order.sub-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/event-error-order.sub-expected.txt
>new file mode 100644
>index 00000000000..85e046dfc06
>--- /dev/null
>+++ b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/event-error-order.sub-expected.txt
>@@ -0,0 +1,3 @@
>+
>+FAIL XMLHttpRequest: event - error (order of events) assert_equals: expected "upload.loadstart(0,12,true)" but got "upload.loadstart(0,0,false)"
>+
>diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/late-upload-events-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/late-upload-events-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/late-upload-events-expected.txt
>rename to LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/late-upload-events-expected.txt
>diff --git a/LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-expected.txt
>similarity index 74%
>rename from LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors-expected.txt
>rename to LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-expected.txt
>index 503780260b5..c7ac7b05c44 100644
>--- a/LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors-expected.txt
>+++ b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-expected.txt
>@@ -1,5 +1,5 @@
> CONSOLE MESSAGE: CORS-preflight request was blocked
>-CONSOLE MESSAGE: XMLHttpRequest cannot load http://www1.localhost:8800/XMLHttpRequest/resources/auth1/corsenabled.py due to access control checks.
>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://www1.localhost:8800/xhr/resources/auth1/corsenabled.py due to access control checks.
> 
> PASS XMLHttpRequest: send() - "Basic" authenticated CORS requests with user name and password passed to open() (asserts failure) 
> 
>diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub-expected.txt
>rename to LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub-expected.txt
>diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub-expected.txt
>rename to LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/xhr/xmlhttprequest-sync-default-feature-policy.sub-expected.txt
>diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
>index 284fea1520b..07684571506 100644
>--- a/LayoutTests/platform/mac-wk2/TestExpectations
>+++ b/LayoutTests/platform/mac-wk2/TestExpectations
>@@ -817,7 +817,7 @@ webkit.org/b/182341 imported/w3c/web-platform-tests/service-workers/service-work
> 
> webkit.org/b/179352 imported/w3c/web-platform-tests/service-workers/service-worker/windowclient-navigate.https.html [ Pass Failure Slow ]
> 
>-webkit.org/b/182849 imported/w3c/web-platform-tests/XMLHttpRequest/event-upload-progress-crossorigin.htm [ Pass Failure ]
>+webkit.org/b/182849 imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm [ Pass Failure ]
> 
> webkit.org/b/183164 fast/dom/Window/window-focus-self.html [ Pass Failure ]
> 
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index 71375966e72..caf62e664e0 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -1133,9 +1133,9 @@ webkit.org/b/58766 fast/canvas/webgl/gl-teximage.html [ Pass Failure ]
> # Imported Blink tests which have not been investigated.
> imported/blink/compositing/video/video-controls-layer-creation-squashing.html [ Pass ImageOnlyFailure ]
> 
>-webkit.org/b/150806 imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events.htm [ Pass Failure ]
>-webkit.org/b/150823 imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm [ Pass Failure ]
>-webkit.org/b/159724 [ Debug ] imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload.htm [ Skip ]
>+webkit.org/b/150806 imported/w3c/web-platform-tests/xhr/send-timeout-events.htm [ Pass Failure ]
>+webkit.org/b/150823 imported/w3c/web-platform-tests/xhr/getresponseheader-chunked-trailer.htm [ Pass Failure ]
>+webkit.org/b/159724 [ Debug ] imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm [ Skip ]
> 
> webkit.org/b/162668 fast/text/woff2-totalsfntsize.html [ ImageOnlyFailure ]
> 
>@@ -1204,8 +1204,8 @@ webkit.org/b/158889 media/video-controls-show-on-kb-or-ax-event.html [ Pass Fail
> # <rdar://problem/23500327> storage/websql/alter-to-info-table.html
> [ Sierra+ ] storage/websql/alter-to-info-table.html [ Pass Failure ]
> 
>-# <rdar://problem/23504749> imported/w3c/web-platform-tests/XMLHttpRequest/response-method.htm failing
>-[ Sierra+ ] imported/w3c/web-platform-tests/XMLHttpRequest/response-method.htm [ Pass Failure ]
>+# <rdar://problem/23504749> imported/w3c/web-platform-tests/xhr/response-method.htm failing
>+[ Sierra+ ] imported/w3c/web-platform-tests/xhr/response-method.htm [ Pass Failure ]
> 
> # <rdar://problem/23505582> Fails on iMac10,1 and iMac11,1
> [ Sierra+ ] fast/canvas/canvas-imageSmoothingEnabled-repaint.html [ Pass Failure ]
>@@ -1371,7 +1371,7 @@ webkit.org/b/169324 media/track/media-element-enqueue-event-crash.html [ Pass Fa
> 
> webkit.org/b/169572 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/location_hash.html [ Pass Failure ]
> 
>-webkit.org/b/169637 imported/w3c/web-platform-tests/XMLHttpRequest/timeout-multiple-fetches.html [ Pass Failure ]
>+webkit.org/b/169637 imported/w3c/web-platform-tests/xhr/timeout-multiple-fetches.html [ Pass Failure ]
> 
> # <rdar://problem/19759913>
> http/tests/media/video-served-as-text-with-type.html [ Skip ]
>@@ -1585,8 +1585,8 @@ webkit.org/b/172052 [ Debug ] imported/w3c/web-platform-tests/html/webappapis/ti
> # <rdar://problem/32800095> REGRESSION: LayoutTest imported/blink/fast/gradients/gradient-transparency.html is failing
> [ HighSierra+ ] imported/blink/fast/gradients/gradient-transparency.html [ ImageOnlyFailure ]
> 
>-# <rdar://problem/32826391> LayoutTest imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type.htm is failing on High Sierra
>-[ HighSierra+ ] imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type.htm [ Failure ]
>+# <rdar://problem/32826391> LayoutTest imported/w3c/web-platform-tests/xhr/setrequestheader-content-type.htm is failing on High Sierra
>+[ HighSierra+ ] imported/w3c/web-platform-tests/xhr/setrequestheader-content-type.htm [ Failure ]
> 
> # <rdar://problem/32864306> Unskip after bots have CTFontCopyPhysicalFont()
> [ HighSierra+ ] fast/text/system-font-japanese-synthetic-italic.html [ Pass ImageOnlyFailure ]
>diff --git a/LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive-expected.txt b/LayoutTests/platform/mac/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-case-insensitive-expected.txt
>rename to LayoutTests/platform/mac/imported/w3c/web-platform-tests/xhr/getresponseheader-case-insensitive-expected.txt
>diff --git a/LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt b/LayoutTests/platform/mac/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/send-blob-with-no-mime-type-expected.txt
>rename to LayoutTests/platform/mac/imported/w3c/web-platform-tests/xhr/send-blob-with-no-mime-type-expected.txt
>diff --git a/LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty-expected.txt b/LayoutTests/platform/mac/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-empty-expected.txt
>rename to LayoutTests/platform/mac/imported/w3c/web-platform-tests/xhr/send-entity-body-empty-expected.txt
>diff --git a/LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none-expected.txt b/LayoutTests/platform/mac/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/mac/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-none-expected.txt
>rename to LayoutTests/platform/mac/imported/w3c/web-platform-tests/xhr/send-entity-body-none-expected.txt
>diff --git a/LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt b/LayoutTests/platform/win/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt
>rename to LayoutTests/platform/win/imported/w3c/web-platform-tests/xhr/access-control-and-redirects-expected.txt
>diff --git a/LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/late-upload-events-expected.txt b/LayoutTests/platform/win/imported/w3c/web-platform-tests/xhr/late-upload-events-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/late-upload-events-expected.txt
>rename to LayoutTests/platform/win/imported/w3c/web-platform-tests/xhr/late-upload-events-expected.txt
>diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors-expected.txt b/LayoutTests/platform/win/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/send-authentication-basic-cors-expected.txt
>rename to LayoutTests/platform/win/imported/w3c/web-platform-tests/xhr/send-authentication-basic-cors-expected.txt
>diff --git a/LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub-expected.txt b/LayoutTests/platform/win/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/win/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-async-events.sub-expected.txt
>rename to LayoutTests/platform/win/imported/w3c/web-platform-tests/xhr/send-network-error-async-events.sub-expected.txt
>diff --git a/LayoutTests/platform/wpe/TestExpectations b/LayoutTests/platform/wpe/TestExpectations
>index 8748cf0830f..662f6e647c3 100644
>--- a/LayoutTests/platform/wpe/TestExpectations
>+++ b/LayoutTests/platform/wpe/TestExpectations
>@@ -561,7 +561,7 @@ webkit.org/b/188162 [ Debug ] fast/canvas/webgl/texImage2D-video-flipY-true.html
> # 6. FLAKY TESTS
> #////////////////////////////////////////////////////////////////////////////////////////
> 
>-webkit.org/b/177530 imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm [ Pass Failure ]
>+webkit.org/b/177530 imported/w3c/web-platform-tests/xhr/setrequestheader-header-allowed.htm [ Pass Failure ]
> 
> # Irregularly crashing on the HeadlessViewBackend.
> webkit.org/b/173654 http/tests/appcache/insert-html-element-with-manifest-2.html [ Pass Crash ]
>@@ -662,10 +662,10 @@ webkit.org/b/188057 imported/w3c/web-platform-tests/html/dom/interfaces.html [ F
> 
> webkit.org/b/180932 [ Debug ] imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements [ Pass Crash ]
> 
>-webkit.org/b/179611 imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-document.htm [ Pass Failure ]
>-webkit.org/b/179607 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async.htm [ Pass Failure ]
>-webkit.org/b/179607 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-async-same-origin.htm [ Pass Failure ]
>-webkit.org/b/159724 imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-post-upload.htm [ Pass Failure ]
>+webkit.org/b/179611 imported/w3c/web-platform-tests/xhr/send-entity-body-document.htm [ Pass Failure ]
>+webkit.org/b/179607 imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async.htm [ Pass Failure ]
>+webkit.org/b/179607 imported/w3c/web-platform-tests/xhr/access-control-and-redirects-async-same-origin.htm [ Pass Failure ]
>+webkit.org/b/159724 imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm [ Pass Failure ]
> 
> Bug(WPE) fast/doctypes/xhtml-with-xhtmlmp-doctype.xhtml [ Pass Failure ]
> Bug(WPE) fast/doctypes/xhtml-with-xhtmlmp12-doctype.xhtml [ Pass Failure ]
>@@ -924,22 +924,22 @@ webkit.org/b/180648 imported/w3c/web-platform-tests/html/semantics/text-level-se
> webkit.org/b/180648 http/wpt/html/semantics/text-level-semantics/the-a-element/a-download-click-404.html [ Failure ]
> webkit.org/b/175419 imported/w3c/web-platform-tests/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-agent-formalism/canblock-serviceworker.https.html [ Failure ]
> 
>-webkit.org/b/127676 imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus.htm [ Skip ]
>-webkit.org/b/127676 imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors.htm [ Skip ]
>-webkit.org/b/127676 imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-non-cors.htm [ Skip ]
>-
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-header-denied.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-method-denied.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-async-not-supported.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-header-denied.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-method-denied.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-sync-not-supported.htm [ Failure ]
>-webkit.org/b/179608 imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional-cors.htm [ Failure ]
>-webkit.org/b/179375 imported/w3c/web-platform-tests/XMLHttpRequest/responsexml-document-properties.htm [ Failure ]
>-webkit.org/b/171031 imported/w3c/web-platform-tests/XMLHttpRequest/getallresponseheaders-cl.htm [ Failure ]
>-
>-webkit.org/b/179663 imported/w3c/web-platform-tests/XMLHttpRequest/headers-normalize-response.htm [ Failure ]
>-webkit.org/b/175586 imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub.htm [ Failure ]
>+webkit.org/b/127676 imported/w3c/web-platform-tests/xhr/send-redirect-bogus.htm [ Skip ]
>+webkit.org/b/127676 imported/w3c/web-platform-tests/xhr/send-redirect-to-cors.htm [ Skip ]
>+webkit.org/b/127676 imported/w3c/web-platform-tests/xhr/send-redirect-to-non-cors.htm [ Skip ]
>+
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-async-header-denied.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-async-method-denied.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-async-not-supported.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm [ Failure ]
>+webkit.org/b/179608 imported/w3c/web-platform-tests/xhr/send-conditional-cors.htm [ Failure ]
>+webkit.org/b/179375 imported/w3c/web-platform-tests/xhr/responsexml-document-properties.htm [ Failure ]
>+webkit.org/b/171031 imported/w3c/web-platform-tests/xhr/getallresponseheaders-cl.htm [ Failure ]
>+
>+webkit.org/b/179663 imported/w3c/web-platform-tests/xhr/headers-normalize-response.htm [ Failure ]
>+webkit.org/b/175586 imported/w3c/web-platform-tests/xhr/send-network-error-sync-events.sub.htm [ Failure ]
> 
> Bug(WPE) fast/css-grid-layout/flex-content-sized-columns-resize.html [ Timeout ]
> Bug(WPE) fast/css-grid-layout/grid-baseline-margins.html [ ImageOnlyFailure ]
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/access-control-basic-cors-safelisted-request-headers-expected.txt
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/access-control-basic-get-fail-non-simple-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/access-control-basic-get-fail-non-simple-expected.txt
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-async-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-async-expected.txt
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-entity-body-get-head-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/send-entity-body-get-head-expected.txt
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/send-redirect-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/send-redirect-expected.txt
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-expected.txt
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-sync-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/send-redirect-infinite-sync-expected.txt
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type-expected.txt
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-expected.txt
>diff --git a/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync-expected.txt b/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-sync-expected.txt
>similarity index 100%
>rename from LayoutTests/platform/wpe/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync-expected.txt
>rename to LayoutTests/platform/wpe/imported/w3c/web-platform-tests/xhr/xmlhttprequest-network-error-sync-expected.txt

Flags:

rniwa: review+
commit-queue: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 188816: 347701 | 347736 | 347742 | 347743 | 347748 | 347796 | 348114 | 348117