Revert "[DevUI DFM] Add chrome://sync-internals resources"

This reverts commit 711a5e45.

Reason for revert: https://crbug.com/1013522

Original change's description:
> [DevUI DFM] Add chrome://sync-internals resources
> 
> Moves resources used in chrome://sync-internals out of
> components_resources.grd into its own GRD file. Also move these
> resources into the Dev UI Dynamic Feature Module (DFM) to save binary
> size on Chrome for Android.
> 
> Update iOS dependency to include the new resource target.
> 
> Bug: 927131
> Change-Id: Ibad6e27d004cc22138b68b615b517a171969c5ae
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849418
> Commit-Queue: Peter Wen <wnwen@chromium.org>
> Commit-Queue: Colin Blundell <blundell@chromium.org>
> Reviewed-by: Samuel Huang <huangs@chromium.org>
> Reviewed-by: Colin Blundell <blundell@chromium.org>
> Reviewed-by: Marc Treib <treib@chromium.org>
> Reviewed-by: Dan Beam <dbeam@chromium.org>
> Auto-Submit: Peter Wen <wnwen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#704639}

TBR=huangs@chromium.org,dbeam@chromium.org,wnwen@chromium.org,blundell@chromium.org,treib@chromium.org,vitaliii@chromium.org

Change-Id: I87c92143986fef0bbf8853d50d7cefcc1db92af7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 927131, 1013522
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1854764Reviewed-by: Peter Wen <wnwen@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705108}

chrome/browser/resources/BUILD.gn

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

chrome/browser/ui/BUILD.gn

@@ -513,7 +513,6 @@ jumbo_split_static_library("ui") {
     "//components/subresource_filter/content/browser",
     "//components/subresource_filter/core/browser",
     "//components/sync",
-    "//components/sync/driver:resources",
     "//components/sync_preferences",
     "//components/sync_sessions",
     "//components/tracing:startup_tracing",

chrome/browser/ui/webui/sync_internals_ui.cc

@@ -9,7 +9,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/sync_internals_message_handler.h"
 #include "chrome/common/url_constants.h"
-#include "components/grit/sync_driver_resources.h"
+#include "components/grit/components_resources.h"
 #include "components/sync/driver/about_sync_util.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"

components/resources/components_resources.grd

@@ -22,6 +22,7 @@
       <part file="safe_browsing_resources.grdp" />
       <part file="security_interstitials_resources.grdp" />
       <part file="signin_resources.grdp" />
+      <part file="sync_driver_resources.grdp" />
       <part file="translate_resources.grdp" />
       <part file="user_actions_ui_resources.grdp" />
       <part file="version_ui_resources.grdp" />

components/resources/sync_driver_resources.grdp

+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_INDEX_HTML" file="../sync/driver/resources/index.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_INDEX_JS" file="../sync/driver/resources/sync_index.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_CHROME_SYNC_JS" file="../sync/driver/resources/chrome_sync.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_TYPES_JS" file="../sync/driver/resources/types.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SYNC_LOG_JS" file="../sync/driver/resources/sync_log.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SYNC_NODE_BROWSER_JS" file="../sync/driver/resources/sync_node_browser.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SYNC_SEARCH_JS" file="../sync/driver/resources/sync_search.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_ABOUT_JS" file="../sync/driver/resources/about.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_DATA_JS" file="../sync/driver/resources/data.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_EVENTS_JS" file="../sync/driver/resources/events.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SEARCH_JS" file="../sync/driver/resources/search.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_USER_EVENTS_JS" file="../sync/driver/resources/user_events.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_TRAFFIC_LOG_JS"  file="../sync/driver/resources/traffic_log.js" type="BINDATA" compress="gzip" />
+</grit-part>

components/sync/driver/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("//build/config/features.gni")
 import("//build/config/jumbo.gni")
-import("//tools/grit/grit_rule.gni")
 
 declare_args() {
   # Controls the product part of the user agent calculated in sync_util.cc.
@@ -136,23 +135,6 @@ jumbo_static_library("driver") {
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 }
 
-grit("resources") {
-  source = "resources.grd"
-
-  # The .grd contains references to generated files.
-  source_is_generated = true
-  outputs = [
-    "grit/sync_driver_resources.h",
-    "sync_driver_resources.pak",
-  ]
-  output_dir = "$root_gen_dir/components"
-  depfile_dir = target_gen_dir
-  grit_flags = [
-    "-E",
-    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
-  ]
-}
-
 static_library("test_support") {
   testonly = true
   sources = [

components/sync/driver/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/sync_driver_resources.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="sync_driver_resources.pak" type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_INDEX_HTML" file="resources/index.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_INDEX_JS" file="resources/sync_index.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_CHROME_SYNC_JS" file="resources/chrome_sync.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_TYPES_JS" file="resources/types.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SYNC_LOG_JS" file="resources/sync_log.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SYNC_NODE_BROWSER_JS" file="resources/sync_node_browser.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SYNC_SEARCH_JS" file="resources/sync_search.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_ABOUT_JS" file="resources/about.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_DATA_JS" file="resources/data.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_EVENTS_JS" file="resources/events.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SEARCH_JS" file="resources/search.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_USER_EVENTS_JS" file="resources/user_events.js" type="BINDATA" compress="gzip" />
-      <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_TRAFFIC_LOG_JS"  file="resources/traffic_log.js" type="BINDATA" compress="gzip" />
-    </includes>
-  </release>
-</grit>

ios/chrome/browser/ui/webui/sync_internals/BUILD.gn

@@ -14,7 +14,6 @@ source_set("sync_internals") {
     "//components/browser_sync",
     "//components/resources",
     "//components/sync",
-    "//components/sync/driver:resources",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/signin",

ios/chrome/browser/ui/webui/sync_internals/sync_internals_ui.cc

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "components/grit/sync_driver_resources.h"
+#include "components/grit/components_resources.h"
 #include "components/sync/driver/about_sync_util.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"

tools/gritsettings/resource_ids

@@ -172,37 +172,34 @@
   "chrome/browser/resources/usb_internals/resources.grd": {
     "includes": [14030],
   },
-  "components/sync/driver/resources.grd": {
-    "includes": [14050],
-  },
   # END chrome/ WebUI resources section
 
   # START chrome/ miscellaneous section.
   "chrome/android/features/test_dummy/internal/resources/resources.grd": {
-    "includes": [14090],
+    "includes": [14070],
   },
   "chrome/common/common_resources.grd": {
-    "includes": [14180],
+    "includes": [14160],
   },
   "chrome/credential_provider/gaiacp/gaia_resources.grd": {
-    "includes": [14200],
-    "messages": [14210],
+    "includes": [14180],
+    "messages": [14190],
   },
   "chrome/renderer/resources/renderer_resources.grd": {
-    "includes": [14250],
-    "structures": [14360],
+    "includes": [14230],
+    "structures": [14340],
   },
   "chrome/test/data/webui_test_resources.grd": {
-    "includes": [14400],
+    "includes": [14380],
   },
   # END chrome/ miscellaneous section.
 
   # START chromeos/ section.
   "chromeos/chromeos_strings.grd": {
-    "messages": [14530],
+    "messages": [14510],
   },
   "chromeos/resources/chromeos_resources.grd": {
-    "includes": [14580],
+    "includes": [14560],
   },
   # END chromeos/ section.
 
@@ -211,27 +208,27 @@
   # We only use one file depending on whether we're building Chromium or
   # Google Chrome.
   "components/components_chromium_strings.grd": {
-    "messages": [15060],
+    "messages": [15040],
   },
   "components/components_google_chrome_strings.grd": {
-    "messages": [15060],
+    "messages": [15040],
   },
 
   "components/components_locale_settings.grd": {
-    "includes": [15080],
-    "messages": [15090],
+    "includes": [15060],
+    "messages": [15070],
   },
   "components/components_strings.grd": {
-    "messages": [15120],
+    "messages": [15100],
   },
   "components/omnibox/resources/omnibox_resources.grd": {
-    "includes": [17210],
+    "includes": [17190],
   },
   "components/policy/resources/policy_templates.grd": {
-    "structures": [17220],
+    "structures": [17200],
   },
   "components/resources/components_resources.grd": {
-    "includes": [17230],
+    "includes": [17210],
   },
   "components/resources/components_scaled_resources.grd": {
     "structures": [17400],