Audio Player: Add generate_grd() and grit() for JS Modules

Add a new PAK file for resources in Files app and companion apps like
Audio Player, to host the generated JS modules.

Change ChromeComponentExtensionResourceManager to also load the
resources from this new PAK file.

This is a preparation for converting these apps to JS modules.

Bug: 1133186, 1030998
Change-Id: I00b650d271e758e0cad82a8b4c109f128d0285d2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503909
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: Jeremie Boulic <jboulic@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Auto-Submit: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822617}

chrome/browser/extensions/chrome_component_extension_resource_manager.cc

@@ -97,6 +97,11 @@ ChromeComponentExtensionResourceManager::Data::Data() {
       file_manager::GetFileManagerResources(&file_manager_resource_size);
   AddComponentResourceEntries(file_manager_resources,
                               file_manager_resource_size);
+  // Add Files app JS modules resources.
+  file_manager_resources =
+      file_manager::GetFileManagerGenResources(&file_manager_resource_size);
+  AddComponentResourceEntries(file_manager_resources,
+                              file_manager_resource_size);
 
   // ResourceBundle and g_browser_process are not always initialized in unit
   // tests.

chrome/chrome_paks.gni

@@ -189,6 +189,7 @@ template("chrome_extra_paks") {
         "$root_gen_dir/chromeos/chromeos_scanning_app_resources.pak",
         "$root_gen_dir/chromeos/connectivity_diagnostics_resources.pak",
         "$root_gen_dir/third_party/ink/ink_resources.pak",
+        "$root_gen_dir/ui/file_manager/file_manager_gen_resources.pak",
         "$root_gen_dir/ui/file_manager/file_manager_resources.pak",
       ]
       deps += [
@@ -214,6 +215,7 @@ template("chrome_extra_paks") {
         "//chromeos/resources:print_management_resources",
         "//chromeos/resources:scanning_app_resources",
         "//third_party/ink:ink_resources",
+        "//ui/file_manager:file_manager_gen_resources",
         "//ui/file_manager:resources",
       ]
 

tools/gritsettings/resource_ids.spec

@@ -628,6 +628,10 @@
   "ui/chromeos/ui_chromeos_strings.grd": {
     "messages": [3660],
   },
+  "<(SHARED_INTERMEDIATE_DIR)/ui/file_manager/file_manager_gen_resources.grd": {
+    "META": {"sizes": {"includes": [200]}},
+    "includes": [3670],
+  },
   "ui/file_manager/file_manager_resources.grd": {
     "includes": [3680],
   },

ui/file_manager/BUILD.gn

@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_grit.gni")
+import("//ui/webui/resources/tools/generate_grd.gni")
 
 grit("resources") {
   source = "file_manager_resources.grd"
@@ -24,6 +26,7 @@ component("file_manager") {
     "file_manager_resource_util.h",
   ]
   public_deps = [
+    ":file_manager_gen_resources",
     ":resources",
     "//base",
   ]
@@ -100,3 +103,46 @@ preprocess_grit("preprocess_generated") {
 
   deps = [ "//ui/file_manager/base/js:modulize" ]
 }
+
+grd_prefix = "file_manager_gen"
+generated_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
+
+generate_grd("build_grd") {
+  out_grd = generated_grd
+
+  input_files_base_dir = "$target_gen_dir/preprocessed"
+  input_files = [ "../audio_player/js/main.m.rollup.js" ]
+
+  resource_path_rewrites =
+      [ "../audio_player/js/main.m.rollup.js|audio_player/js/main.m.js" ]
+
+  deps = [ "//ui/file_manager/audio_player/js:audio_player_bundle" ]
+}
+
+# Resources for the JS modules.
+grit("file_manager_gen_resources") {
+  grit_flags = [
+    "-E",
+    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+    "-E",
+    "root_src_dir=" + rebase_path("//", root_build_dir),
+  ]
+
+  defines = chrome_grit_defines
+
+  # These arguments are needed since the grd is generated at build time.
+  enable_input_discovery_for_gn_analyze = false
+  defines +=
+      [ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ]
+
+  source = generated_grd
+  deps = [ ":build_grd" ]
+
+  outputs = [
+    "grit/file_manager_gen_resources.h",
+    "grit/file_manager_gen_resources_map.cc",
+    "grit/file_manager_gen_resources_map.h",
+    "file_manager_gen_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/ui/file_manager"
+}

ui/file_manager/audio_player/js/BUILD.gn

@@ -92,5 +92,6 @@ optimize_webui("audio_player_bundle") {
     ":main.m",
     "//ui/file_manager:preprocess_generated",
     "//ui/file_manager:preprocess_static",
+    "//ui/webui/resources:preprocess",
   ]
 }

ui/file_manager/file_manager_resource_util.cc

@@ -5,6 +5,7 @@
 #include "ui/file_manager/file_manager_resource_util.h"
 
 #include "base/check.h"
+#include "ui/file_manager/grit/file_manager_gen_resources_map.h"
 #include "ui/file_manager/grit/file_manager_resources_map.h"
 
 namespace file_manager {
@@ -15,4 +16,10 @@ const GritResourceMap* GetFileManagerResources(size_t* size) {
   return kFileManagerResources;
 }
 
+const GritResourceMap* GetFileManagerGenResources(size_t* size) {
+  DCHECK(size);
+  *size = kFileManagerGenResourcesSize;
+  return kFileManagerGenResources;
+}
+
 }  // namespace keyboard

ui/file_manager/file_manager_resource_util.h

@@ -18,6 +18,9 @@ namespace file_manager {
 FILE_MANAGER_EXPORT const GritResourceMap* GetFileManagerResources(
     size_t* size);
 
+FILE_MANAGER_EXPORT const GritResourceMap* GetFileManagerGenResources(
+    size_t* size);
+
 }  // namespace file_manager
 
 #endif  // UI_FILE_MANAGER_FILE_MANAGER_RESOURCE_UTIL_H_