[DevUI DFM] Move chrome://webrtc-internals resources to the DFM.

Follow the lead of other DevUI pages, and move WebRTC internals
resources (those used in chrome://webrtc-internals) into the DFM. This
removes ~25 KB from the main .pak file on Android.

Bug: 927131
Change-Id: Ia243ec46e728a711cc7c3bb8df10cb661300d1a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1869014Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Dan Beam <dbeam@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709092}

chrome/browser/resources/BUILD.gn

@@ -366,12 +366,14 @@ repack("dev_ui_paks") {
     "$root_gen_dir/chrome/omnibox_resources.pak",
     "$root_gen_dir/chrome/usb_internals_resources.pak",
     "$root_gen_dir/components/sync_driver_resources.pak",
+    "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
   ]
   deps = [
     "//chrome/browser/resources/bluetooth_internals:resources",
     "//chrome/browser/resources/omnibox:resources",
     "//chrome/browser/resources/usb_internals:resources",
     "//components/sync/driver:resources",
+    "//content/browser/webrtc/resources",
   ]
 }
 

chrome/browser/ui/BUILD.gn

@@ -528,6 +528,7 @@ jumbo_static_library("ui") {
     "//components/web_resource",
     "//components/webrtc_logging/browser",
     "//content/app/resources",
+    "//content/browser/webrtc/resources",
     "//content/public/common",
     "//crypto",
     "//extensions/buildflags",

content/browser/BUILD.gn

@@ -97,6 +97,7 @@ jumbo_source_set("browser") {
     "//content/browser/process_internals:mojo_bindings",
     "//content/browser/service_worker:service_worker_proto",
     "//content/browser/speech/proto",
+    "//content/browser/webrtc/resources",
     "//content/common",
     "//content/common:buildflags",
     "//content/common:mojo_bindings",

content/browser/webrtc/resources/BUILD.gn

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//tools/grit/grit_rule.gni")
+
+grit("resources") {
+  source = "resources.grd"
+  outputs = [
+    "grit/webrtc_internals_resources.h",
+    "webrtc_internals_resources.pak",
+  ]
+}

content/browser/webrtc/resources/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_internals_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="webrtc_internals_resources.pak" type="data_package" />
+  </outputs>
+  <translations />
+  <release seq="1">
+    <includes>
+      <include name="IDR_WEBRTC_INTERNALS_HTML"
+               file="webrtc_internals.html"
+               flattenhtml="true"
+               allowexternalscript="true"
+               compress="gzip"
+               type="BINDATA" />
+      <include name="IDR_WEBRTC_INTERNALS_JS"
+               file="webrtc_internals.js"
+               flattenhtml="true"
+               compress="gzip"
+               type="BINDATA" />
+    </includes>
+  </release>
+</grit>

content/browser/resources/media/webrtc_internals.js → content/browser/webrtc/resources/webrtc_internals.js

@@ -95,14 +95,14 @@ var PeerConnectionRecord = (function() {
 // will be shifted out when the buffer is full.
 var MAX_STATS_DATA_POINT_BUFFER_SIZE = 1000;
 
-// <include src="tab_view.js">
-// <include src="data_series.js">
-// <include src="ssrc_info_manager.js">
-// <include src="stats_graph_helper.js">
-// <include src="stats_rates_calculator.js">
-// <include src="stats_table.js">
-// <include src="peer_connection_update_table.js">
-// <include src="dump_creator.js">
+// <include src="../../resources/media/tab_view.js">
+// <include src="../../resources/media/data_series.js">
+// <include src="../../resources/media/ssrc_info_manager.js">
+// <include src="../../resources/media/stats_graph_helper.js">
+// <include src="../../resources/media/stats_rates_calculator.js">
+// <include src="../../resources/media/stats_table.js">
+// <include src="../../resources/media/peer_connection_update_table.js">
+// <include src="../../resources/media/dump_creator.js">
 
 
 function initialize() {

content/browser/webrtc/webrtc_internals_ui.cc

@@ -4,8 +4,8 @@
 
 #include "content/browser/webrtc/webrtc_internals_ui.h"
 
+#include "content/browser/webrtc/resources/grit/webrtc_internals_resources.h"
 #include "content/browser/webrtc/webrtc_internals_message_handler.h"
-#include "content/grit/content_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"

content/content_resources.grd

@@ -47,8 +47,6 @@
       <include name="IDR_UNGUESSABLE_TOKEN_MOJO_JS" file="${root_gen_dir}/mojo/public/mojom/base/unguessable_token.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
       <include name="IDR_URL_MOJO_HTML" file="${root_gen_dir}/url/mojom/url.mojom.html" use_base_dir="false" type="BINDATA" compress="gzip" />
       <include name="IDR_URL_MOJO_JS" file="${root_gen_dir}/url/mojom/url.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
-      <include name="IDR_WEBRTC_INTERNALS_HTML" file="browser/resources/media/webrtc_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
-      <include name="IDR_WEBRTC_INTERNALS_JS" file="browser/resources/media/webrtc_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
     </includes>
   </release>
 </grit>

content/shell/BUILD.gn

@@ -524,6 +524,7 @@ repack("pak") {
   sources = [
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
     "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
+    "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
     "$root_gen_dir/content/shell/shell_resources.pak",
     "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
@@ -542,6 +543,7 @@ repack("pak") {
     "//content:resources",
     "//content/app/resources",
     "//content/browser/tracing:resources",
+    "//content/browser/webrtc/resources",
     "//mojo/public/js:resources",
     "//net:net_resources",
     "//third_party/blink/public:resources",

tools/gritsettings/resource_ids

@@ -298,11 +298,14 @@
   "content/app/resources/content_resources.grd": {
     "structures": [20000],
   },
-  "content/content_resources.grd": {
+  "content/browser/webrtc/resources/resources.grd": {
     "includes": [20400],
   },
+  "content/content_resources.grd": {
+    "includes": [20410],
+  },
   "content/shell/shell_resources.grd": {
-    "includes": [20500],
+    "includes": [20510],
   },
 
   # This file is generated during the build.