Files app/Audio Player: Prepare integration test harness for JS modules

Change runtime_loaded_test_util.js to avoid referring to global types or
names to prepare to run the background pages as JS modules. When running
as JS modules these global names aren't available.

Move to use an API defined in the `window.background` which is the
interface BackgroundBase.

Change the functions using getVolumeManager() to use async/await to
improve their readability.  Note that test.util.async.unmount() was
invalidly calling the volumeManager.unmount() with callback. Fix by
calling the callback after the unmount() is finished.

Change test_util_base.js to expose the required dependencies to
runtime_loaded_test_util.js because when running as JS modules those
aren't visible when loading the runtime_loaded_test_util.js.

Bug: 1133186
Change-Id: I9b5a52f6ca88cc13881862132d6e331c0dec2f57
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537256
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: Jeremie Boulic <jboulic@chromium.org>
Auto-Submit: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827748}

ui/file_manager/file_manager/background/js/runtime_loaded_test_util.js

@@ -7,7 +7,6 @@
  * extension under test at runtime to populate testing functionality.
  */
 
-
 /**
  * @typedef {{
  *   attributes:Object<string>,
@@ -1016,32 +1015,27 @@ test.util.sync.launcherSearchOpenResult = fileURL => {
  * @param {function(*)} callback Callback function with results returned by the
  *     script.
  */
-test.util.async.getFilesUnderVolume = (volumeType, names, callback) => {
-  const displayRootPromise =
-      volumeManagerFactory.getInstance().then(volumeManager => {
-        const volumeInfo =
-            volumeManager.getCurrentProfileVolumeInfo(volumeType);
-        return volumeInfo.resolveDisplayRoot();
-      });
-
-  const retrievePromise = displayRootPromise.then(displayRoot => {
-    const filesPromise = names.map(name => {
-      // TODO(crbug.com/880130): Remove this conditional.
-      if (volumeType === VolumeManagerCommon.VolumeType.DOWNLOADS) {
-        name = 'Downloads/' + name;
-      }
-      return new Promise(displayRoot.getFile.bind(displayRoot, name, {}));
-    });
-    return Promise.all(filesPromise)
-        .then(aa => {
-          return util.entriesToURLs(aa);
-        })
-        .catch(() => {
-          return [];
-        });
+test.util.async.getFilesUnderVolume = async (volumeType, names, callback) => {
+  const volumeManager = await window.background.getVolumeManager();
+  const volumeInfo = volumeManager.getCurrentProfileVolumeInfo(volumeType);
+  const displayRoot = await volumeInfo.resolveDisplayRoot();
+
+  const filesPromise = names.map(name => {
+    // TODO(crbug.com/880130): Remove this conditional.
+    if (volumeType === VolumeManagerCommon.VolumeType.DOWNLOADS) {
+      name = 'Downloads/' + name;
+    }
+    return new Promise(displayRoot.getFile.bind(displayRoot, name, {}));
   });
 
-  retrievePromise.then(callback);
+  try {
+    const urls = await Promise.all(filesPromise);
+    const result = util.entriesToURLs(urls);
+    callback(result);
+  } catch (error) {
+    console.error(error);
+    callback([]);
+  }
 };
 
 /**
@@ -1050,14 +1044,19 @@ test.util.async.getFilesUnderVolume = (volumeType, names, callback) => {
  * @param {VolumeManagerCommon.VolumeType} volumeType Volume type.
  * @param {function(boolean)} callback Function receives true on success.
  */
-test.util.async.unmount = (volumeType, callback) => {
-  volumeManagerFactory.getInstance().then((volumeManager) => {
-    const volumeInfo = volumeManager.getCurrentProfileVolumeInfo(volumeType);
+test.util.async.unmount = async (volumeType, callback) => {
+  const volumeManager = await window.background.getVolumeManager();
+  const volumeInfo = volumeManager.getCurrentProfileVolumeInfo(volumeType);
+  try {
     if (volumeInfo) {
-      volumeManager.unmount(
-          volumeInfo, callback.bind(null, true), callback.bind(null, false));
+      await volumeManager.unmount(volumeInfo);
+      callback(true);
+      return;
     }
-  });
+  } catch (error) {
+    console.error(error);
+  }
+  callback(false);
 };
 
 /**
@@ -1175,7 +1174,7 @@ test.util.sync.getA11yAnnounces = contentWindow => {
  *   number of volumes.
  */
 test.util.async.getVolumesCount = callback => {
-  return volumeManagerFactory.getInstance().then((volumeManager) => {
+  return window.background.getVolumeManager().then((volumeManager) => {
     callback(volumeManager.volumeInfoList.length);
   });
 };
@@ -1183,9 +1182,11 @@ test.util.async.getVolumesCount = callback => {
 /**
  * Sets/Resets a flag that causes file copy operations to always fail in test.
  * @param {boolean} enable True to force errors.
+ * @suppress {checkTypes} Remove suppress when migrating Files app. This is only
+ *     used for Files app.
  */
 test.util.sync.forceErrorsOnFileOperations = (contentWindow, enable) => {
-  fileOperationUtil.forceErrorForTest = enable;
+  window.background.forceFileOperationErrorForTest(enable);
   return enable;
 };
 
@@ -1221,6 +1222,8 @@ test.util.sync.reload = () => {
 
 /**
  * Tells background page progress center to never notify a completed operation.
+ * @suppress {checkTypes} Remove suppress when migrating Files app. This is only
+ *     used for Files app.
  */
 test.util.sync.progressCenterNeverNotifyCompleted = () => {
   window.background.progressCenter.neverNotifyCompleted();

ui/file_manager/file_manager/background/js/test_util_base.js

@@ -7,11 +7,18 @@
  * @suppress {uselessCode} Temporary suppress because of the line exporting.
  */
 
+// clang-format off
+// #import * as wrappedVolumeManagerCommon from '../../../base/js/volume_manager_types.m.js'; const {VolumeManagerCommon} = wrappedVolumeManagerCommon;
+// #import * as wrappedUtil from '../../common/js/util.m.js'; const {util} = wrappedUtil;
+// #import {assert} from 'chrome://resources/js/assert.m.js';
+// clang-format on
+
 /**
  * Namespace for test related things.
  */
+window.test = window.test || {};
 // eslint-disable-next-line no-var
-var test = test || {};
+var test = window.test;
 
 /**
  * Namespace for test utility functions.
@@ -89,6 +96,13 @@ test.util.registerRemoteTestUtils = () => {
           return true;
         }
 
+        // Exporting the dependency for the runtime_loaded_test_util.js script.
+        // TODO: Remove this once runtime_loaded_test_util is a JS module and
+        // can import its dependencies.
+        window.VolumeManagerCommon = VolumeManagerCommon;
+        window.util = util;
+        window.assert = assert;
+
         // Asynchronously load the testing functions.
         const script = document.createElement('script');
         document.body.appendChild(script);