diff --git a/testing/web-platform/tests/native-file-system/META.yml b/testing/web-platform/tests/file-system-access/META.yml
similarity index 100%
rename from testing/web-platform/tests/native-file-system/META.yml
rename to testing/web-platform/tests/file-system-access/META.yml
diff --git a/testing/web-platform/tests/file-system-access/README.md b/testing/web-platform/tests/file-system-access/README.md
new file mode 100644
index 000000000000..b007264cea5d
--- /dev/null
+++ b/testing/web-platform/tests/file-system-access/README.md
@@ -0,0 +1,2 @@
+This directory contains tests for the
+[File System Access](https://wicg.github.io/file-system-access/) specification.
diff --git a/testing/web-platform/tests/native-file-system/idlharness.https.any.js b/testing/web-platform/tests/file-system-access/idlharness.https.any.js
similarity index 93%
rename from testing/web-platform/tests/native-file-system/idlharness.https.any.js
rename to testing/web-platform/tests/file-system-access/idlharness.https.any.js
index 9e7b52261ced..ab182537356a 100644
--- a/testing/web-platform/tests/native-file-system/idlharness.https.any.js
+++ b/testing/web-platform/tests/file-system-access/idlharness.https.any.js
@@ -5,7 +5,7 @@
'use strict';
idl_test(
- ['native-file-system'],
+ ['file-system-access'],
['storage', 'permissions', 'streams', 'html', 'dom'],
idl_array => {
idl_array.add_objects({
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-IndexedDB-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
similarity index 90%
rename from testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-IndexedDB-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
index c68df06de9ac..211b190aad36 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-IndexedDB-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
@@ -6,7 +6,7 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-isSameEntry-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html
similarity index 86%
rename from testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-isSameEntry-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html
index 1d13d8bab668..d2ddc2dbdccc 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-isSameEntry-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html
@@ -6,5 +6,5 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
similarity index 91%
rename from testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
index 07f8d9620d8e..f395b0b4c17e 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
@@ -8,7 +8,7 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html
similarity index 92%
rename from testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html
index 19fcb3ea7160..67206e350966 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html
@@ -9,7 +9,7 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
similarity index 90%
rename from testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
index 81e545c5190b..35f23d8387d8 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
@@ -7,7 +7,7 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
similarity index 90%
rename from testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
index 1b583d0c395d..922cbf556a13 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
@@ -7,7 +7,7 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
similarity index 92%
rename from testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
index 22d0bf5a7231..22ef3ba37d36 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
@@ -8,7 +8,7 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-frames-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html
similarity index 90%
rename from testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-frames-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html
index 6d5c5ab78ab8..8eb908270824 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-frames-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html
@@ -7,7 +7,7 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-windows-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html
similarity index 90%
rename from testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-windows-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html
index ad1e8e7bcf31..2137ea368c94 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-windows-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html
@@ -7,7 +7,7 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-workers-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html
similarity index 91%
rename from testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-workers-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html
index bc1fc5087a61..619a37cc9721 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemBaseHandle-postMessage-workers-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html
@@ -8,7 +8,7 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html
similarity index 86%
rename from testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html
index 03672321e2d8..63a88538e8b9 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-getDirectoryHandle-manual.https.html
@@ -6,5 +6,5 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-getFileHandle-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-getFileHandle-manual.https.html
similarity index 86%
rename from testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-getFileHandle-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-getFileHandle-manual.https.html
index 94b31226f8d6..d16771bf450d 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-getFileHandle-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-getFileHandle-manual.https.html
@@ -6,5 +6,5 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-iteration-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-iteration-manual.https.html
similarity index 86%
rename from testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-iteration-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-iteration-manual.https.html
index 10d891098dee..495ea5e0a095 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-iteration-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-iteration-manual.https.html
@@ -6,5 +6,5 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-removeEntry-manual.https.html
similarity index 86%
rename from testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-removeEntry-manual.https.html
index cedb87587cee..765492e1e861 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-removeEntry-manual.https.html
@@ -6,5 +6,5 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-resolve-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-resolve-manual.https.html
similarity index 86%
rename from testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-resolve-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-resolve-manual.https.html
index 9c001b366b9d..0d539abb54e0 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemDirectoryHandle-resolve-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemDirectoryHandle-resolve-manual.https.html
@@ -6,5 +6,5 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemFileHandle-getFile-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemFileHandle-getFile-manual.https.html
similarity index 85%
rename from testing/web-platform/tests/native-file-system/native_FileSystemFileHandle-getFile-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemFileHandle-getFile-manual.https.html
index 5a0b1d97b05a..9d8dede88949 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemFileHandle-getFile-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemFileHandle-getFile-manual.https.html
@@ -6,5 +6,5 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemWritableFileStream-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemWritableFileStream-manual.https.html
similarity index 85%
rename from testing/web-platform/tests/native-file-system/native_FileSystemWritableFileStream-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemWritableFileStream-manual.https.html
index 56ff51cd05a7..2db242c708d0 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemWritableFileStream-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemWritableFileStream-manual.https.html
@@ -6,5 +6,5 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemWritableFileStream-piped-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemWritableFileStream-piped-manual.https.html
similarity index 88%
rename from testing/web-platform/tests/native-file-system/native_FileSystemWritableFileStream-piped-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemWritableFileStream-piped-manual.https.html
index f6c6e6009aad..296f75412e1c 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemWritableFileStream-piped-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemWritableFileStream-piped-manual.https.html
@@ -6,6 +6,6 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/native_FileSystemWritableFileStream-write-manual.https.html b/testing/web-platform/tests/file-system-access/local_FileSystemWritableFileStream-write-manual.https.html
similarity index 86%
rename from testing/web-platform/tests/native-file-system/native_FileSystemWritableFileStream-write-manual.https.html
rename to testing/web-platform/tests/file-system-access/local_FileSystemWritableFileStream-write-manual.https.html
index 280edc27e5ad..eb9708740b58 100644
--- a/testing/web-platform/tests/native-file-system/native_FileSystemWritableFileStream-write-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/local_FileSystemWritableFileStream-write-manual.https.html
@@ -6,5 +6,5 @@
-
+
diff --git a/testing/web-platform/tests/native-file-system/opaque-origin.https.window.js b/testing/web-platform/tests/file-system-access/opaque-origin.https.window.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/opaque-origin.https.window.js
rename to testing/web-platform/tests/file-system-access/opaque-origin.https.window.js
diff --git a/testing/web-platform/tests/native-file-system/resources/data/testfile.txt b/testing/web-platform/tests/file-system-access/resources/data/testfile.txt
similarity index 100%
rename from testing/web-platform/tests/native-file-system/resources/data/testfile.txt
rename to testing/web-platform/tests/file-system-access/resources/data/testfile.txt
diff --git a/testing/web-platform/tests/native-file-system/resources/native-fs-test-helpers.js b/testing/web-platform/tests/file-system-access/resources/local-fs-test-helpers.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/resources/native-fs-test-helpers.js
rename to testing/web-platform/tests/file-system-access/resources/local-fs-test-helpers.js
diff --git a/testing/web-platform/tests/native-file-system/resources/message-target-dedicated-worker.js b/testing/web-platform/tests/file-system-access/resources/message-target-dedicated-worker.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/resources/message-target-dedicated-worker.js
rename to testing/web-platform/tests/file-system-access/resources/message-target-dedicated-worker.js
diff --git a/testing/web-platform/tests/native-file-system/resources/message-target-service-worker.js b/testing/web-platform/tests/file-system-access/resources/message-target-service-worker.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/resources/message-target-service-worker.js
rename to testing/web-platform/tests/file-system-access/resources/message-target-service-worker.js
diff --git a/testing/web-platform/tests/native-file-system/resources/message-target-shared-worker.js b/testing/web-platform/tests/file-system-access/resources/message-target-shared-worker.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/resources/message-target-shared-worker.js
rename to testing/web-platform/tests/file-system-access/resources/message-target-shared-worker.js
diff --git a/testing/web-platform/tests/native-file-system/resources/message-target.html b/testing/web-platform/tests/file-system-access/resources/message-target.html
similarity index 100%
rename from testing/web-platform/tests/native-file-system/resources/message-target.html
rename to testing/web-platform/tests/file-system-access/resources/message-target.html
diff --git a/testing/web-platform/tests/native-file-system/resources/message-target.js b/testing/web-platform/tests/file-system-access/resources/message-target.js
similarity index 98%
rename from testing/web-platform/tests/native-file-system/resources/message-target.js
rename to testing/web-platform/tests/file-system-access/resources/message-target.js
index 98c726eea066..1e9ef636a33a 100644
--- a/testing/web-platform/tests/native-file-system/resources/message-target.js
+++ b/testing/web-platform/tests/file-system-access/resources/message-target.js
@@ -1,8 +1,8 @@
'use strict';
// This script depends on the following scripts:
-// /native-file-system/resources/messaging-helpers.js
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/messaging-helpers.js
+// /file-system-access/resources/test-helpers.js
// add_message_event_handlers() is the helper function used to setup all
// message targets, including iframes and workers.
diff --git a/testing/web-platform/tests/native-file-system/resources/messaging-blob-helpers.js b/testing/web-platform/tests/file-system-access/resources/messaging-blob-helpers.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/resources/messaging-blob-helpers.js
rename to testing/web-platform/tests/file-system-access/resources/messaging-blob-helpers.js
diff --git a/testing/web-platform/tests/native-file-system/resources/messaging-helpers.js b/testing/web-platform/tests/file-system-access/resources/messaging-helpers.js
similarity index 99%
rename from testing/web-platform/tests/native-file-system/resources/messaging-helpers.js
rename to testing/web-platform/tests/file-system-access/resources/messaging-helpers.js
index 279c5d1d12f7..55fc04ab817a 100644
--- a/testing/web-platform/tests/native-file-system/resources/messaging-helpers.js
+++ b/testing/web-platform/tests/file-system-access/resources/messaging-helpers.js
@@ -1,7 +1,7 @@
'use strict';
// This script depends on the following script:
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/test-helpers.js
// /service-workers/service-worker/resources/test-helpers.sub.js
// Define the URL constants used for each type of message target, including
diff --git a/testing/web-platform/tests/native-file-system/resources/messaging-serialize-helpers.js b/testing/web-platform/tests/file-system-access/resources/messaging-serialize-helpers.js
similarity index 99%
rename from testing/web-platform/tests/native-file-system/resources/messaging-serialize-helpers.js
rename to testing/web-platform/tests/file-system-access/resources/messaging-serialize-helpers.js
index 3df2d48e086f..ada68f43db50 100644
--- a/testing/web-platform/tests/native-file-system/resources/messaging-serialize-helpers.js
+++ b/testing/web-platform/tests/file-system-access/resources/messaging-serialize-helpers.js
@@ -1,7 +1,7 @@
'use strict';
// This script depends on the following script:
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/test-helpers.js
// Serializes an array of FileSystemHandles where each element can be either a
// FileSystemFileHandle or FileSystemDirectoryHandle.
diff --git a/testing/web-platform/tests/native-file-system/resources/opaque-origin-sandbox.html b/testing/web-platform/tests/file-system-access/resources/opaque-origin-sandbox.html
similarity index 100%
rename from testing/web-platform/tests/native-file-system/resources/opaque-origin-sandbox.html
rename to testing/web-platform/tests/file-system-access/resources/opaque-origin-sandbox.html
diff --git a/testing/web-platform/tests/native-file-system/resources/sandboxed-fs-test-helpers.js b/testing/web-platform/tests/file-system-access/resources/sandboxed-fs-test-helpers.js
similarity index 84%
rename from testing/web-platform/tests/native-file-system/resources/sandboxed-fs-test-helpers.js
rename to testing/web-platform/tests/file-system-access/resources/sandboxed-fs-test-helpers.js
index a7506b6b2f3d..f6cfd4b0aab8 100644
--- a/testing/web-platform/tests/native-file-system/resources/sandboxed-fs-test-helpers.js
+++ b/testing/web-platform/tests/file-system-access/resources/sandboxed-fs-test-helpers.js
@@ -3,8 +3,8 @@
// function in this file will return an empty directory in the sandboxed file
// system.
//
-// Another implementation of this function exists in native-fs-test-helpers.js,
-// where that version uses the native file system instead.
+// Another implementation of this function exists in local-fs-test-helpers.js,
+// where that version uses the local file system instead.
async function cleanupSandboxedFileSystem() {
const dir = await navigator.storage.getDirectory();
diff --git a/testing/web-platform/tests/native-file-system/resources/test-helpers.js b/testing/web-platform/tests/file-system-access/resources/test-helpers.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/resources/test-helpers.js
rename to testing/web-platform/tests/file-system-access/resources/test-helpers.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-IndexedDB.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-isSameEntry.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-BroadcastChannel.https.window.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-Error.https.window.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-frames.https.window.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-windows.https.window.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-MessagePort-workers.https.window.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-frames.https.window.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-windows.https.window.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemBaseHandle-postMessage-workers.https.window.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-getDirectoryHandle.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-getFileHandle.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemDirectoryHandle-iteration.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-iteration.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemDirectoryHandle-iteration.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-iteration.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-removeEntry.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemDirectoryHandle-resolve.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-resolve.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemDirectoryHandle-resolve.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemDirectoryHandle-resolve.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemFileHandle-getFile.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemFileHandle-getFile.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemFileHandle-getFile.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemFileHandle-getFile.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemWritableFileStream-piped.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemWritableFileStream-piped.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemWritableFileStream-piped.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemWritableFileStream-piped.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemWritableFileStream-write.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemWritableFileStream-write.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemWritableFileStream-write.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemWritableFileStream-write.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/sandboxed_FileSystemWritableFileStream.https.any.js b/testing/web-platform/tests/file-system-access/sandboxed_FileSystemWritableFileStream.https.any.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/sandboxed_FileSystemWritableFileStream.https.any.js
rename to testing/web-platform/tests/file-system-access/sandboxed_FileSystemWritableFileStream.https.any.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-IndexedDB.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-IndexedDB.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-IndexedDB.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-IndexedDB.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-isSameEntry.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-isSameEntry.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-isSameEntry.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-isSameEntry.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
similarity index 94%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
index 7daf65e39b6f..6c3ae7d49bc7 100644
--- a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
+++ b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
@@ -1,9 +1,9 @@
'use strict';
// This script depends on the following scripts:
-// /native-file-system/resources/messaging-helpers.js
-// /native-file-system/resources/messaging-serialize-helpers.js
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/messaging-helpers.js
+// /file-system-access/resources/messaging-serialize-helpers.js
+// /file-system-access/resources/test-helpers.js
// /service-workers/service-worker/resources/test-helpers.sub.js
// Sets up a new broadcast channel in |target|. Posts a message instructing
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-Error.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-Error.js
similarity index 96%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-Error.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-Error.js
index c4ae8363cc50..0b9dc6b033f3 100644
--- a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-Error.js
+++ b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-Error.js
@@ -1,10 +1,10 @@
'use strict';
// This script depends on the following scripts:
-// /native-file-system/resources/messaging-helpers.js
-// /native-file-system/resources/messaging-blob-helpers.js
-// /native-file-system/resources/messaging-serialize-helpers.js
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/messaging-helpers.js
+// /file-system-access/resources/messaging-blob-helpers.js
+// /file-system-access/resources/messaging-serialize-helpers.js
+// /file-system-access/resources/test-helpers.js
// /common/get-host-info.sub.js
// /service-workers/service-worker/resources/test-helpers.sub.js
@@ -198,8 +198,8 @@ directory_test(async (t, root_dir) => {
await do_send_message_error_test(t, root_dir, /*receiver=*/self,
/*target=*/iframe.contentWindow, /*target_origin=*/'*',
/*expected_has_source*/true, /*expected_origin=*/location.origin);
- // Do not test receiving FileSystemHandles from the data URI iframe.
- // Data URI iframes are insecure and do not expose the NativeFileSystem APIs.
+ // Do not test receiving FileSystemHandles from the data URI iframe. Data URI
+ // iframes are insecure and do not expose the File System Access APIs.
}, 'Fail to send messages to a data URI iframe.');
directory_test(async (t, root_dir) => {
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js
similarity index 86%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js
index 29258cf65d27..89343f3948de 100644
--- a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js
+++ b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js
@@ -1,10 +1,10 @@
'use strict';
// This script depends on the following scripts:
-// /native-file-system/resources/messaging-helpers.js
-// /native-file-system/resources/messaging-blob-helpers.js
-// /native-file-system/resources/messaging-serialize-helpers.js
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/messaging-helpers.js
+// /file-system-access/resources/messaging-blob-helpers.js
+// /file-system-access/resources/messaging-serialize-helpers.js
+// /file-system-access/resources/test-helpers.js
directory_test(
async (t, root_dir) => {
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js
similarity index 83%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js
index cf70efaf2e74..78b3176bf813 100644
--- a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js
+++ b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js
@@ -1,10 +1,10 @@
'use strict';
// This script depends on the following scripts:
-// /native-file-system/resources/messaging-helpers.js
-// /native-file-system/resources/messaging-blob-helpers.js
-// /native-file-system/resources/messaging-serialize-helpers.js
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/messaging-helpers.js
+// /file-system-access/resources/messaging-blob-helpers.js
+// /file-system-access/resources/messaging-serialize-helpers.js
+// /file-system-access/resources/test-helpers.js
directory_test(
async (t, root_dir) => {
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js
similarity index 84%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js
index 756660a82a7e..8e46edc88a9e 100644
--- a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js
+++ b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js
@@ -1,10 +1,10 @@
'use strict';
// This script depends on the following scripts:
-// /native-file-system/resources/messaging-helpers.js
-// /native-file-system/resources/messaging-blob-helpers.js
-// /native-file-system/resources/messaging-serialize-helpers.js
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/messaging-helpers.js
+// /file-system-access/resources/messaging-blob-helpers.js
+// /file-system-access/resources/messaging-serialize-helpers.js
+// /file-system-access/resources/test-helpers.js
// /service-workers/service-worker/resources/test-helpers.sub.js
directory_test(
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-frames.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-frames.js
similarity index 86%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-frames.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-frames.js
index e34b17fb4140..009a030a4f01 100644
--- a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-frames.js
+++ b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-frames.js
@@ -1,10 +1,10 @@
'use strict';
// This script depends on the following scripts:
-// /native-file-system/resources/messaging-helpers.js
-// /native-file-system/resources/messaging-blob-helpers.js
-// /native-file-system/resources/messaging-serialize-helpers.js
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/messaging-helpers.js
+// /file-system-access/resources/messaging-blob-helpers.js
+// /file-system-access/resources/messaging-serialize-helpers.js
+// /file-system-access/resources/test-helpers.js
directory_test(async (t, root_dir) => {
const iframe = await add_iframe(t, {src: kDocumentMessageTarget});
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-windows.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-windows.js
similarity index 82%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-windows.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-windows.js
index 877795bbd233..83bf8c64297c 100644
--- a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-windows.js
+++ b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-windows.js
@@ -1,10 +1,10 @@
'use strict';
// This script depends on the following scripts:
-// /native-file-system/resources/messaging-helpers.js
-// /native-file-system/resources/messaging-blob-helpers.js
-// /native-file-system/resources/messaging-serialize-helpers.js
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/messaging-helpers.js
+// /file-system-access/resources/messaging-blob-helpers.js
+// /file-system-access/resources/messaging-serialize-helpers.js
+// /file-system-access/resources/test-helpers.js
directory_test(async (t, root_dir) => {
const child_window = await open_window(t, kDocumentMessageTarget);
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-workers.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-workers.js
similarity index 83%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-workers.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-workers.js
index db8e55491f23..f7abf65554b7 100644
--- a/testing/web-platform/tests/native-file-system/script-tests/FileSystemBaseHandle-postMessage-workers.js
+++ b/testing/web-platform/tests/file-system-access/script-tests/FileSystemBaseHandle-postMessage-workers.js
@@ -1,10 +1,10 @@
'use strict';
// This script depends on the following scripts:
-// /native-file-system/resources/messaging-helpers.js
-// /native-file-system/resources/messaging-blob-helpers.js
-// /native-file-system/resources/messaging-serialize-helpers.js
-// /native-file-system/resources/test-helpers.js
+// /file-system-access/resources/messaging-helpers.js
+// /file-system-access/resources/messaging-blob-helpers.js
+// /file-system-access/resources/messaging-serialize-helpers.js
+// /file-system-access/resources/test-helpers.js
// /service-workers/service-worker/resources/test-helpers.sub.js
directory_test(async (t, root_dir) => {
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemDirectoryHandle-getDirectoryHandle.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemDirectoryHandle-getFileHandle.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemDirectoryHandle-getFileHandle.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemDirectoryHandle-getFileHandle.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemDirectoryHandle-getFileHandle.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemDirectoryHandle-iteration.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemDirectoryHandle-iteration.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemDirectoryHandle-iteration.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemDirectoryHandle-iteration.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemDirectoryHandle-removeEntry.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemDirectoryHandle-removeEntry.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemDirectoryHandle-removeEntry.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemDirectoryHandle-removeEntry.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemDirectoryHandle-resolve.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemDirectoryHandle-resolve.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemDirectoryHandle-resolve.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemDirectoryHandle-resolve.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemFileHandle-getFile.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemFileHandle-getFile.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemFileHandle-getFile.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemFileHandle-getFile.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemWritableFileStream-piped.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemWritableFileStream-piped.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemWritableFileStream-piped.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemWritableFileStream-piped.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemWritableFileStream-write.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemWritableFileStream-write.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemWritableFileStream-write.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemWritableFileStream-write.js
diff --git a/testing/web-platform/tests/native-file-system/script-tests/FileSystemWritableFileStream.js b/testing/web-platform/tests/file-system-access/script-tests/FileSystemWritableFileStream.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/script-tests/FileSystemWritableFileStream.js
rename to testing/web-platform/tests/file-system-access/script-tests/FileSystemWritableFileStream.js
diff --git a/testing/web-platform/tests/native-file-system/showDirectoryPicker-manual.https.html b/testing/web-platform/tests/file-system-access/showDirectoryPicker-manual.https.html
similarity index 92%
rename from testing/web-platform/tests/native-file-system/showDirectoryPicker-manual.https.html
rename to testing/web-platform/tests/file-system-access/showDirectoryPicker-manual.https.html
index 5dadbe1a9d5c..d1abf93eafa4 100644
--- a/testing/web-platform/tests/native-file-system/showDirectoryPicker-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/showDirectoryPicker-manual.https.html
@@ -18,7 +18,7 @@
await new Promise(resolve => step_timeout(resolve, 100));
await window.test_driver.bless(
- 'show a directory picker.
Please select native-file-system/resources/data/');
+ 'show a directory picker.
Please select file-system-access/resources/data/');
const dir = await self.showDirectoryPicker();
assert_true(dir instanceof FileSystemHandle);
assert_true(dir instanceof FileSystemDirectoryHandle);
diff --git a/testing/web-platform/tests/native-file-system/showOpenFilePicker-manual.https.html b/testing/web-platform/tests/file-system-access/showOpenFilePicker-manual.https.html
similarity index 94%
rename from testing/web-platform/tests/native-file-system/showOpenFilePicker-manual.https.html
rename to testing/web-platform/tests/file-system-access/showOpenFilePicker-manual.https.html
index e6405a9c8c6c..fd72b040c0c9 100644
--- a/testing/web-platform/tests/native-file-system/showOpenFilePicker-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/showOpenFilePicker-manual.https.html
@@ -18,7 +18,7 @@
await new Promise(resolve => step_timeout(resolve, 100));
await window.test_driver.bless(
- 'show a file picker.
Please select native-file-system/resources/data/testfile.txt');
+ 'show a file picker.
Please select file-system-access/resources/data/testfile.txt');
const files = await self.showOpenFilePicker({
multiple: false, types: [
{ description: 'Text files', accept: { ' text/plain ': ['.txt'] } },
@@ -40,7 +40,7 @@
promise_test(async t => {
await window.test_driver.bless(
- 'show a file picker.
Please select native-file-system/resources/data/testfile.txt');
+ 'show a file picker.
Please select file-system-access/resources/data/testfile.txt');
const files = await self.showOpenFilePicker({
multiple: false,
startIn: null,
diff --git a/testing/web-platform/tests/native-file-system/showPicker-errors.https.window.js b/testing/web-platform/tests/file-system-access/showPicker-errors.https.window.js
similarity index 100%
rename from testing/web-platform/tests/native-file-system/showPicker-errors.https.window.js
rename to testing/web-platform/tests/file-system-access/showPicker-errors.https.window.js
diff --git a/testing/web-platform/tests/native-file-system/showSaveFilePicker-manual.https.html b/testing/web-platform/tests/file-system-access/showSaveFilePicker-manual.https.html
similarity index 90%
rename from testing/web-platform/tests/native-file-system/showSaveFilePicker-manual.https.html
rename to testing/web-platform/tests/file-system-access/showSaveFilePicker-manual.https.html
index 3a20f1428d90..332a1a42730d 100644
--- a/testing/web-platform/tests/native-file-system/showSaveFilePicker-manual.https.html
+++ b/testing/web-platform/tests/file-system-access/showSaveFilePicker-manual.https.html
@@ -11,7 +11,7 @@
promise_test(async t => {
await window.test_driver.bless(
- 'show a file picker.
Please make a copy of native-file-system/resources/data/testfile.txt in a writable directory and pick that file');
+ 'show a file picker.
Please make a copy of file-system-access/resources/data/testfile.txt in a writable directory and pick that file');
const file = await self.showSaveFilePicker({
multiple: false, types: [
{ description: 'Text files', accept: { 'text/plain': ['.txt'] } },
diff --git a/testing/web-platform/tests/interfaces/native-file-system.idl b/testing/web-platform/tests/interfaces/file-system-access.idl
similarity index 100%
rename from testing/web-platform/tests/interfaces/native-file-system.idl
rename to testing/web-platform/tests/interfaces/file-system-access.idl
diff --git a/testing/web-platform/tests/native-file-system/README.md b/testing/web-platform/tests/native-file-system/README.md
deleted file mode 100644
index 6905a68e7901..000000000000
--- a/testing/web-platform/tests/native-file-system/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains (tentative) tests for the
-[Native File System](https://wicg.github.io/native-file-system/) specification.