Move volumeManagerGetter() to appUtil.getVolumeManager

Follow from CL:2534553 move the duplicated code to app_util.js, satisfy
the dependencies and re-use the code from app_util.js.

Bug: 1148545, 1133186, 1113981
Change-Id: I7dc089a8cf1c371eb3d59702464839faf3004a8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2535900Reviewed-by: Noel Gordon <noel@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827700}

ui/file_manager/BUILD.gn

@@ -94,12 +94,25 @@ preprocess_grit("preprocess_generated") {
   out_folder = preprocess_folder
 
   in_files = [
+    # Base:
     "base/js/app_util.m.js",
     "base/js/volume_manager_types.m.js",
     "base/js/mediasession_types.m.js",
+
+    # Externs:
+    "externs/entry_location.m.js",
+    "externs/files_app_entry_interfaces.m.js",
+    "externs/background/background_base.m.js",
+    "externs/volume_info.m.js",
+    "externs/volume_info_list.m.js",
+    "externs/volume_manager.m.js",
   ]
 
-  deps = [ "//ui/file_manager/base/js:modulize" ]
+  deps = [
+    "//ui/file_manager/base/js:modulize",
+    "//ui/file_manager/externs:modulize",
+    "//ui/file_manager/externs/background:modulize",
+  ]
 }
 
 grd_prefix = "file_manager_gen"

ui/file_manager/audio_player/js/audio_player.js

@@ -15,17 +15,8 @@ ContentMetadataProvider.WORKER_SCRIPT = '/js/metadata_worker.js';
 function AudioPlayer(container) {
   this.container_ = container;
 
-  const volumeManagerGetter = new Promise(resolve => {
-                                chrome.runtime.getBackgroundPage(resolve);
-                              }).then(backgroundWindow => {
-    /** @type {!BackgroundBase} */
-    const backgroundPage = (backgroundWindow).background;
-    return backgroundPage.getVolumeManager();
-  });
-
-
   this.volumeManager_ = new FilteredVolumeManager(
-      AllowedPaths.ANY_PATH, false, volumeManagerGetter);
+      AllowedPaths.ANY_PATH, false, appUtil.getVolumeManager());
   this.metadataModel_ = MetadataModel.create(this.volumeManager_);
   this.selectedEntry_ = null;
   this.invalidTracks_ = {};

ui/file_manager/base/js/BUILD.gn

@@ -28,6 +28,11 @@ js_type_check("closure_compile_jsmodules") {
     ":filtered_volume_manager.m",
     ":volume_manager_types.m",
   ]
+
+  closure_flags = strict_error_checking_closure_args + [
+                    "js_module_root=./gen/ui/",
+                    "js_module_root=../../ui/",
+                  ]
 }
 
 js_type_check("closure_compile_module") {
@@ -56,12 +61,23 @@ js_type_check("test_support_type_check_jsmodules") {
 }
 
 js_library("app_util") {
-  externs_list = [ "//ui/file_manager/externs/app_window_common.js" ]
+  deps = [
+    ":volume_manager_types",
+    "//ui/file_manager/externs:volume_manager",
+  ]
+  externs_list = [
+    "//ui/file_manager/externs/app_window_common.js",
+    "//ui/file_manager/externs/background/background_base.js",
+  ]
 }
 
 js_library("app_util.m") {
   sources = [ "$root_gen_dir/ui/file_manager/base/js/app_util.m.js" ]
-  deps = [ "//ui/file_manager/externs:file_manager_private" ]
+  deps = [
+    "//ui/file_manager/externs:file_manager_private",
+    "//ui/file_manager/externs:volume_manager.m",
+    "//ui/file_manager/externs/background:background_base.m",
+  ]
   externs_list = [ "//ui/file_manager/externs/app_window_common.js" ]
 
   extra_deps = [ ":modulize" ]

ui/file_manager/base/js/app_util.js

@@ -8,6 +8,11 @@
  * @suppress {uselessCode} Temporary suppress because of the line exporting.
  */
 
+// clang-format off
+// #import {BackgroundBase} from '../../externs/background/background_base.m.js';
+// #import {VolumeManager} from '../../externs/volume_manager.m.js';
+// clang-format on
+
 const appUtil = {};
 
 /**
@@ -177,5 +182,18 @@ appUtil.AppCache.cleanup_ = map => {
   }
 };
 
+/**
+ * Fetches the VolumeManager from the background page.
+ * @return {!Promise<!VolumeManager>}.
+ */
+appUtil.getVolumeManager = async () => {
+  const backgroundWindow =
+      new Promise(resolve => chrome.runtime.getBackgroundPage(resolve));
+
+  /** @type {!BackgroundBase} */
+  const backgroundPage = (await backgroundWindow).background;
+  return backgroundPage.getVolumeManager();
+};
+
 // eslint-disable-next-line semi,no-extra-semi
 /* #export */ {appUtil};

ui/file_manager/gallery/js/BUILD.gn

@@ -76,6 +76,7 @@ js_library("gallery") {
     ":gallery_constants",
     ":gallery_item",
     ":thumbnail_mode",
+    "//ui/file_manager/base/js:app_util",
     "//ui/file_manager/base/js:filtered_volume_manager",
     "//ui/file_manager/file_manager/common/js:util",
     "//ui/file_manager/file_manager/foreground/js/ui:files_confirm_dialog",

ui/file_manager/gallery/js/gallery.js

@@ -1082,15 +1082,8 @@ const loadTimeDataPromise = new Promise(function(fulfill, reject) {
  * @type {!Promise}
  */
 const volumeManagerPromise = new Promise(function(fulfill, reject) {
-  const volumeManagerGetter = new Promise(resolve => {
-                                chrome.runtime.getBackgroundPage(resolve);
-                              }).then(backgroundWindow => {
-    /** @type {!BackgroundBase} */
-    const backgroundPage = (backgroundWindow).background;
-    return backgroundPage.getVolumeManager();
-  });
   const volumeManager = new FilteredVolumeManager(
-      AllowedPaths.ANY_PATH, false, volumeManagerGetter);
+      AllowedPaths.ANY_PATH, false, appUtil.getVolumeManager());
   volumeManager.ensureInitialized(fulfill.bind(null, volumeManager));
 });
 

ui/file_manager/video_player/js/BUILD.gn

@@ -64,6 +64,7 @@ js_library("video_player") {
     ":error_util",
     ":video_player_metrics",
     ":video_player_native_controls",
+    "//ui/file_manager/base/js:app_util",
     "//ui/file_manager/base/js:filtered_volume_manager",
     "//ui/file_manager/file_manager/common/js:metrics_base",
     "//ui/file_manager/file_manager/common/js:util",

ui/file_manager/video_player/js/video_player.js

@@ -30,15 +30,8 @@ function initStrings(callback) {
  * @param {function()} callback Called when the volume manager is ready.
  */
 function initVolumeManager(callback) {
-  const volumeManagerGetter = new Promise(resolve => {
-                                chrome.runtime.getBackgroundPage(resolve);
-                              }).then(backgroundWindow => {
-    /** @type {!BackgroundBase} */
-    const backgroundPage = (backgroundWindow).background;
-    return backgroundPage.getVolumeManager();
-  });
   const volumeManager = new FilteredVolumeManager(
-      AllowedPaths.ANY_PATH, false, volumeManagerGetter);
+      AllowedPaths.ANY_PATH, false, appUtil.getVolumeManager());
   volumeManager.ensureInitialized(callback);
 }