FSA: Fix message* includes for manual WPTs

These scripts were copied to fs/ (08245bdd5a1b9f5364817f9c92fc81b1d8adbfd0), and then later were deleted from file-system-access (WebKit/WebKit@fe46c0d). This updates the includes to rely on the copy in fs/. Bug: 346991169 Change-Id: I4d92898e07c3364049b9a2a800a5b3f3efc434b1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5867990 Reviewed-by: Christine Hollingsworth <[email protected]> Commit-Queue: Nathan Memmott <[email protected]> Cr-Commit-Position: refs/heads/main@{#1356530}
jiangzhaoming · Sep 17, 2024 · 9d6629b · 9d6629b
1 parent e93b645
commit 9d6629b
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 41 deletions.
diff --git a/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html b/file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
@@ -7,7 +7,7 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
 <script src="/IndexedDB/resources/support-promises.js"></script>
 <script src="../fs/script-tests/FileSystemBaseHandle-IndexedDB.js"></script>
diff --git a/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html b/file-system-access/local_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.html
@@ -9,6 +9,6 @@
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
 <script src="../fs/script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js"></script>
diff --git a/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html b/file-system-access/local_FileSystemBaseHandle-postMessage-Error-manual.https.html
@@ -10,7 +10,7 @@
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
 <script src="../fs/script-tests/FileSystemBaseHandle-postMessage-Error.js"></script>
diff --git a/...system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html b/...system-access/local_FileSystemBaseHandle-postMessage-MessagePort-frames-manual.https.html
@@ -8,7 +8,7 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
 <script src="../fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-frames.js"></script>
diff --git a/...ystem-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html b/...ystem-access/local_FileSystemBaseHandle-postMessage-MessagePort-windows-manual.https.html
@@ -8,7 +8,8 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
-<script src="../fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
+<script
+  src="../fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-windows.js"></script>
diff --git a/...ystem-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html b/...ystem-access/local_FileSystemBaseHandle-postMessage-MessagePort-workers-manual.https.html
@@ -6,10 +6,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
-<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script
+  src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
-<script src="../fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
+<script
+  src="../fs/script-tests/FileSystemBaseHandle-postMessage-MessagePort-workers.js"></script>
diff --git a/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html b/file-system-access/local_FileSystemBaseHandle-postMessage-frames-manual.https.html
@@ -8,7 +8,8 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
-<script src="../fs/script-tests/FileSystemBaseHandle-postMessage-frames.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
+<script
+  src="../fs/script-tests/FileSystemBaseHandle-postMessage-frames.js"></script>
diff --git a/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html b/file-system-access/local_FileSystemBaseHandle-postMessage-windows-manual.https.html
@@ -8,7 +8,8 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
-<script src="../fs/script-tests/FileSystemBaseHandle-postMessage-windows.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
+<script
+  src="../fs/script-tests/FileSystemBaseHandle-postMessage-windows.js"></script>
diff --git a/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html b/file-system-access/local_FileSystemBaseHandle-postMessage-workers-manual.https.html
@@ -6,10 +6,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
-<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script
+  src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script src="resources/test-helpers.js"></script>
 <script src="resources/local-fs-test-helpers.js"></script>
-<script src="resources/messaging-helpers.js"></script>
-<script src="resources/messaging-blob-helpers.js"></script>
-<script src="resources/messaging-serialize-helpers.js"></script>
-<script src="../fs/script-tests/FileSystemBaseHandle-postMessage-workers.js"></script>
+<script src="../fs/resources/messaging-helpers.js"></script>
+<script src="../fs/resources/messaging-blob-helpers.js"></script>
+<script src="../fs/resources/messaging-serialize-helpers.js"></script>
+<script
+  src="../fs/script-tests/FileSystemBaseHandle-postMessage-workers.js"></script>
diff --git a/fs/resources/messaging-blob-helpers.js b/fs/resources/messaging-blob-helpers.js
@@ -21,19 +21,21 @@ async function create_message_target_data_uri(test) {
 // Enables the creation of blob URLs, data URIs and iframe srcdocs re-using
 // the contents of 'message-target.html'.
 async function create_message_target_html_without_subresources(test) {
-  const test_helpers_script = await fetch_text('resources/test-helpers.js');
+  const test_helpers_script =
+      await fetch_text('../fs/resources/test-helpers.js');
 
   const messaging_helpers_script =
-    await fetch_text('resources/messaging-helpers.js');
+      await fetch_text('../fs/resources/messaging-helpers.js');
 
   const messaging_serialize_helpers_script =
-    await fetch_text('resources/messaging-serialize-helpers.js');
+      await fetch_text('../fs/resources/messaging-serialize-helpers.js');
 
   const message_target_script =
-    await fetch_text('resources/message-target.js');
+      await fetch_text('../fs/resources/message-target.js');
 
   // Get the inline script code from 'message-target.html'.
-  const iframe = await add_iframe(test, { src: 'resources/message-target.html' });
+  const iframe =
+      await add_iframe(test, {src: '../fs/resources/message-target.html'});
   const iframe_script =
     iframe.contentWindow.document.getElementById('inline_script').outerHTML;
   iframe.remove();

diff --git a/fs/resources/messaging-helpers.js b/fs/resources/messaging-helpers.js
@@ -6,12 +6,13 @@
 
 // Define the URL constants used for each type of message target, including
 // iframes and workers.
-const kDocumentMessageTarget = 'resources/message-target.html';
-const kSharedWorkerMessageTarget = 'resources/message-target-shared-worker.js';
+const kDocumentMessageTarget = '../fs/resources/message-target.html';
+const kSharedWorkerMessageTarget =
+    '../fs/resources/message-target-shared-worker.js';
 const kServiceWorkerMessageTarget =
-  'resources/message-target-service-worker.js';
+    '../fs/resources/message-target-service-worker.js';
 const kDedicatedWorkerMessageTarget =
-  'resources/message-target-dedicated-worker.js';
+    '../fs/resources/message-target-dedicated-worker.js';
 
 function create_dedicated_worker(test, url) {
   const dedicated_worker = new Worker(url);