Audio Player: Refactor start up to allow use of feature flag

Change the initialization to wait for the background page to be ready,
which means the load time data is available, to be able to check for the
feature flag to launch different HTML files.

This is a preparation to enable JS modules for Audio Player behind a
feature flag.

Add the feature flag AudioPlayerJsModules to util to be able to check in
the Audio Player background before launching a new Audio Player window.

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

chrome/browser/chromeos/file_manager/file_manager_string_util.cc

@@ -1061,6 +1061,9 @@ void AddFileManagerFeatureStrings(const std::string& locale,
   dict->SetBoolean("FILES_SINGLE_PARTITION_FORMAT_ENABLED",
                    base::FeatureList::IsEnabled(
                        chromeos::features::kFilesSinglePartitionFormat));
+  dict->SetBoolean(
+      "AUDIO_PLAYER_JS_MODULES_ENABLED",
+      base::FeatureList::IsEnabled(chromeos::features::kAudioPlayerJsModules));
 
   dict->SetString("UI_LOCALE", locale);
 }

ui/file_manager/audio_player/js/background.js

@@ -25,6 +25,13 @@ const AUDIO_PLAYER_ICON = 'icons/audio-player-192.png';
  */
 const AUDIO_PLAYER_APP_URL = 'audio_player.html';
 
+/**
+ * HTML source of the audio player as JS module.
+ * @type {!string}
+ * @const
+ */
+const AUDIO_PLAYER_MODULE_APP_URL = 'audio_player_module.html';
+
 /**
  * Configuration of the audio player.
  * @type {!Object}
@@ -44,16 +51,22 @@ class AudioPlayerBackground extends BackgroundBaseImpl {
     super();
   }
 
+  async ready() {
+    return await this.initializationPromise_;
+  }
+
   /**
    * Called when an audio player app is restarted.
    */
   onRestarted_() {
-    audioPlayer.reopen(function() {
-      // If the audioPlayer is reopened, change its window's icon. Otherwise
-      // there is no reopened window so just skip the call of setIcon.
-      if (audioPlayer.rawAppWindow) {
-        audioPlayer.setIcon(AUDIO_PLAYER_ICON);
-      }
+    getAudioPlayer.then(audioPlayer => {
+      audioPlayer.reopen(function() {
+        // If the audioPlayer is reopened, change its window's icon. Otherwise
+        // there is no reopened window so just skip the call of setIcon.
+        if (audioPlayer.rawAppWindow) {
+          audioPlayer.setIcon(AUDIO_PLAYER_ICON);
+        }
+      });
     });
   }
 }
@@ -64,12 +77,19 @@ class AudioPlayerBackground extends BackgroundBaseImpl {
  */
 window.background = new AudioPlayerBackground();
 
+
 /**
  * Audio player app window wrapper.
- * @type {!SingletonAppWindowWrapper}
+ * @type {!Promise<!SingletonAppWindowWrapper>}
  */
-const audioPlayer = new SingletonAppWindowWrapper(
-    AUDIO_PLAYER_APP_URL, audioPlayerCreateOptions);
+const getAudioPlayer = new Promise(async (resolve) => {
+  await window.background.ready();
+  const url = util.isAudioPlayerJsModulesEnabled() ?
+      AUDIO_PLAYER_MODULE_APP_URL :
+      AUDIO_PLAYER_APP_URL;
+  resolve(new SingletonAppWindowWrapper(
+      AUDIO_PLAYER_APP_URL, audioPlayerCreateOptions));
+});
 
 /**
  * Opens the audio player window.
@@ -77,65 +97,63 @@ const audioPlayer = new SingletonAppWindowWrapper(
  *     playing.
  * @return {!Promise} Promise to be fulfilled on success, or rejected on error.
  */
-/* #export */ function open(urls) {
+/* #export */ async function open(urls) {
   let position = 0;
   const startUrl = (position < urls.length) ? urls[position] : '';
 
-  return new Promise(function(fulfill, reject) {
-           if (urls.length === 0) {
-             reject('No file to open.');
-             return;
-           }
-
-           // Gets the current list of the children of the parent.
-           window.webkitResolveLocalFileSystemURL(urls[0], function(fileEntry) {
-             fileEntry.getParent(function(parentEntry) {
-               const dirReader = parentEntry.createReader();
-               let entries = [];
-
-               // Call the reader.readEntries() until no more results are
-               // returned.
-               const readEntries = function() {
-                 dirReader.readEntries(function(results) {
-                   if (!results.length) {
-                     fulfill(entries.sort(util.compareName));
-                   } else {
-                     entries =
-                         entries.concat(Array.prototype.slice.call(results, 0));
-                     readEntries();
-                   }
-                 }, reject);
-               };
-
-               // Start reading.
-               readEntries();
-             }, reject);
-           }, reject);
-         })
-      .then(function(entries) {
-        // Omits non-audio files.
-        const audioEntries = entries.filter(FileType.isAudio);
-
-        // Adjusts the position to start playing.
-        const maybePosition =
-            util.entriesToURLs(audioEntries).indexOf(startUrl);
-        if (maybePosition !== -1) {
-          position = maybePosition;
-        }
+  if (urls.length === 0) {
+    throw new Error('No file to open.');
+  }
 
-        // Opens the audio player.
-        const urls = util.entriesToURLs(audioEntries);
-        return audioPlayer.launch({items: urls, position: position}, false);
-      })
-      .then(function() {
-        audioPlayer.setIcon(AUDIO_PLAYER_ICON);
-        audioPlayer.rawAppWindow.focus();
-        return AUDIO_PLAYER_APP_URL;
-      })
-      .catch(function(error) {
-        console.error('Launch failed: ' + (error.stack || error));
-        return Promise.reject(error);
-      });
+  try {
+    const entries = await new Promise(function(fulfill, reject) {
+      // Gets the current list of the children of the parent.
+      window.webkitResolveLocalFileSystemURL(urls[0], function(fileEntry) {
+        fileEntry.getParent(function(parentEntry) {
+          const dirReader = parentEntry.createReader();
+          let entries = [];
+
+          // Call the reader.readEntries() until no more results are
+          // returned.
+          const readEntries = function() {
+            dirReader.readEntries(function(results) {
+              if (!results.length) {
+                fulfill(entries.sort(util.compareName));
+              } else {
+                entries =
+                    entries.concat(Array.prototype.slice.call(results, 0));
+                readEntries();
+              }
+            }, reject);
+          };
+
+          // Start reading.
+          readEntries();
+        }, reject);
+      }, reject);
+    });
+
+    // Omits non-audio files.
+    const audioEntries = entries.filter(FileType.isAudio);
+
+    // Adjusts the position to start playing.
+    const maybePosition = util.entriesToURLs(audioEntries).indexOf(startUrl);
+    if (maybePosition !== -1) {
+      position = maybePosition;
+    }
+
+    // Opens the audio player.
+    const urlsToOpen = util.entriesToURLs(audioEntries);
+    const audioPlayer = await getAudioPlayer;
+    await audioPlayer.launch({items: urlsToOpen, position: position}, false);
+
+    audioPlayer.setIcon(AUDIO_PLAYER_ICON);
+    audioPlayer.rawAppWindow.focus();
+    return AUDIO_PLAYER_APP_URL;
+  } catch (error) {
+    console.error('Launch failed: ' + (error.stack || error));
+    throw error;
+  }
 }
 
 window.background.setLaunchHandler(open);

ui/file_manager/file_manager/common/js/util.js

@@ -1495,6 +1495,14 @@ util.isSinglePartitionFormatEnabled = () => {
   return loadTimeData.getBoolean('FILES_SINGLE_PARTITION_FORMAT_ENABLED');
 };
 
+/**
+ * Returns true if  flag is enabled.
+ * @return {boolean}
+ */
+util.isAudioPlayerJsModulesEnabled = () => {
+  return loadTimeData.getBoolean('AUDIO_PLAYER_JS_MODULES_ENABLED');
+};
+
 /**
  * Retrieves all entries inside the given |rootEntry|.
  * @param {!DirectoryEntry} rootEntry