Read Later: Use preprocess_grit and generate_grd

Bug: 1132403
Change-Id: I2d4fcc058d236a7c4e43350965e36b10c820738f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2510352Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: John Lee <johntlee@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823357}

chrome/BUILD.gn

@@ -1351,12 +1351,12 @@ group("extra_resources") {
       "//chrome/browser/resources:gaia_auth_host_resources",
       "//chrome/browser/resources:local_ntp_resources",
       "//chrome/browser/resources:new_tab_page_resources",
-      "//chrome/browser/resources:read_later_resources",
       "//chrome/browser/resources:tab_search_resources",
       "//chrome/browser/resources/bookmarks:bookmarks_resources",
       "//chrome/browser/resources/commander:commander_resources",
       "//chrome/browser/resources/downloads:downloads_resources",
       "//chrome/browser/resources/history:history_resources",
+      "//chrome/browser/resources/read_later:read_later_resources",
       "//chrome/browser/resources/settings:settings_resources",
     ]
   }

chrome/browser/resources/BUILD.gn

@@ -200,26 +200,6 @@ if (!is_android) {
     output_dir = "$root_gen_dir/chrome"
   }
 
-  grit("read_later_resources") {
-    grit_flags = [
-      "-E",
-      "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
-    ]
-    source = "read_later/read_later_resources.grd"
-    deps = [
-      "//chrome/browser/resources/read_later:web_components",
-      "//chrome/browser/ui/webui/read_later:mojo_bindings_js",
-    ]
-    defines = chrome_grit_defines
-    outputs = [
-      "grit/read_later_resources.h",
-      "grit/read_later_resources_map.cc",
-      "grit/read_later_resources_map.h",
-      "read_later_resources.pak",
-    ]
-    output_dir = "$root_gen_dir/chrome"
-  }
-
   grit("tab_search_resources") {
     grit_flags = [
       "-E",

chrome/browser/resources/read_later/BUILD.gn

@@ -2,8 +2,85 @@
 # 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("//tools/polymer/html_to_js.gni")
+import("//ui/webui/resources/tools/generate_grd.gni")
+
+preprocess_folder = "preprocessed"
+preprocess_manifest = "preprocessed_manifest.json"
+preprocess_web_components_manifest = "preprocessed_gen_manifest.json"
+preprocess_mojo_manifest = "preprocessed_mojo_manifest.json"
+
+grit("read_later_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 = "$target_gen_dir/read_later_resources.grd"
+  deps = [ ":build_grd" ]
+
+  outputs = [
+    "grit/read_later_resources.h",
+    "grit/read_later_resources_map.cc",
+    "grit/read_later_resources_map.h",
+    "read_later_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/chrome"
+}
+
+generate_grd("build_grd") {
+  input_files = [ "read_later.html" ]
+  input_files_base_dir = rebase_path(".", "//")
+  deps = [
+    ":preprocess",
+    ":preprocess_mojo",
+    ":preprocess_web_components",
+  ]
+  manifest_files = [
+    "$target_gen_dir/$preprocess_manifest",
+    "$target_gen_dir/$preprocess_web_components_manifest",
+    "$target_gen_dir/$preprocess_mojo_manifest",
+  ]
+  grd_prefix = "read_later"
+  out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
+}
+
+preprocess_grit("preprocess") {
+  in_folder = "./"
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_manifest"
+  in_files = [ "read_later_api_proxy.js" ]
+}
+
+preprocess_grit("preprocess_mojo") {
+  deps = [ "//chrome/browser/ui/webui/read_later:mojo_bindings_js" ]
+  in_folder = "$root_gen_dir/chrome/browser/ui/webui/read_later/"
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_mojo_manifest"
+  in_files = [ "read_later.mojom-lite.js" ]
+}
+
+preprocess_grit("preprocess_web_components") {
+  deps = [ ":web_components" ]
+  in_folder = target_gen_dir
+  out_folder = "$target_gen_dir/$preprocess_folder"
+  out_manifest = "$target_gen_dir/$preprocess_web_components_manifest"
+  in_files = [
+    "app.js",
+    "read_later_item.js",
+  ]
+}
 
 js_type_check("closure_compile") {
   is_polymer3 = true

chrome/browser/resources/read_later/read_later_resources.grd

-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
-  <outputs>
-    <output filename="grit/read_later_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="grit/read_later_resources_map.cc"
-            type="resource_file_map_source" />
-    <output filename="grit/read_later_resources_map.h"
-            type="resource_map_header" />
-    <output filename="read_later_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <include name="IDR_APP_JS"
-               file="${root_gen_dir}/chrome/browser/resources/read_later/app.js"
-               use_base_dir="false"
-               type="BINDATA" />
-      <include name="IDR_READ_LATER_API_PROXY_JS"
-               file="read_later_api_proxy.js"
-               type="BINDATA" />
-      <include name="IDR_READ_LATER_HTML"
-               file="read_later.html"
-               type="BINDATA" />
-      <include name="IDR_READ_LATER_ITEM_JS"
-               file="${root_gen_dir}/chrome/browser/resources/read_later/read_later_item.js"
-               type="BINDATA"
-               use_base_dir="false"/>
-      <include name="IDR_READ_LATER_MOJO_LITE_JS"
-               file="${root_gen_dir}/chrome/browser/ui/webui/read_later/read_later.mojom-lite.js"
-               use_base_dir="false"
-               type="BINDATA" />
-    </includes>
-  </release>
-</grit>

chrome/browser/ui/webui/read_later/read_later_ui.cc

@@ -21,9 +21,6 @@
 #include "ui/base/webui/web_ui_util.h"
 
 namespace {
-constexpr char kGeneratedPath[] =
-    "@out_folder@/gen/chrome/browser/resources/read_later/";
-
 void AddLocalizedString(content::WebUIDataSource* source,
                         const std::string& message,
                         int id) {
@@ -37,8 +34,6 @@ ReadLaterUI::ReadLaterUI(content::WebUI* web_ui)
     : ui::MojoBubbleWebUIController(web_ui) {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIReadLaterHost);
-  source->AddResourcePath("read_later.mojom-lite.js",
-                          IDR_READ_LATER_MOJO_LITE_JS);
   static constexpr webui::LocalizedString kLocalizedStrings[] = {
       {"readHeader", IDS_READ_LATER_MENU_READ_HEADER},
       {"title", IDS_READ_LATER_TITLE},
@@ -52,7 +47,7 @@ ReadLaterUI::ReadLaterUI(content::WebUI* web_ui)
 
   webui::SetupWebUIDataSource(
       source, base::make_span(kReadLaterResources, kReadLaterResourcesSize),
-      kGeneratedPath, IDR_READ_LATER_HTML);
+      /*generated_path=*/std::string(), IDR_READ_LATER_READ_LATER_HTML);
   content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
                                 source);
 }

chrome/chrome_paks.gni

@@ -154,12 +154,12 @@ template("chrome_extra_paks") {
         "//chrome/browser/resources:gaia_auth_host_resources",
         "//chrome/browser/resources:local_ntp_resources",
         "//chrome/browser/resources:new_tab_page_resources",
-        "//chrome/browser/resources:read_later_resources",
         "//chrome/browser/resources:tab_search_resources",
         "//chrome/browser/resources/bookmarks:bookmarks_resources",
         "//chrome/browser/resources/commander:commander_resources",
         "//chrome/browser/resources/downloads:downloads_resources",
         "//chrome/browser/resources/history:history_resources",
+        "//chrome/browser/resources/read_later:read_later_resources",
         "//chrome/browser/resources/settings:settings_resources",
         "//content/browser/devtools:devtools_resources",
         "//headless:resources",

tools/gritsettings/resource_ids.spec

@@ -165,7 +165,8 @@
     "META": {"sizes": {"includes": [500],}},
     "includes": [1720],
   },
-  "chrome/browser/resources/read_later/read_later_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/read_later/read_later_resources.grd": {
+    "META": {"sizes": {"includes": [10],}},
     "includes": [1760],
   },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings/chromeos/os_settings_resources.grd": {