[DevUI DFM] Move chrome://media-internals to the DFM

This moves ~19 kB of gzipped resources to the DFM. The resources are split from content_resources.grd, so extra work is needed compare to other DevUI DFM page movement tasks: * Generate media_internals_resources_map.{cc, h}, and have these read by SharedResourcesDataSource. * Repack media_internals_resources.pak into content_shell.pak. Bug: 927131 Change-Id: Ic10fadb3eff4d519b7eacf430d75e1be3dcba122 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1937850 Reviewed-by: Jochen Eisinger <jochen@chromium.org> Reviewed-by: Andrew Grieve <agrieve@chromium.org> Commit-Queue: Samuel Huang <huangs@chromium.org> Cr-Commit-Position: refs/heads/master@{#720210}
Denger-Network · Nov 29, 2019 · f67faf1 · f67faf1
1 parent b7525af
commit f67faf1
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 53 deletions.
diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn
@@ -463,6 +463,7 @@ repack("dev_ui_paks") {
     "$root_gen_dir/chrome/usb_internals_resources.pak",
     "$root_gen_dir/chrome/webrtc_logs_resources.pak",
     "$root_gen_dir/components/sync_driver_resources.pak",
+    "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
     "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
   ]
   deps = [
@@ -471,6 +472,7 @@ repack("dev_ui_paks") {
     "//chrome/browser/resources/omnibox:resources",
     "//chrome/browser/resources/usb_internals:resources",
     "//components/sync/driver:resources",
+    "//content/browser/resources/media:media_internals_resources",
     "//content/browser/webrtc/resources",
   ]
 }

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
@@ -95,6 +95,7 @@ jumbo_source_set("browser") {
     "//content/browser/notifications:notification_proto",
     "//content/browser/payments:payment_app_proto",
     "//content/browser/process_internals:mojo_bindings",
+    "//content/browser/resources/media:media_internals_resources",
     "//content/browser/service_worker:service_worker_proto",
     "//content/browser/speech/proto",
     "//content/browser/webrtc/resources",

diff --git a/content/browser/media/media_internals_ui.cc b/content/browser/media/media_internals_ui.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "content/browser/media/media_internals_handler.h"
-#include "content/grit/content_resources.h"
+#include "content/browser/resources/media/grit/media_internals_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"

diff --git a/content/browser/resources/media/BUILD.gn b/content/browser/resources/media/BUILD.gn
@@ -0,0 +1,18 @@
+# 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("media_internals_resources") {
+  source = "media_internals_resources.grd"
+
+  outputs = [
+    "grit/media_internals_resources.h",
+    "grit/media_internals_resources_map.cc",
+    "grit/media_internals_resources_map.h",
+    "media_internals_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/content/browser/resources/media"
+  depfile_dir = target_gen_dir
+}
diff --git a/content/browser/resources/media/media_internals_resources.grd b/content/browser/resources/media/media_internals_resources.grd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0"
+      current_release="1"
+      output_all_resource_defines="false">
+  <outputs>
+    <output filename="grit/media_internals_resources_map.cc"
+            type="resource_file_map_source" />
+    <output filename="grit/media_internals_resources_map.h"
+            type="resource_map_header" />
+    <output filename="grit/media_internals_resources.h" type="rc_header">
+      <emit emit_type="prepend"></emit>
+    </output>
+    <output filename="media_internals_resources.pak" type="data_package" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <include name="IDR_MEDIA_INTERNALS_HTML"
+               file="media_internals.html"
+               flattenhtml="true"
+               allowexternalscript="true"
+               compress="gzip"
+               type="BINDATA" />
+      <include name="IDR_MEDIA_INTERNALS_JS"
+               file="media_internals.js"
+               flattenhtml="true"
+               compress="gzip"
+               type="BINDATA" />
+      <include name="IDR_MEDIA_INTERNALS_JS_DISABLED"
+               file="media_internals_disabled.js"
+               flattenhtml="true"
+               compress="gzip"
+               type="BINDATA" />
+    </includes>
+  </release>
+</grit>
diff --git a/content/browser/webui/shared_resources_data_source.cc b/content/browser/webui/shared_resources_data_source.cc
@@ -15,6 +15,8 @@
 #include "base/strings/string_util.h"
 #include "base/task/post_task.h"
 #include "build/build_config.h"
+#include "content/browser/resources/media/grit/media_internals_resources.h"
+#include "content/browser/resources/media/grit/media_internals_resources_map.h"
 #include "content/grit/content_resources.h"
 #include "content/grit/content_resources_map.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -257,6 +259,9 @@ const ResourcesMap* CreateResourcesMap() {
   AddResourcesToMap(result);
   AddAliasedResourcesToMap(CreateContentResourceIdToAliasMap(),
                            kContentResources, kContentResourcesSize, result);
+  AddAliasedResourcesToMap(CreateContentResourceIdToAliasMap(),
+                           kMediaInternalsResources,
+                           kMediaInternalsResourcesSize, result);
   AddAliasedResourcesToMap(CreateMojoResourceIdToAliasMap(),
                            kMojoBindingsResources, kMojoBindingsResourcesSize,
                            result);

diff --git a/content/content_resources.grd b/content/content_resources.grd
@@ -28,9 +28,6 @@
       <include name="IDR_INDEXED_DB_INTERNALS_HTML" file="browser/resources/indexed_db/indexeddb_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
       <include name="IDR_INDEXED_DB_INTERNALS_JS" file="browser/resources/indexed_db/indexeddb_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
       <include name="IDR_INDEXED_DB_INTERNALS_CSS" file="browser/resources/indexed_db/indexeddb_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" />
-      <include name="IDR_MEDIA_INTERNALS_HTML" file="browser/resources/media/media_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
-      <include name="IDR_MEDIA_INTERNALS_JS" file="browser/resources/media/media_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
-      <include name="IDR_MEDIA_INTERNALS_JS_DISABLED" file="browser/resources/media/media_internals_disabled.js" flattenhtml="true" compress="gzip" type="BINDATA" />
       <include name="IDR_NETWORK_ERROR_LISTING_HTML" file="browser/resources/net/network_errors_listing.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
       <include name="IDR_NETWORK_ERROR_LISTING_JS" file="browser/resources/net/network_errors_listing.js" flattenhtml="true" type="BINDATA" compress="gzip" />
       <include name="IDR_NETWORK_ERROR_LISTING_CSS" file="browser/resources/net/network_errors_listing.css" flattenhtml="true" type="BINDATA" compress="gzip" />

diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
@@ -537,6 +537,7 @@ repack("pak") {
 
   sources = [
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
+    "$root_gen_dir/content/browser/resources/media/media_internals_resources.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",
@@ -556,6 +557,7 @@ repack("pak") {
     ":resources",
     "//content:resources",
     "//content/app/resources",
+    "//content/browser/resources/media:media_internals_resources",
     "//content/browser/tracing:resources",
     "//content/browser/webrtc/resources",
     "//mojo/public/js:resources",

diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
@@ -1091,6 +1091,7 @@ test("content_browsertests") {
     "//content/app:both_for_content_tests",
     "//content/browser:for_content_tests",
     "//content/browser/background_sync:background_sync_proto",
+    "//content/browser/resources/media:media_internals_resources_grit",
     "//content/child:for_content_tests",
     "//content/gpu",
     "//content/public/browser",

diff --git a/content/test/webui_resource_browsertest.cc b/content/test/webui_resource_browsertest.cc
@@ -7,6 +7,7 @@
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/threading/thread_restrictions.h"
+#include "content/browser/resources/media/grit/media_internals_resources.h"
 #include "content/grit/content_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"

diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
@@ -226,9 +226,12 @@
   "components/sync/driver/resources.grd": {
     "includes": [12140],
   },
-  "content/browser/webrtc/resources/resources.grd": {
+  "content/browser/resources/media/media_internals_resources.grd": {
     "includes": [12160],
   },
+  "content/browser/webrtc/resources/resources.grd": {
+    "includes": [12170],
+  },
   # END chrome/ WebUI resources section
 
   # START chrome/ miscellaneous section.
@@ -304,22 +307,22 @@
     "messages": [12740],
   },
   "components/omnibox/resources/omnibox_resources.grd": {
-    "includes": [14650],
+    "includes": [14670],
   },
   "components/policy/resources/policy_templates.grd": {
-    "structures": [14660],
+    "structures": [14680],
   },
   "components/resources/components_resources.grd": {
-    "includes": [14670],
+    "includes": [14690],
   },
   "components/resources/components_scaled_resources.grd": {
-    "structures": [14740],
+    "structures": [14770],
   },
   "components/embedder_support/android/java/strings/web_contents_delegate_android_strings.grd": {
-    "messages": [14780],
+    "messages": [14810],
   },
   "components/autofill/core/browser/autofill_address_rewriter_resources.grd":{
-    "includes": [14800]
+    "includes": [14830]
   },
   # END components/ section.
 
@@ -388,13 +391,13 @@
     "includes": [14930],
   },
   "content/shell/shell_resources.grd": {
-    "includes": [14980],
+    "includes": [14970],
   },
 
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
     "META": {"sizes": {"includes": [20],}},
-    "includes": [14990],
+    "includes": [14980],
   },
   # END content/ section.
 
@@ -429,130 +432,130 @@
     "messages": [15130],
   },
   "ash/components/ash_components_strings.grd": {
-    "messages": [15860],
+    "messages": [15870],
   },
   "ash/keyboard/ui/keyboard_resources.grd": {
-    "includes": [16110],
+    "includes": [16120],
   },
   "ash/login/resources/login_resources.grd": {
-    "structures": [16190],
+    "structures": [16200],
   },
   "ash/public/cpp/resources/ash_public_unscaled_resources.grd": {
-    "includes": [16200],
+    "includes": [16210],
   },
   "chromecast/renderer/resources/extensions_renderer_resources.grd": {
-    "includes": [16210],
+    "includes": [16220],
   },
 
   "cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": {
-    "includes": [16220],
-    "messages": [16230],
+    "includes": [16230],
+    "messages": [16240],
   },
 
   "device/bluetooth/bluetooth_strings.grd": {
-    "messages": [16240],
+    "messages": [16250],
   },
 
   "device/fido/fido_strings.grd": {
-    "messages": [16260],
+    "messages": [16270],
   },
 
   "extensions/browser/resources/extensions_browser_resources.grd": {
-    "structures": [16270],
+    "structures": [16280],
   },
   "extensions/extensions_resources.grd": {
-    "includes": [16280],
+    "includes": [16290],
   },
   "extensions/renderer/resources/extensions_renderer_resources.grd": {
-    "includes": [16290],
-    "structures": [16360],
+    "includes": [16300],
+    "structures": [16370],
   },
   "extensions/shell/app_shell_resources.grd": {
-    "includes": [16370],
+    "includes": [16380],
   },
   "extensions/strings/extensions_strings.grd": {
-    "messages": [16380],
+    "messages": [16390],
   },
 
   "headless/lib/resources/headless_lib_resources.grd": {
-    "includes": [16460],
+    "includes": [16470],
   },
 
   "mojo/public/js/mojo_bindings_resources.grd": {
-    "includes": [16470],
+    "includes": [16480],
   },
 
   "net/base/net_resources.grd": {
-    "includes": [16490],
+    "includes": [16500],
   },
 
   "remoting/resources/remoting_strings.grd": {
-    "messages": [16500],
+    "messages": [16510],
   },
 
   "services/services_strings.grd": {
-    "messages": [16880],
+    "messages": [16890],
   },
 
   "third_party/blink/public/blink_image_resources.grd": {
-    "structures": [16890],
+    "structures": [16900],
   },
   "third_party/blink/public/blink_resources.grd": {
-    "includes": [16900],
+    "includes": [16910],
   },
   "third_party/blink/renderer/modules/media_controls/resources/media_controls_resources.grd": {
-    "includes": [16980],
-    "structures": [16990],
+    "includes": [16990],
+    "structures": [17000],
   },
   "third_party/blink/public/strings/blink_strings.grd": {
-    "messages": [17000],
+    "messages": [17010],
   },
   "third_party/ink/ink_resources.grd": {
-    "includes": [17310],
+    "includes": [17320],
   },
   "third_party/libaddressinput/chromium/address_input_strings.grd": {
-    "messages": [17320],
+    "messages": [17330],
   },
 
   "ui/base/test/ui_base_test_resources.grd": {
-    "messages": [17370],
+    "messages": [17380],
   },
   "ui/chromeos/resources/ui_chromeos_resources.grd": {
-    "structures": [17380],
+    "structures": [17390],
   },
   "ui/chromeos/ui_chromeos_strings.grd": {
-    "messages": [17480],
+    "messages": [17490],
   },
   "ui/file_manager/file_manager_resources.grd": {
-    "includes": [18400],
+    "includes": [18410],
   },
   "ui/resources/ui_resources.grd": {
-    "structures": [18620],
+    "structures": [18630],
   },
   "ui/resources/ui_unscaled_resources.grd": {
-    "includes": [18760],
+    "includes": [18770],
   },
   "ui/strings/app_locale_settings.grd": {
-    "messages": [18790],
+    "messages": [18800],
   },
   "ui/strings/ui_strings.grd": {
-    "messages": [18800],
+    "messages": [18810],
   },
   "ui/views/resources/views_resources.grd": {
-    "structures": [19090],
+    "structures": [19110],
   },
   "ui/webui/resources/webui_resources.grd": {
-    "includes": [19150],
-    "structures": [19310],
+    "includes": [19170],
+    "structures": [19330],
   },
   "weblayer/weblayer_resources.grd": {
-    "includes": [19930],
+    "includes": [19950],
   },
 
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
     "META": {"sizes": {"includes": [500],}},
-    "includes": [19940],
+    "includes": [19960],
   },
 
   # END "everything else" section.