[DevUI DFM] Move chrome://{net-internals, quota-internals, invalidation, webpaks} to the DFM.

This CL move to the DFM 4 page totalling ~27.8 kB that are low-hanging
fruits because they already have their own GRD files.

Also taking the opportunity to reorganize:
* Move the pages' grit() targets to separate BUILD.gn files.
* Move chrome://invalidations resources to its own directory.


Bug: 927131
Change-Id: Ic31bd86e09312c8137661432788b2b58eade0bc5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1949056Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Dan Beam <dbeam@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721604}

chrome/BUILD.gn

@@ -1535,10 +1535,6 @@ group("resources") {
 group("extra_resources") {
   # Deps should be same as those in chrome_extra_paks() within chrome_paks.gni.
   public_deps = [
-    "//chrome/browser/resources:invalidations_resources",
-    "//chrome/browser/resources:net_internals_resources",
-    "//chrome/browser/resources:quota_internals_resources",
-    "//chrome/browser/resources:webapks_ui_resources",
     "//components/autofill/core/browser:autofill_address_rewriter_resources",
   ]
 

chrome/browser/resources/BUILD.gn

@@ -69,46 +69,6 @@ if (closure_compile) {
   }
 }
 
-grit("invalidations_resources") {
-  source = "invalidations_resources.grd"
-  defines = chrome_grit_defines
-  outputs = [
-    "grit/invalidations_resources.h",
-    "invalidations_resources.pak",
-  ]
-  output_dir = "$root_gen_dir/chrome"
-}
-
-grit("net_internals_resources") {
-  source = "net_internals/net_internals_resources.grd"
-  defines = chrome_grit_defines
-  outputs = [
-    "grit/net_internals_resources.h",
-    "net_internals_resources.pak",
-  ]
-  output_dir = "$root_gen_dir/chrome"
-}
-
-grit("quota_internals_resources") {
-  source = "quota_internals/quota_internals_resources.grd"
-  defines = chrome_grit_defines
-  outputs = [
-    "grit/quota_internals_resources.h",
-    "quota_internals_resources.pak",
-  ]
-  output_dir = "$root_gen_dir/chrome"
-}
-
-grit("webapks_ui_resources") {
-  source = "webapks/webapks_ui_resources.grd"
-  defines = chrome_grit_defines
-  outputs = [
-    "grit/webapks_ui_resources.h",
-    "webapks_ui_resources.pak",
-  ]
-  output_dir = "$root_gen_dir/chrome"
-}
-
 if (!is_android) {
   grit("bookmarks_resources") {
     # The .grd contains references to generated files.
@@ -460,7 +420,10 @@ repack("dev_ui_paks") {
 
   sources = [
     "$root_gen_dir/chrome/bluetooth_internals_resources.pak",
+    "$root_gen_dir/chrome/invalidations_resources.pak",
+    "$root_gen_dir/chrome/net_internals_resources.pak",
     "$root_gen_dir/chrome/omnibox_resources.pak",
+    "$root_gen_dir/chrome/quota_internals_resources.pak",
     "$root_gen_dir/chrome/usb_internals_resources.pak",
     "$root_gen_dir/chrome/webrtc_logs_resources.pak",
     "$root_gen_dir/components/sync_driver_resources.pak",
@@ -469,13 +432,21 @@ repack("dev_ui_paks") {
   ]
   deps = [
     "//chrome/browser/resources/bluetooth_internals:resources",
+    "//chrome/browser/resources/invalidations:invalidations_resources",
     "//chrome/browser/resources/media:webrtc_logs_resources",
+    "//chrome/browser/resources/net_internals:net_internals_resources",
     "//chrome/browser/resources/omnibox:resources",
+    "//chrome/browser/resources/quota_internals:quota_internals_resources",
     "//chrome/browser/resources/usb_internals:resources",
     "//components/sync/driver:resources",
     "//content/browser/resources/media:media_internals_resources",
     "//content/browser/webrtc/resources",
   ]
+
+  if (is_android) {
+    sources += [ "$root_gen_dir/chrome/webapks_ui_resources.pak" ]
+    deps += [ "//chrome/browser/resources/webapks:webapks_ui_resources" ]
+  }
 }
 
 js2gtest("resources_unitjs_tests") {

chrome/browser/resources/invalidations/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("//chrome/common/features.gni")
+import("//tools/grit/grit_rule.gni")
+
+grit("invalidations_resources") {
+  source = "invalidations_resources.grd"
+  defines = chrome_grit_defines
+  outputs = [
+    "grit/invalidations_resources.h",
+    "invalidations_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/chrome"
+}

chrome/browser/resources/about_invalidations.css → chrome/browser/resources/invalidations/about_invalidations.css

@@ -17,8 +17,8 @@ body {
 
 #invalidations-info .section {
   display: inline-block;
-  margin-left: auto;
-  margin-right: auto;
+  margin-inline-end: auto;
+  margin-inline-start: auto;
   width: 100%;
 }
 

chrome/browser/resources/net_internals/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("//chrome/common/features.gni")
+import("//tools/grit/grit_rule.gni")
+
+grit("net_internals_resources") {
+  source = "net_internals_resources.grd"
+  defines = chrome_grit_defines
+  outputs = [
+    "grit/net_internals_resources.h",
+    "net_internals_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/chrome"
+}

chrome/browser/resources/quota_internals/BUILD.gn

@@ -2,7 +2,9 @@
 # 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")
 
 js_type_check("closure_compile") {
   deps = [
@@ -25,3 +27,13 @@ js_library("message_dispatcher") {
     "//ui/webui/resources/js:cr",
   ]
 }
+
+grit("quota_internals_resources") {
+  source = "quota_internals_resources.grd"
+  defines = chrome_grit_defines
+  outputs = [
+    "grit/quota_internals_resources.h",
+    "quota_internals_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/chrome"
+}

chrome/browser/resources/webapks/BUILD.gn

@@ -2,7 +2,9 @@
 # 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")
 
 js_type_check("closure_compile") {
   uses_js_modules = true
@@ -18,3 +20,13 @@ js_library("about_webapks") {
   ]
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
+
+grit("webapks_ui_resources") {
+  source = "webapks_ui_resources.grd"
+  defines = chrome_grit_defines
+  outputs = [
+    "grit/webapks_ui_resources.h",
+    "webapks_ui_resources.pak",
+  ]
+  output_dir = "$root_gen_dir/chrome"
+}

chrome/browser/ui/BUILD.gn

@@ -391,8 +391,11 @@ jumbo_static_library("ui") {
     "//chrome/browser/media:mojo_bindings",
     "//chrome/browser/notifications/scheduler/public",
     "//chrome/browser/profiling_host",
+    "//chrome/browser/resources/invalidations:invalidations_resources",
     "//chrome/browser/resources/media:webrtc_logs_resources",
+    "//chrome/browser/resources/net_internals:net_internals_resources",
     "//chrome/browser/resources/omnibox:resources",
+    "//chrome/browser/resources/quota_internals:quota_internals_resources",
     "//chrome/browser/resources/usb_internals:resources",
     "//chrome/browser/safe_browsing",
     "//chrome/browser/ssl:proto",
@@ -791,6 +794,7 @@ jumbo_static_library("ui") {
       "//chrome/android:jni_headers",
       "//chrome/android/features/dev_ui:buildflags",
       "//chrome/browser/android/thin_webview:thin_webview",
+      "//chrome/browser/resources/webapks:webapks_ui_resources",
       "//components/embedder_support/android:web_contents_delegate",
       "//components/navigation_interception",
       "//components/subresource_filter/core/browser",

chrome/chrome_paks.gni

@@ -92,9 +92,6 @@ template("chrome_extra_paks") {
       "$root_gen_dir/chrome/browser_resources.pak",
       "$root_gen_dir/chrome/chrome_unscaled_resources.pak",
       "$root_gen_dir/chrome/common_resources.pak",
-      "$root_gen_dir/chrome/invalidations_resources.pak",
-      "$root_gen_dir/chrome/net_internals_resources.pak",
-      "$root_gen_dir/chrome/quota_internals_resources.pak",
       "$root_gen_dir/components/autofill/core/browser/autofill_address_rewriter_resources.pak",
       "$root_gen_dir/components/components_resources.pak",
       "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
@@ -107,9 +104,6 @@ template("chrome_extra_paks") {
     deps = [
       "//chrome/app/theme:chrome_unscaled_resources",
       "//chrome/browser:resources",
-      "//chrome/browser/resources:invalidations_resources",
-      "//chrome/browser/resources:net_internals_resources",
-      "//chrome/browser/resources:quota_internals_resources",
       "//chrome/common:resources",
       "//components/autofill/core/browser:autofill_address_rewriter_resources",
       "//components/resources",
@@ -127,10 +121,7 @@ template("chrome_extra_paks") {
       sources += invoker.additional_paks
     }
 
-    if (is_android) {
-      sources += [ "$root_gen_dir/chrome/webapks_ui_resources.pak" ]
-      deps += [ "//chrome/browser/resources:webapks_ui_resources" ]
-    } else {
+    if (!is_android) {
       # New paks should be added here by default.
       sources += [
         "$root_gen_dir/chrome/bookmarks_resources.pak",

tools/gritsettings/resource_ids

@@ -116,77 +116,77 @@
   },
   "chrome/browser/resources/chromeos/camera/camera_resources.grd": {
     "includes": [9980],
-    "structures": [10030],
+    "structures": [10040],
   },
   "chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd": {
-    "messages": [10090],
+    "messages": [10100],
   },
   "chrome/browser/resources/chromeos/cellular_setup/cellular_setup_resources.grd": {
-    "structures": [10180],
+    "structures": [10190],
   },
   "chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd": {
-    "structures": [10190],
+    "structures": [10200],
   },
   "chrome/browser/resources/component_extension_resources.grd": {
-    "includes": [10200],
-    "structures": [10340],
+    "includes": [10210],
+    "structures": [10350],
   },
   "chrome/browser/resources/downloads/downloads_resources_vulcanized.grd": {
-    "includes": [10350],
+    "includes": [10360],
   },
   "chrome/browser/resources/downloads/downloads_resources.grd": {
-    "includes": [10360],
-    "structures": [10370],
+    "includes": [10370],
+    "structures": [10380],
   },
   "chrome/browser/resources/extensions/extensions_resources_vulcanized.grd": {
-    "includes": [10380],
+    "includes": [10390],
   },
   "chrome/browser/resources/extensions/extensions_resources.grd": {
-    "includes": [10390],
-    "structures": [10430],
+    "includes": [10400],
+    "structures": [10440],
   },
   "chrome/browser/resources/history/history_resources_vulcanized.grd": {
-    "includes": [10450],
+    "includes": [10460],
   },
   "chrome/browser/resources/history/history_resources.grd": {
-    "includes": [10470],
+    "includes": [10480],
   },
   "chrome/browser/resources/local_ntp/local_ntp_resources.grd": {
-    "includes": [10510],
+    "includes": [10520],
   },
  "chrome/browser/resources/new_tab_page/new_tab_page_resources.grd": {
-    "includes": [10550],
-    "structures": [10560],
+    "includes": [10560],
+    "structures": [10570],
   },
   "chrome/browser/resources/print_preview/print_preview_resources_vulcanized.grd": {
-    "includes": [10570],
+    "includes": [10580],
   },
   "chrome/browser/resources/print_preview/print_preview_resources.grd": {
-    "includes": [10580],
-    "structures": [10630],
+    "includes": [10590],
+    "structures": [10640],
   },
   "chrome/browser/resources/settings/os_settings_resources_vulcanized.grd": {
-    "includes": [10670],
+    "includes": [10680],
   },
   "chrome/browser/resources/settings/os_settings_resources.grd": {
-    "structures": [10680],
+    "structures": [10690],
   },
   "chrome/browser/resources/settings/settings_resources_vulcanized.grd": {
-    "includes": [11220],
+    "includes": [11230],
   },
   "chrome/browser/resources/settings/settings_resources.grd": {
-    "structures": [11230],
+    "structures": [11240],
   },
   "chrome/browser/resources/tab_strip/tab_strip_resources.grd": {
-    "structures": [11820],
-    "includes": [11840],
+    "structures": [11830],
+    "includes": [11850],
   },
   "chrome/browser/resources/welcome/welcome_resources.grd": {
-    "includes": [11860],
-    "structures": [11890],
+    "includes": [11870],
+    "structures": [11900],
   },
   "chrome/browser/vr/testapp/vr_testapp_resources.grd": {
-    "includes": [11910],
+    "includes": [11920],
   },
   # END chrome/browser section.
 
@@ -199,7 +199,7 @@
   "chrome/browser/resources/bluetooth_internals/resources.grd": {
     "includes": [12010],
   },
-  "chrome/browser/resources/invalidations_resources.grd": {
+  "chrome/browser/resources/invalidations/invalidations_resources.grd": {
     "includes": [12050],
   },
   "chrome/browser/resources/media/webrtc_logs_resources.grd": {