Migrate chrome://media-app window.{chooseFileSystemEntries=>openSavePicker}

The API was transitioned in r781392.

Bug: 1096225, 996088
Change-Id: I4c83e0e6cddd4b5ee22bb0308636fb5a3fad6723
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2260296Reviewed-by: Rachel Carpenter <carpenterr@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781632}

chromeos/components/media_app_ui/resources/js/launch.js

@@ -152,20 +152,18 @@ guestMessagePipe.registerHandler(Message.SAVE_COPY, async (message) => {
   const extension = suggestedName.split('.').reverse()[0];
   // TODO(b/141587270): Add a default filename when it's supported by the native
   // file api.
-  /** @type {!ChooseFileSystemEntriesOptions} */
+  /** @type {!FilePickerOptions} */
   const options = {
-    type: 'save-file',
-    accepts: [{extension, mimeTypes: [blob.type]}],
-
-    // Without this, the file picker defaults to "All files" and will refuse to
-    // provide an extension automatically. See crbug/1082624#c23.
+    types: [
+      {description: extension, accept: {[blob.type]: [extension]}},
+    ],
     excludeAcceptAllOption: true,
   };
   // This may throw an error, but we can handle and recover from it on the
   // unprivileged side.
   /** @type {!FileSystemHandle} */
   const fileSystemHandle = /** @type {!FileSystemHandle} */ (
-      await window.chooseFileSystemEntries(options));
+      await window.showSaveFilePicker(options));
   const {handle} = await getFileFromHandle(fileSystemHandle);
   // Note `handle` could be the same as a `FileSystemFileHandle` that exists in
   // `tokenMap`. Possibly even the `File` currently open. But that's OK. E.g.

chromeos/components/media_app_ui/resources/js/receiver.js

@@ -253,10 +253,11 @@ window.addEventListener('DOMContentLoaded', () => {
   observer.observe(document.body, {childList: true});
 });
 
-// Attempting to execute chooseFileSystemEntries is guaranteed to result in a
-// SecurityError due to the fact that we are running in a unprivileged iframe.
-// Note, we can not do window.chooseFileSystemEntries due to the fact that
-// closure does not yet know that 'chooseFileSystemEntries' is on the window.
+// Attempting to show file pickers in the sandboxed <iframe> is guaranteed to
+// result in a SecurityError: hide them.
 // TODO(crbug/1040328): Remove this when we have a polyfill that allows us to
 // talk to the privileged frame.
 window['chooseFileSystemEntries'] = null;
+window['showOpenFilePicker'] = null;
+window['showSaveFilePicker'] = null;
+window['showDirectoryPicker'] = null;

chromeos/components/media_app_ui/resources/js/web_app_file_handling.externs.js

@@ -188,29 +188,49 @@ class LaunchQueue {
 }
 
 /**
+ * https://wicg.github.io/native-file-system/#dictdef-filepickeraccepttype
  * @typedef {{
- *    description: (string|undefined),
- *    mimeTypes: (!Array<string>|undefined),
- *    extensions: (!Array<string>|undefined)
+ *    description: string,
+ *    accept: !Array<!Object<string, Array<string>>>,
  * }}
  */
-let ChooseFileSystemEntriesOptionsAccepts;
+let FilePickerAcceptType;
 
 /**
+ * https://wicg.github.io/native-file-system/#dictdef-filepickeroptions
+ * https://wicg.github.io/native-file-system/#dictdef-directorypickeroptions
+ * https://wicg.github.io/native-file-system/#dictdef-openfilepickeroptions
+ * https://wicg.github.io/native-file-system/#dictdef-savefilepickeroptions
+ * Note: `multiple` is only used for openfilepicker.
+ * `types` is required if excludeAcceptAllOption is true.
  * @typedef {{
- *    type: (string|undefined),
  *    multiple: (boolean|undefined),
- *    accepts: (!Array<!ChooseFileSystemEntriesOptionsAccepts>|undefined),
+ *    types: (!Array<!FilePickerAcceptType>|undefined),
  *    excludeAcceptAllOption: (boolean|undefined)
  * }}
  */
-let ChooseFileSystemEntriesOptions;
+let FilePickerOptions;
 
 /**
- * @param {(!ChooseFileSystemEntriesOptions|undefined)} options
+ * https://wicg.github.io/native-file-system/#native-filesystem
+ * @param {(!FilePickerOptions|undefined)} options
  * @return {!Promise<(!FileSystemHandle|!Array<!FileSystemHandle>)>}
  */
-window.chooseFileSystemEntries;
+window.showOpenFilePicker;
+
+/**
+ * https://wicg.github.io/native-file-system/#native-filesystem
+ * @param {(!FilePickerOptions|undefined)} options
+ * @return {!Promise<(!FileSystemHandle|!Array<!FileSystemHandle>)>}
+ */
+window.showSaveFilePicker;
+
+/**
+ * https://wicg.github.io/native-file-system/#native-filesystem
+ * @param {(!FilePickerOptions|undefined)} options
+ * @return {!Promise<(!FileSystemHandle|!Array<!FileSystemHandle>)>}
+ */
+window.showDirectoryPicker;
 
 /** @type {LaunchQueue} */
 window.launchQueue;

chromeos/components/media_app_ui/test/media_app_ui_browsertest.js

@@ -783,7 +783,7 @@ TEST_F('MediaAppUIBrowserTest', 'SaveCopyIPC', async () => {
   // via trusted user gestures.
   const newFileHandle = new FakeFileSystemFileHandle();
   const chooseEntries = new Promise(resolve => {
-    window.chooseFileSystemEntries = options => {
+    window.showSaveFilePicker = options => {
       resolve(options);
       return newFileHandle;
     };
@@ -795,11 +795,9 @@ TEST_F('MediaAppUIBrowserTest', 'SaveCopyIPC', async () => {
   assertEquals(result.testQueryResult, 'boo yah!');
   const options = await chooseEntries;
 
-  assertEquals(options.type, 'save-file');
-  assertEquals(options.accepts.length, 1);
-  assertEquals(options.accepts[0].extension, 'png');
-  assertEquals(options.accepts[0].mimeTypes.length, 1);
-  assertEquals(options.accepts[0].mimeTypes[0], 'image/png');
+  assertEquals(options.types.length, 1);
+  assertEquals(options.types[0].description, 'png');
+  assertDeepEquals(options.types[0].accept['image/png'], ['png']);
 
   const writeResult = await newFileHandle.lastWritable.closePromise;
   assertEquals(await writeResult.text(), await testImage.text());