Autogenerate grd for webrtc_logs

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

chrome/browser/resources/media/BUILD.gn

@@ -2,15 +2,32 @@
 # 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("//ui/webui/resources/tools/generate_grd.gni")
 
-grit("webrtc_logs_resources") {
-  source = "webrtc_logs_resources.grd"
+generate_grd("build_grd") {
+  grd_prefix = "webrtc_logs"
+  out_grd = "$target_gen_dir/webrtc_logs_resources.grd"
+  input_files = [
+    "webrtc_logs.css",
+    "webrtc_logs.html",
+    "webrtc_logs.js",
+  ]
+  input_files_base_dir = rebase_path(".", "//")
+}
 
+grit("webrtc_logs_resources") {
+  source = "$target_gen_dir/webrtc_logs_resources.grd"
+  deps = [ ":build_grd" ]
+  enable_input_discovery_for_gn_analyze = false
+  defines = chrome_grit_defines
   use_brotli = true
   outputs = [
     "grit/webrtc_logs_resources.h",
+    "grit/webrtc_logs_resources_map.cc",
+    "grit/webrtc_logs_resources_map.h",
     "webrtc_logs_resources.pak",
   ]
   output_dir = "$root_gen_dir/chrome"

chrome/browser/resources/media/webrtc_logs_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/webrtc_logs_resources.h" type="rc_header">
-      <emit emit_type="prepend"></emit>
-    </output>
-    <output filename="webrtc_logs_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <include name="IDR_WEBRTC_LOGS_HTML"
-               file="webrtc_logs.html"
-               flattenhtml="true"
-               allowexternalscript="true"
-               type="BINDATA" />
-      <include name="IDR_WEBRTC_LOGS_JS"
-               file="webrtc_logs.js"
-               type="BINDATA" />
-    </includes>
-  </release>
-</grit>

chrome/browser/ui/webui/media/webrtc_logs_ui.cc

@@ -27,6 +27,7 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/webrtc_logs_resources.h"
+#include "chrome/grit/webrtc_logs_resources_map.h"
 #include "components/prefs/pref_service.h"
 #include "components/upload_list/upload_list.h"
 #include "components/version_info/version_info.h"
@@ -78,8 +79,9 @@ content::WebUIDataSource* CreateWebRtcLogsUIHTMLSource() {
   AddLocalizedStringsBulk(source, kStrings);
 
   source->UseStringsJs();
-  source->AddResourcePath("webrtc_logs.js", IDR_WEBRTC_LOGS_JS);
-  source->SetDefaultResource(IDR_WEBRTC_LOGS_HTML);
+  webui::AddResourcePathsBulk(
+      source, base::make_span(kWebrtcLogsResources, kWebrtcLogsResourcesSize));
+  source->SetDefaultResource(IDR_WEBRTC_LOGS_WEBRTC_LOGS_HTML);
   return source;
 }
 

tools/gritsettings/resource_ids.spec

@@ -246,7 +246,8 @@
     "META": {"sizes": {"includes": [10],}},
     "includes": [2090],
   },
-  "chrome/browser/resources/media/webrtc_logs_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/media/webrtc_logs_resources.grd": {
+    "META": {"sizes": {"includes": [10],}},
     "includes": [2100],
   },
   "chrome/browser/resources/net_internals/net_internals_resources.grd": {