Reland "Use grd generation in the Sample System Web App."

This is a reland of 43831226

Original change's description:
> Use grd generation in the Sample System Web App.
>
> Bug: None
> Change-Id: I4485ddbb595ade6ef078abda2436fa887a0d8b7c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489060
> Commit-Queue: calamity <calamity@chromium.org>
> Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#820135}

Bug: None
Change-Id: I296319fc96965ca36eae58990a3c1018796b8c44
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2497900Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: calamity <calamity@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821109}

chrome/browser/chromeos/web_applications/sample_system_web_app_info.cc

@@ -24,7 +24,9 @@ std::unique_ptr<WebApplicationInfo> CreateWebAppInfoForSampleSystemWebApp() {
   info->title = base::UTF8ToUTF16("Sample System Web App");
   web_app::CreateIconInfoForSystemWebApp(
       info->start_url,
-      {{"app_icon_192.png", 192, IDR_SAMPLE_SYSTEM_WEB_APP_ICON_192}}, *info);
+      {{"app_icon_192.png", 192,
+        IDR_CHROMEOS_SAMPLE_SYSTEM_WEB_APP_APP_ICON_192_PNG}},
+      *info);
   info->theme_color = 0xFF4285F4;
   info->background_color = 0xFFFFFFFF;
   info->display_mode = blink::mojom::DisplayMode::kStandalone;

chromeos/components/sample_system_web_app_ui/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//chrome/test/base/js2gtest.gni")
 import("//third_party/closure_compiler/compile_js.gni")
+import("//ui/webui/resources/tools/generate_grd.gni")
 
 assert(is_chromeos, "Sample System Web App is Chrome OS only")
 assert(!is_official_build,
@@ -40,3 +41,17 @@ js2gtest("browser_tests_js") {
 
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 }
+
+generate_grd("build_grd") {
+  input_files_base_dir = rebase_path("resources", "//")
+  input_files = [
+    "app_icon_192.png",
+    "index.html",
+    "sandbox.html",
+    "untrusted.html",
+    "untrusted.js",
+  ]
+  manifest_files = []
+  grd_prefix = "chromeos_sample_system_web_app"
+  out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
+}

chromeos/components/sample_system_web_app_ui/resources/sample_system_web_app_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/chromeos_sample_system_web_app_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="grit/chromeos_sample_system_web_app_resources_map.cc"
-      type="resource_file_map_source" />
-    <output filename="grit/chromeos_sample_system_web_app_resources_map.h"
-      type="resource_map_header" />
-    <output filename="chromeos_sample_system_web_app_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <if expr="is_official_build == false">
-        <!-- Privileged app host contents. -->
-        <include name="IDR_SAMPLE_SYSTEM_WEB_APP_INDEX_HTML" file="index.html" type="BINDATA" />
-        <include name="IDR_SAMPLE_SYSTEM_WEB_APP_SANDBOX_HTML" file="sandbox.html" type="BINDATA" />
-        <include name="IDR_SAMPLE_SYSTEM_WEB_APP_ICON_192" file="app_icon_192.png" type="BINDATA" />
-
-        <!-- Untrusted app contents. -->
-        <include name="IDR_SAMPLE_SYSTEM_WEB_APP_UNTRUSTED_HTML" file="untrusted.html" type="BINDATA" />
-        <include name="IDR_SAMPLE_SYSTEM_WEB_APP_UNTRUSTED_JS" file="untrusted.js" type="BINDATA" />
-      </if>
-    </includes>
-  </release>
-</grit>

chromeos/components/sample_system_web_app_ui/sample_system_web_app_ui.cc

@@ -21,10 +21,10 @@ namespace {
 content::WebUIDataSource* CreateUntrustedSampleSystemWebAppDataSource() {
   content::WebUIDataSource* untrusted_source =
       content::WebUIDataSource::Create(kChromeUIUntrustedSampleSystemWebAppURL);
-  untrusted_source->AddResourcePath("untrusted.html",
-                                    IDR_SAMPLE_SYSTEM_WEB_APP_UNTRUSTED_HTML);
-  untrusted_source->AddResourcePath("untrusted.js",
-                                    IDR_SAMPLE_SYSTEM_WEB_APP_UNTRUSTED_JS);
+  untrusted_source->AddResourcePath(
+      "untrusted.html", IDR_CHROMEOS_SAMPLE_SYSTEM_WEB_APP_UNTRUSTED_HTML);
+  untrusted_source->AddResourcePath(
+      "untrusted.js", IDR_CHROMEOS_SAMPLE_SYSTEM_WEB_APP_UNTRUSTED_JS);
   untrusted_source->AddFrameAncestor(GURL(kChromeUISampleSystemWebAppURL));
   return untrusted_source;
 }
@@ -35,18 +35,20 @@ SampleSystemWebAppUI::SampleSystemWebAppUI(content::WebUI* web_ui)
   auto trusted_source = base::WrapUnique(
       content::WebUIDataSource::Create(kChromeUISampleSystemWebAppHost));
 
-  trusted_source->AddResourcePath("", IDR_SAMPLE_SYSTEM_WEB_APP_INDEX_HTML);
-  trusted_source->AddResourcePath("sandbox.html",
-                                  IDR_SAMPLE_SYSTEM_WEB_APP_SANDBOX_HTML);
-  trusted_source->AddResourcePath("app_icon_192.png",
-                                  IDR_SAMPLE_SYSTEM_WEB_APP_ICON_192);
+  trusted_source->AddResourcePath(
+      "", IDR_CHROMEOS_SAMPLE_SYSTEM_WEB_APP_INDEX_HTML);
+  trusted_source->AddResourcePath(
+      "sandbox.html", IDR_CHROMEOS_SAMPLE_SYSTEM_WEB_APP_SANDBOX_HTML);
+  trusted_source->AddResourcePath(
+      "app_icon_192.png", IDR_CHROMEOS_SAMPLE_SYSTEM_WEB_APP_APP_ICON_192_PNG);
 
 #if !DCHECK_IS_ON()
   // If a user goes to an invalid url and non-DCHECK mode (DHECK = debug mode)
   // is set, serve a default page so the user sees your default page instead
   // of an unexpected error. But if DCHECK is set, the user will be a
   // developer and be able to identify an error occurred.
-  trusted_source->SetDefaultResource(IDR_SAMPLE_SYSTEM_WEB_APP_INDEX_HTML);
+  trusted_source->SetDefaultResource(
+      IDR_CHROMEOS_SAMPLE_SYSTEM_WEB_APP_INDEX_HTML);
 #endif  // !DCHECK_IS_ON()
 
   // We need a CSP override to use the chrome-untrusted:// scheme in the host.

chromeos/resources/BUILD.gn

@@ -136,17 +136,34 @@ grit("help_app_bundle_resources") {
   output_dir = "$root_gen_dir/chromeos"
 }
 
-# Resources used by chrome://sample-system-web-app
-grit("sample_system_web_app_resources") {
-  source = "../components/sample_system_web_app_ui/resources/sample_system_web_app_resources.grd"
+if (!is_official_build) {
+  # Resources used by chrome://sample-system-web-app
+  grit("sample_system_web_app_resources") {
+    grit_flags = [
+      "-E",
+      "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+      "-E",
+      "root_src_dir=" + rebase_path("//", root_build_dir),
+    ]
 
-  outputs = [
-    "grit/chromeos_sample_system_web_app_resources.h",
-    "grit/chromeos_sample_system_web_app_resources_map.cc",
-    "grit/chromeos_sample_system_web_app_resources_map.h",
-    "chromeos_sample_system_web_app_resources.pak",
-  ]
-  output_dir = "$root_gen_dir/chromeos"
+    defines = [ "SHARED_INTERMEDIATE_DIR=" +
+                rebase_path(root_gen_dir, root_build_dir) ]
+
+    # These arguments are needed since the grd is generated at build time.
+    enable_input_discovery_for_gn_analyze = false
+    sample_system_web_app_gen_dir =
+        "$root_gen_dir/chromeos/components/sample_system_web_app_ui"
+    source = "$sample_system_web_app_gen_dir/chromeos_sample_system_web_app_resources.grd"
+    deps = [ "//chromeos/components/sample_system_web_app_ui:build_grd" ]
+
+    outputs = [
+      "grit/chromeos_sample_system_web_app_resources.h",
+      "grit/chromeos_sample_system_web_app_resources_map.cc",
+      "grit/chromeos_sample_system_web_app_resources_map.h",
+      "chromeos_sample_system_web_app_resources.pak",
+    ]
+    output_dir = "$root_gen_dir/chromeos"
+  }
 }
 
 # Resources used by chrome://telemetry-extension

tools/gritsettings/resource_ids.spec

@@ -351,7 +351,8 @@
     "includes": [2600],
     "structures": [2620],
   },
-  "chromeos/components/sample_system_web_app_ui/resources/sample_system_web_app_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chromeos/components/sample_system_web_app_ui/chromeos_sample_system_web_app_resources.grd": {
+    "META": {"sizes": {"includes": [50],}},
     "includes": [2640],
   },
   "chromeos/components/scanning/resources/scanning_app_resources.grd": {