BASELINE: Update Chromium to 84.0.4147.141

Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

66 files changed, 4656 insertions, 5825 deletions

diff --git a/chromium/chrome/browser/resources/settings/BUILD.gn b/chromium/chrome/browser/resources/settings/BUILD.gn
index e05a2589a3e..4250f4fa750 100644
--- a/chromium/chrome/browser/resources/settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/BUILD.gn
@@ -5,6 +5,7 @@
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")
+import("//tools/polymer/html_to_js.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("//ui/webui/webui_features.gni")
@@ -15,27 +16,6 @@ if (optimize_webui) {
   settings_pak_file = "settings_resources.pak"
   unpak_folder = "settings_resources.unpak"
 
-  optimize_webui("build") {
-    host = "settings"
-    html_in_files = [
-      "settings.html",
-      "lazy_load.html",
-    ]
-    html_out_files = [
-      "vulcanized.html",
-      "lazy_load.vulcanized.html",
-    ]
-    insert_in_head = "<base href=\"chrome://settings\">"
-    input = rebase_path("$target_gen_dir/$unpak_folder", root_build_dir)
-    js_out_files = [
-      "crisper.js",
-      "lazy_load.crisper.js",
-    ]
-    excludes = [ "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html" ]
-
-    deps = [ ":unpak" ]
-  }
-
   optimize_webui("build_polymer3") {
     host = "settings"
     input = rebase_path("$target_gen_dir/$unpak_folder", root_build_dir)
@@ -89,43 +69,15 @@ group("closure_compile") {
     "a11y_page:closure_compile",
     "about_page:closure_compile",
     "appearance_page:closure_compile",
-    "autofill_page:closure_compile",
-    "basic_page:closure_compile",
-    "clear_browsing_data_dialog:closure_compile",
     "controls:closure_compile",
-    "downloads_page:closure_compile",
     "languages_page:closure_compile",
-    "on_startup_page:closure_compile",
     "people_page:closure_compile",
     "prefs:closure_compile",
-    "printing_page:closure_compile",
     "privacy_page:closure_compile",
-    "reset_page:closure_compile",
-    "safety_check_page:closure_compile",
     "search_engines_page:closure_compile",
-    "search_page:closure_compile",
-    "settings_main:closure_compile",
-    "settings_menu:closure_compile",
     "settings_page:closure_compile",
-    "settings_ui:closure_compile",
-    "site_settings:closure_compile",
-    "site_settings_page:closure_compile",
   ]
 
-  if (is_win) {
-    deps += [
-      "chrome_cleanup_page:closure_compile",
-      "incompatible_applications_page:closure_compile",
-    ]
-  }
-
-  if (!is_chromeos) {
-    deps += [
-      "default_browser_page:closure_compile",
-      "system_page:closure_compile",
-    ]
-  }
-
   if (is_chromeos) {
     deps += [
       "../../../test/data/webui/settings/chromeos:closure_compile",
@@ -138,16 +90,9 @@ js_type_check("settings_resources") {
   deps = [
     ":extension_control_browser_proxy",
     ":global_scroll_target_behavior",
-    ":hats_browser_proxy",
     ":lifetime_browser_proxy",
-    ":metrics_browser_proxy",
-    ":open_window_proxy",
-    ":page_visibility",
-    ":plural_string_proxy",
-    ":route",
     ":router",
     ":search_settings",
-    ":settings_routes",
   ]
 }
 
@@ -166,39 +111,11 @@ js_library("global_scroll_target_behavior") {
   ]
 }
 
-js_library("hats_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
 js_library("lifetime_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr" ]
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
 
-js_library("metrics_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
-js_library("open_window_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-}
-
-js_library("plural_string_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-}
-
-js_library("route") {
-  deps = [
-    ":page_visibility",
-    ":router",
-    ":settings_routes",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-}
-
 js_library("router") {
   deps = [
     "//ui/webui/resources/js:cr",
@@ -207,17 +124,6 @@ js_library("router") {
   externs_list = [ "$externs_path/metrics_private.js" ]
 }
 
-js_library("settings_routes") {
-  deps = [ ":router" ]
-}
-
-js_library("page_visibility") {
-  deps = [
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-}
-
 js_library("search_settings") {
   deps = [
     "//ui/webui/resources/js:assert",
@@ -271,25 +177,48 @@ group("closure_compile_module") {
       "incompatible_applications_page:closure_compile_module",
     ]
   }
+
+  if (is_chromeos) {
+    deps += [ "chromeos:closure_compile_module" ]
+  }
 }
 
 js_type_check("closure_compile_local_module") {
   is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":extension_control_browser_proxy.m",
     ":global_scroll_target_behavior.m",
-    ":hats_browser_proxy.m",
-    ":i18n_setup.m",
+    ":hats_browser_proxy",
+    ":i18n_setup",
+    ":lazy_load",
     ":lifetime_browser_proxy.m",
-    ":metrics_browser_proxy.m",
-    ":open_window_proxy.m",
-    ":page_visibility.m",
-    ":plural_string_proxy.m",
-    ":route.m",
+    ":metrics_browser_proxy",
+    ":open_window_proxy",
+    ":page_visibility",
+    ":plural_string_proxy",
+    ":route",
     ":router.m",
     ":search_settings.m",
-    ":settings_routes.m",
-    ":site_favicon.m",
+    ":settings",
+    ":settings_routes",
+    ":site_favicon",
+  ]
+}
+
+js_library("settings") {
+  deps = [
+    ":hats_browser_proxy",
+    ":lifetime_browser_proxy.m",
+    ":metrics_browser_proxy",
+    ":open_window_proxy",
+    "about_page:about_page_browser_proxy.m",
+    "autofill_page:password_manager_proxy",
+    "people_page:sync_browser_proxy.m",
+    "privacy_page:privacy_page_browser_proxy.m",
+    "safety_check_page:safety_check_browser_proxy",
+    "search_engines_page:search_engines_browser_proxy.m",
+    "settings_ui:settings_ui",
   ]
 }
 
@@ -300,7 +229,7 @@ js_library("extension_control_browser_proxy.m") {
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
 
-js_library("i18n_setup.m") {
+js_library("i18n_setup") {
   deps = [ "//ui/webui/resources/js:load_time_data.m" ]
 }
 
@@ -313,12 +242,22 @@ js_library("global_scroll_target_behavior.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("hats_browser_proxy.m") {
-  sources = [
-    "$root_gen_dir/chrome/browser/resources/settings/hats_browser_proxy.m.js",
-  ]
+js_library("hats_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
+}
+
+js_library("lazy_load") {
+  deps = [
+    "autofill_page:autofill_section",
+    "autofill_page:payments_section",
+    "privacy_page:cookies_page",
+    "privacy_page:safe_browsing_browser_proxy",
+    "privacy_page:security_page",
+    "site_settings:local_data_browser_proxy",
+    "site_settings:protocol_handlers",
+    "site_settings:site_settings_prefs_browser_proxy",
+    "site_settings_page",
+  ]
 }
 
 js_library("lifetime_browser_proxy.m") {
@@ -327,44 +266,29 @@ js_library("lifetime_browser_proxy.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("metrics_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/metrics_browser_proxy.m.js" ]
+js_library("metrics_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("open_window_proxy.m") {
-  sources = [
-    "$root_gen_dir/chrome/browser/resources/settings/open_window_proxy.m.js",
-  ]
+js_library("open_window_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("page_visibility.m") {
-  sources =
-      [ "$root_gen_dir/chrome/browser/resources/settings/page_visibility.m.js" ]
+js_library("page_visibility") {
   deps = [ "//ui/webui/resources/js:load_time_data.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("plural_string_proxy.m") {
-  sources = [
-    "$root_gen_dir/chrome/browser/resources/settings/plural_string_proxy.m.js",
-  ]
+js_library("plural_string_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("route.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/route.m.js" ]
+js_library("route") {
   deps = [
-    ":page_visibility.m",
+    ":page_visibility",
     ":router.m",
-    ":settings_routes.m",
+    ":settings_routes",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
 js_library("router.m") {
@@ -391,72 +315,65 @@ js_library("search_settings.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("settings_routes.m") {
-  sources =
-      [ "$root_gen_dir/chrome/browser/resources/settings/settings_routes.m.js" ]
+js_library("settings_routes") {
   deps = [ ":router.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("site_favicon.m") {
-  sources =
-      [ "$root_gen_dir/chrome/browser/resources/settings/site_favicon.m.js" ]
+js_library("site_favicon") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:icon.m",
   ]
-  extra_deps = [ ":site_favicon_module" ]
 }
 
 group("polymer3_elements") {
   public_deps = [
     # Sub-folder targets
     "a11y_page:polymer3_elements",
-    "about_page:polymer3_elements",
-    "appearance_page:polymer3_elements",
-    "autofill_page:polymer3_elements",
-    "basic_page:polymer3_elements",
-    "clear_browsing_data_dialog:polymer3_elements",
+    "about_page:web_components",
+    "appearance_page:web_components",
+    "autofill_page:web_components",
+    "basic_page:web_components",
+    "clear_browsing_data_dialog:web_components",
     "controls:polymer3_elements",
-    "downloads_page:polymer3_elements",
+    "downloads_page:web_components",
     "languages_page:polymer3_elements",
-    "on_startup_page:polymer3_elements",
+    "on_startup_page:web_components",
     "people_page:polymer3_elements",
     "prefs:polymer3_elements",
-    "printing_page:polymer3_elements",
+    "printing_page:web_components",
     "privacy_page:polymer3_elements",
-    "reset_page:polymer3_elements",
-    "safety_check_page:polymer3_elements",
-    "search_engines_page:polymer3_elements",
-    "search_page:polymer3_elements",
-    "settings_main:polymer3_elements",
-    "settings_menu:polymer3_elements",
+    "reset_page:web_components",
+    "safety_check_page:web_components",
+    "search_engines_page:web_components",
+    "search_page:web_components",
+    "settings_main:web_components",
+    "settings_menu:web_components",
     "settings_page:polymer3_elements",
-    "settings_ui:polymer3_elements",
-    "site_settings:polymer3_elements",
-    "site_settings_page:polymer3_elements",
+    "settings_ui:web_components",
+    "site_settings:web_components",
+    "site_settings_page:web_components",
 
     # Local targets
-    ":ensure_lazy_loaded_module",
     ":icons_module",
     ":modulize",
     ":settings_page_css_module",
     ":settings_shared_css_module",
     ":settings_vars_css_module",
-    ":site_favicon_module",
+    ":web_components_local",
   ]
 
   if (!is_chromeos) {
     public_deps += [
-      "default_browser_page:polymer3_elements",
-      "system_page:polymer3_elements",
+      "default_browser_page:web_components",
+      "system_page:web_components",
     ]
   }
 
   if (is_win) {
     public_deps += [
-      "chrome_cleanup_page:polymer3_elements",
-      "incompatible_applications_page:polymer3_elements",
+      "chrome_cleanup_page:web_components",
+      "incompatible_applications_page:web_components",
     ]
   }
 }
@@ -485,34 +402,17 @@ polymer_modulizer("settings_vars_css") {
   html_type = "custom-style"
 }
 
-polymer_modulizer("site_favicon") {
-  js_file = "site_favicon.js"
-  html_file = "site_favicon.html"
-  html_type = "dom-module"
-  auto_imports =
-      [ "ui/webui/resources/html/icon.html|getFavicon,getFaviconForPageURL" ]
-}
-
-polymer_modulizer("ensure_lazy_loaded") {
-  js_file = "ensure_lazy_loaded.m.js"
-  html_file = "ensure_lazy_loaded.html"
-  html_type = "v3-ready"
+html_to_js("web_components_local") {
+  js_files = [ "site_favicon.js" ]
 }
 
 js_modulizer("modulize") {
   input_files = [
     "extension_control_browser_proxy.js",
     "global_scroll_target_behavior.js",
-    "hats_browser_proxy.js",
     "lifetime_browser_proxy.js",
-    "metrics_browser_proxy.js",
-    "open_window_proxy.js",
-    "plural_string_proxy.js",
-    "page_visibility.js",
-    "route.js",
     "router.js",
     "search_settings.js",
-    "settings_routes.js",
   ]
   namespace_rewrites = settings_namespace_rewrites + [
                          "cr.search_highlight_utils.createEmptySearchBubble|createEmptySearchBubble",
diff --git a/chromium/chrome/browser/resources/settings/a11y_page/BUILD.gn b/chromium/chrome/browser/resources/settings/a11y_page/BUILD.gn
index 0279924a335..b87d67a7220 100644
--- a/chromium/chrome/browser/resources/settings/a11y_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/a11y_page/BUILD.gn
@@ -4,15 +4,10 @@
 
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../settings.gni")
 
 js_type_check("closure_compile") {
-  deps = [
-    ":a11y_page",
-    ":captions_browser_proxy",
-    ":captions_subpage",
-  ]
+  deps = [ ":captions_subpage" ]
 }
 
 js_library("captions_subpage") {
@@ -26,48 +21,29 @@ js_library("captions_subpage") {
   ]
 }
 
-js_library("a11y_page") {
-  deps = [
-    "..:route",
-    "..:router",
-    "../settings_page:settings_animated_pages",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("captions_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-}
-
 js_type_check("closure_compile_module") {
   is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
-    ":a11y_page.m",
-    ":captions_browser_proxy.m",
+    ":a11y_page",
+    ":captions_browser_proxy",
     ":captions_subpage.m",
   ]
 }
 
-js_library("a11y_page.m") {
-  sources = [
-    "$root_gen_dir/chrome/browser/resources/settings/a11y_page/a11y_page.m.js",
-  ]
+js_library("a11y_page") {
   deps = [
-    ":captions_browser_proxy.m",
-    "..:route.m",
+    ":captions_browser_proxy",
+    "..:route",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":a11y_page_module" ]
 }
 
-js_library("captions_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/a11y_page/captions_browser_proxy.m.js" ]
+js_library("captions_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
 js_library("captions_subpage.m") {
@@ -87,35 +63,23 @@ group("polymer3_elements") {
   public_deps = [
     ":a11y_page_module",
     ":captions_subpage_module",
-    ":modulize",
   ]
 }
 
 polymer_modulizer("a11y_page") {
   js_file = "a11y_page.js"
   html_file = "a11y_page.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/a11y_page/captions_browser_proxy.html|CaptionsBrowserProxyImpl",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Router",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
+  html_type = "v3-ready"
 }
 
 polymer_modulizer("captions_subpage") {
   js_file = "captions_subpage.js"
   html_file = "captions_subpage.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
   auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/a11y_page/captions_browser_proxy.html|CaptionsBrowserProxy",
                    "chrome/browser/resources/settings/controls/settings_dropdown_menu.html|DropdownMenuOptionList",
                    "chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.html|FontsBrowserProxy, FontsBrowserProxyImpl, FontsData",
                  ]
   namespace_rewrites = settings_namespace_rewrites
 }
-
-js_modulizer("modulize") {
-  input_files = [ "captions_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
diff --git a/chromium/chrome/browser/resources/settings/about_page/BUILD.gn b/chromium/chrome/browser/resources/settings/about_page/BUILD.gn
index 1589b17c9d6..d8e4ec9c6b3 100644
--- a/chromium/chrome/browser/resources/settings/about_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/about_page/BUILD.gn
@@ -3,27 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../settings.gni")
 
 js_type_check("closure_compile") {
-  deps = [
-    ":about_page",
-    ":about_page_browser_proxy",
-  ]
-}
-
-js_library("about_page") {
-  deps = [
-    ":about_page_browser_proxy",
-    "..:lifetime_browser_proxy",
-    "..:router",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:parse_html_subset",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
+  deps = [ ":about_page_browser_proxy" ]
 }
 
 js_library("about_page_browser_proxy") {
@@ -33,14 +18,14 @@ js_library("about_page_browser_proxy") {
 
 js_type_check("closure_compile_module") {
   is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
-    ":about_page.m",
+    ":about_page",
     ":about_page_browser_proxy.m",
   ]
 }
 
-js_library("about_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/about_page/about_page.m.js" ]
+js_library("about_page") {
   deps = [
     ":about_page_browser_proxy.m",
     "..:lifetime_browser_proxy.m",
@@ -51,34 +36,23 @@ js_library("about_page.m") {
     "//ui/webui/resources/js:parse_html_subset.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":about_page_module" ]
 }
 
 js_library("about_page_browser_proxy.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/about_page/about_page_browser_proxy.m.js" ]
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
   extra_deps = [ ":modulize" ]
 }
 
-group("polymer3_elements") {
+group("web_components") {
   public_deps = [
-    ":about_page_module",
     ":modulize",
+    ":web_components_local",
   ]
 }
 
-polymer_modulizer("about_page") {
-  js_file = "about_page.js"
-  html_file = "about_page.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "ui/webui/resources/html/assert.html|assert",
-                   "chrome/browser/resources/settings/router.html|Router",
-                   "chrome/browser/resources/settings/lifetime_browser_proxy.html|LifetimeBrowserProxy, LifetimeBrowserProxyImpl",
-                   "chrome/browser/resources/settings/about_page/about_page_browser_proxy.html|AboutPageBrowserProxy, AboutPageBrowserProxyImpl, UpdateStatus, UpdateStatusChangedEvent, PromoteUpdaterStatus",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
+html_to_js("web_components_local") {
+  js_files = [ "about_page.js" ]
 }
 
 js_modulizer("modulize") {
diff --git a/chromium/chrome/browser/resources/settings/appearance_page/BUILD.gn b/chromium/chrome/browser/resources/settings/appearance_page/BUILD.gn
index a223588107a..77b91120dfe 100644
--- a/chromium/chrome/browser/resources/settings/appearance_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/appearance_page/BUILD.gn
@@ -3,61 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../settings.gni")
 
 js_type_check("closure_compile") {
-  deps = [
-    ":appearance_browser_proxy",
-    ":appearance_fonts_page",
-    ":appearance_page",
-    ":fonts_browser_proxy",
-    ":home_url_input",
-  ]
-}
-
-js_library("appearance_fonts_page") {
-  deps = [
-    ":fonts_browser_proxy",
-    "../controls:settings_dropdown_menu",
-    "//ui/webui/resources/cr_elements/cr_slider:cr_slider",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
-js_library("appearance_browser_proxy") {
-  deps = [
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-  externs_list = [
-    "$externs_path/chrome_send.js",
-    "$externs_path/management.js",
-    "$externs_path/settings_private.js",
-  ]
-}
-
-js_library("appearance_page") {
-  deps = [
-    ":appearance_browser_proxy",
-    "..:page_visibility",
-    "..:route",
-    "..:router",
-    "../controls:settings_dropdown_menu",
-    "../settings_page:settings_animated_pages",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-  externs_list = [
-    "$externs_path/settings_private.js",
-    "$externs_path/chrome_send.js",
-  ]
+  deps = [ ":fonts_browser_proxy" ]
 }
 
 js_library("fonts_browser_proxy") {
@@ -68,45 +19,30 @@ js_library("fonts_browser_proxy") {
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
 
-js_library("home_url_input") {
-  deps = [
-    ":appearance_browser_proxy",
-    "../controls:pref_control_behavior",
-    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior",
-    "//ui/webui/resources/cr_elements/policy:cr_policy_pref_behavior",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
 js_type_check("closure_compile_module") {
   is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
-    ":appearance_browser_proxy.m",
-    ":appearance_fonts_page.m",
-    ":appearance_page.m",
+    ":appearance_browser_proxy",
+    ":appearance_fonts_page",
+    ":appearance_page",
     ":fonts_browser_proxy.m",
-    ":home_url_input.m",
+    ":home_url_input",
   ]
 }
 
-js_library("appearance_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.m.js" ]
+js_library("appearance_browser_proxy") {
   deps = [
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
   externs_list = [
-    "$externs_path/chrome_send.js",
     "$externs_path/management.js",
     "$externs_path/settings_private.js",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("appearance_fonts_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.m.js" ]
+js_library("appearance_fonts_page") {
   deps = [
     ":fonts_browser_proxy.m",
     "../controls:settings_dropdown_menu.m",
@@ -115,16 +51,13 @@ js_library("appearance_fonts_page.m") {
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-  extra_deps = [ ":appearance_fonts_page_module" ]
 }
 
-js_library("appearance_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/appearance_page/appearance_page.m.js" ]
+js_library("appearance_page") {
   deps = [
-    ":appearance_browser_proxy.m",
-    "..:page_visibility.m",
-    "..:route.m",
+    ":appearance_browser_proxy",
+    "..:page_visibility",
+    "..:route",
     "..:router.m",
     "../controls:settings_dropdown_menu.m",
     "../settings_page:settings_animated_pages.m",
@@ -132,11 +65,6 @@ js_library("appearance_page.m") {
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  externs_list = [
-    "$externs_path/settings_private.js",
-    "$externs_path/chrome_send.js",
-  ]
-  extra_deps = [ ":appearance_page_module" ]
 }
 
 js_library("fonts_browser_proxy.m") {
@@ -145,10 +73,9 @@ js_library("fonts_browser_proxy.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("home_url_input.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/appearance_page/home_url_input.m.js" ]
+js_library("home_url_input") {
   deps = [
-    ":appearance_browser_proxy.m",
+    ":appearance_browser_proxy",
     "../controls:pref_control_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
@@ -156,60 +83,24 @@ js_library("home_url_input.m") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":home_url_input_module" ]
 }
 
-group("polymer3_elements") {
+group("web_components") {
   public_deps = [
-    ":appearance_fonts_page_module",
-    ":appearance_page_module",
-    ":home_url_input_module",
     ":modulize",
+    ":web_components_local",
   ]
 }
 
-polymer_modulizer("appearance_fonts_page") {
-  js_file = "appearance_fonts_page.js"
-  html_file = "appearance_fonts_page.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "ui/webui/resources/cr_elements/cr_slider/cr_slider.html|SliderTick",
-                   "chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.html|FontsBrowserProxy, FontsBrowserProxyImpl, FontsData",
-                   "chrome/browser/resources/settings/controls/settings_dropdown_menu.html|DropdownMenuOptionList",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("appearance_page") {
-  js_file = "appearance_page.js"
-  html_file = "appearance_page.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "ui/webui/resources/html/assert.html|assert",
-                   "chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.html|AppearanceBrowserProxy, AppearanceBrowserProxyImpl",
-                   "chrome/browser/resources/settings/controls/settings_dropdown_menu.html|DropdownMenuOptionList",
-                   "chrome/browser/resources/settings/page_visibility.html|AppearancePageVisibility",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Router",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("home_url_input") {
-  js_file = "home_url_input.js"
-  html_file = "home_url_input.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "ui/webui/resources/html/assert.html|assert",
-                   "chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.html|AppearanceBrowserProxy, AppearanceBrowserProxyImpl",
-                 ]
+html_to_js("web_components_local") {
+  js_files = [
+    "appearance_fonts_page.js",
+    "appearance_page.js",
+    "home_url_input.js",
+  ]
 }
 
 js_modulizer("modulize") {
-  input_files = [
-    "appearance_browser_proxy.js",
-    "fonts_browser_proxy.js",
-  ]
+  input_files = [ "fonts_browser_proxy.js" ]
   namespace_rewrites = settings_namespace_rewrites
 }
diff --git a/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn b/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn
index bae62b7a7f8..f48d5203d74 100644
--- a/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn
@@ -3,11 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":address_edit_dialog",
     ":autofill_page",
@@ -18,11 +19,13 @@ js_type_check("closure_compile") {
     ":password_check",
     ":password_check_behavior",
     ":password_check_edit_dialog",
+    ":password_check_edit_disclaimer_dialog",
     ":password_check_list_item",
     ":password_edit_dialog",
     ":password_list_item",
     ":password_manager_proxy",
     ":password_remove_confirmation_dialog",
+    ":passwords_export_dialog",
     ":passwords_section",
     ":payments_list",
     ":payments_section",
@@ -31,214 +34,8 @@ js_type_check("closure_compile") {
   ]
 }
 
-js_library("autofill_page") {
-  deps = [
-    ":autofill_section",
-    ":password_check_behavior",
-    ":passwords_section",
-    ":payments_section",
-    "..:open_window_proxy",
-    "..:route",
-    "..:router",
-    "../prefs:prefs_behavior",
-    "../settings_page:settings_animated_pages",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-  ]
-  externs_list = [
-    "$externs_path/passwords_private.js",
-    "$externs_path/settings_private.js",
-  ]
-}
-
-js_library("autofill_section") {
-  deps = [
-    ":address_edit_dialog",
-    ":password_check_behavior",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-  externs_list = [ "$externs_path/autofill_private.js" ]
-}
-
-js_library("blocking_request_manager") {
-}
-
-js_library("payments_section") {
-  deps = [
-    ":credit_card_edit_dialog",
-    ":payments_list",
-    "..:metrics_browser_proxy",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-  externs_list = [ "$externs_path/autofill_private.js" ]
-}
-
 js_library("address_edit_dialog") {
   deps = [
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-  externs_list = [ "$externs_path/autofill_private.js" ]
-}
-
-js_library("credit_card_edit_dialog") {
-  deps = [ "//ui/webui/resources/js:i18n_behavior" ]
-  externs_list = [ "$externs_path/autofill_private.js" ]
-}
-
-js_library("credit_card_list_entry") {
-  deps = [ "//ui/webui/resources/js:i18n_behavior" ]
-  externs_list = [ "$externs_path/autofill_private.js" ]
-}
-
-js_library("password_check") {
-  deps = [
-    ":blocking_request_manager",
-    ":password_check_behavior",
-    ":password_manager_proxy",
-    "..:plural_string_proxy",
-    "../prefs:prefs_behavior",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:util",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-  externs_list = [ "$externs_path/quick_unlock_private.js" ]
-}
-
-js_library("password_check_behavior") {
-  deps = [
-    ":password_manager_proxy",
-    "..:plural_string_proxy",
-  ]
-  externs_list = [ "$externs_path/passwords_private.js" ]
-}
-
-js_library("password_check_edit_dialog") {
-  deps = [
-    ":password_manager_proxy",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-}
-
-js_library("password_remove_confirmation_dialog") {
-  deps = [
-    ":password_manager_proxy",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-}
-
-js_library("password_check_list_item") {
-  deps = [
-    ":blocking_request_manager",
-    ":password_manager_proxy",
-    "..:open_window_proxy",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-}
-
-js_library("password_list_item") {
-  deps = [
-    ":show_password_behavior",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js/cr/ui:focus_row_behavior",
-  ]
-}
-
-js_library("password_manager_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-  externs_list = [ "$externs_path/passwords_private.js" ]
-}
-
-js_library("passwords_section") {
-  deps = [
-    ":password_edit_dialog",
-    ":password_list_item",
-    ":password_manager_proxy",
-    "..:global_scroll_target_behavior",
-    "..:plural_string_proxy",
-    "..:route",
-    "../people_page:sync_browser_proxy",
-    "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
-    "//third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior-extracted",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
-    "//ui/webui/resources/cr_elements/cr_toast:cr_toast_manager",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:list_property_update_behavior",
-    "//ui/webui/resources/js:util",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-  externs_list = [
-    "$externs_path/passwords_private.js",
-    "$externs_path/quick_unlock_private.js",
-  ]
-}
-
-js_library("password_edit_dialog") {
-  deps = [
-    ":show_password_behavior",
-    "//ui/webui/resources/cr_elements/cr_input:cr_input",
-  ]
-}
-
-js_library("payments_list") {
-  deps = [
-    ":credit_card_list_entry",
-    ":upi_id_list_entry",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-}
-
-js_library("show_password_behavior") {
-  deps = [ ":blocking_request_manager" ]
-  externs_list = [ "$externs_path/passwords_private.js" ]
-}
-
-js_library("upi_id_list_entry") {
-  deps = [ "//ui/webui/resources/js:i18n_behavior" ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":address_edit_dialog.m",
-    ":autofill_page.m",
-    ":autofill_section.m",
-    ":blocking_request_manager.m",
-    ":credit_card_edit_dialog.m",
-    ":credit_card_list_entry.m",
-    ":password_check.m",
-    ":password_check_behavior.m",
-    ":password_check_edit_dialog.m",
-    ":password_check_list_item.m",
-    ":password_edit_dialog.m",
-    ":password_list_item.m",
-    ":password_manager_proxy.m",
-    ":password_remove_confirmation_dialog.m",
-    ":passwords_export_dialog.m",
-    ":passwords_section.m",
-    ":payments_list.m",
-    ":payments_section.m",
-    ":show_password_behavior.m",
-    ":upi_id_list_entry.m",
-  ]
-}
-
-js_library("address_edit_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/address_edit_dialog.m.js" ]
-  deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
     "//ui/webui/resources/js:assert.m",
@@ -246,15 +43,13 @@ js_library("address_edit_dialog.m") {
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
   externs_list = [ "$externs_path/autofill_private.js" ]
-  extra_deps = [ ":address_edit_dialog_module" ]
 }
 
-js_library("autofill_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/autofill_page.m.js" ]
+js_library("autofill_page") {
   deps = [
-    ":password_check_behavior.m",
-    "..:open_window_proxy.m",
-    "..:route.m",
+    ":password_check_behavior",
+    "..:open_window_proxy",
+    "..:route",
     "..:router.m",
     "../prefs:prefs_behavior.m",
   ]
@@ -262,13 +57,11 @@ js_library("autofill_page.m") {
     "$externs_path/passwords_private.js",
     "$externs_path/settings_private.js",
   ]
-  extra_deps = [ ":autofill_page_module" ]
 }
 
-js_library("autofill_section.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/autofill_section.m.js" ]
+js_library("autofill_section") {
   deps = [
-    ":address_edit_dialog.m",
+    ":address_edit_dialog",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
     "//ui/webui/resources/js:assert.m",
@@ -280,145 +73,124 @@ js_library("autofill_section.m") {
     "$externs_path/autofill_private.js",
     "$externs_path/metrics_private.js",
   ]
-  extra_deps = [ ":autofill_section_module" ]
 }
 
-js_library("blocking_request_manager.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/blocking_request_manager.m.js" ]
-  extra_deps = [ ":modulize" ]
+js_library("blocking_request_manager") {
 }
 
-js_library("credit_card_edit_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/credit_card_edit_dialog.m.js" ]
+js_library("credit_card_edit_dialog") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
   externs_list = [ "$externs_path/autofill_private.js" ]
-  extra_deps = [ ":credit_card_edit_dialog_module" ]
 }
 
-js_library("credit_card_list_entry.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.m.js" ]
+js_library("credit_card_list_entry") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
   externs_list = [ "$externs_path/autofill_private.js" ]
-  extra_deps = [ ":credit_card_list_entry_module" ]
 }
 
-js_library("password_check.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_check.m.js" ]
+js_library("password_check") {
   deps = [
-    ":blocking_request_manager.m",
-    ":password_check_behavior.m",
-    ":password_manager_proxy.m",
-    "..:plural_string_proxy.m",
+    ":blocking_request_manager",
+    ":password_check_behavior",
+    ":password_manager_proxy",
+    "..:plural_string_proxy",
     "../prefs:prefs_behavior.m",
+    "..:route",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
-    "//ui/webui/resources/js:util.m",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  externs_list = [ "$externs_path/quick_unlock_private.js" ]
-  extra_deps = [ ":password_check_module" ]
 }
 
-js_library("password_check_behavior.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_check_behavior.m.js" ]
+js_library("password_check_behavior") {
   deps = [
-    ":password_manager_proxy.m",
-    "..:plural_string_proxy.m",
+    ":password_manager_proxy",
+    "..:plural_string_proxy",
   ]
   externs_list = [ "$externs_path/passwords_private.js" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("password_check_edit_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_check_edit_dialog.m.js" ]
+js_library("password_check_edit_dialog") {
   deps = [
-    ":password_manager_proxy.m",
+    ":password_manager_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  extra_deps = [ ":password_check_edit_dialog_module" ]
 }
 
-js_library("password_check_list_item.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_check_list_item.m.js" ]
+js_library("password_check_edit_disclaimer_dialog") {
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("password_check_list_item") {
   deps = [
-    ":blocking_request_manager.m",
-    ":password_manager_proxy.m",
-    "..:open_window_proxy.m",
+    ":blocking_request_manager",
+    ":password_manager_proxy",
+    "..:open_window_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
-    "//ui/webui/resources/js:i18n_behavior",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  extra_deps = [ ":password_check_list_item_module" ]
 }
 
-js_library("password_edit_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_edit_dialog.m.js" ]
+js_library("password_edit_dialog") {
   deps = [
-    ":show_password_behavior.m",
+    ":show_password_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
   ]
-  extra_deps = [ ":password_edit_dialog_module" ]
 }
 
-js_library("password_remove_confirmation_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_remove_confirmation_dialog.m.js" ]
+js_library("password_remove_confirmation_dialog") {
   deps = [
-    ":password_manager_proxy.m",
+    ":password_manager_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  extra_deps = [ ":password_remove_confirmation_dialog_module" ]
 }
 
-js_library("password_list_item.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_list_item.m.js" ]
+js_library("password_list_item") {
   deps = [
-    ":blocking_request_manager.m",
-    ":show_password_behavior.m",
+    ":blocking_request_manager",
+    ":show_password_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
-  extra_deps = [ ":password_list_item_module" ]
 }
 
-js_library("password_manager_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_manager_proxy.m.js" ]
+js_library("password_manager_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
   externs_list = [ "$externs_path/passwords_private.js" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("passwords_export_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.m.js" ]
+js_library("passwords_export_dialog") {
   deps = [
-    ":blocking_request_manager.m",
-    ":password_manager_proxy.m",
+    ":blocking_request_manager",
+    ":password_manager_proxy",
   ]
-  extra_deps = [ ":passwords_export_dialog_module" ]
 }
 
-js_library("passwords_section.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/passwords_section.m.js" ]
+js_library("passwords_section") {
   deps = [
-    ":password_edit_dialog.m",
-    ":password_list_item.m",
-    ":password_manager_proxy.m",
+    ":password_edit_dialog",
+    ":password_list_item",
+    ":password_manager_proxy",
     "..:global_scroll_target_behavior.m",
-    "..:plural_string_proxy.m",
-    "..:route.m",
+    "..:plural_string_proxy",
+    "..:route",
     "../people_page:sync_browser_proxy.m",
     "../prefs:prefs_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
@@ -436,28 +208,24 @@ js_library("passwords_section.m") {
     "$externs_path/passwords_private.js",
     "$externs_path/quick_unlock_private.js",
   ]
-  extra_deps = [ ":passwords_section_module" ]
 }
 
-js_library("payments_list.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/payments_list.m.js" ]
+js_library("payments_list") {
   deps = [
-    ":credit_card_list_entry.m",
-    ":upi_id_list_entry.m",
+    ":credit_card_list_entry",
+    ":upi_id_list_entry",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":payments_list_module" ]
 }
 
-js_library("payments_section.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/payments_section.m.js" ]
+js_library("payments_section") {
   deps = [
-    ":autofill_section.m",
-    ":credit_card_edit_dialog.m",
-    ":payments_list.m",
-    "..:metrics_browser_proxy.m",
+    ":autofill_section",
+    ":credit_card_edit_dialog",
+    ":payments_list",
+    "..:metrics_browser_proxy",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:cr.m",
@@ -467,232 +235,42 @@ js_library("payments_section.m") {
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
   externs_list = [ "$externs_path/autofill_private.js" ]
-  extra_deps = [ ":payments_section_module" ]
 }
 
-js_library("show_password_behavior.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/show_password_behavior.m.js" ]
+js_library("show_password_behavior") {
   deps = [
-    ":blocking_request_manager.m",
-    ":password_manager_proxy.m",
+    ":blocking_request_manager",
+    ":password_manager_proxy",
   ]
   externs_list = [ "$externs_path/passwords_private.js" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("upi_id_list_entry.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/upi_id_list_entry.m.js" ]
+js_library("upi_id_list_entry") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  extra_deps = [ ":upi_id_list_entry_module" ]
-}
-
-group("polymer3_elements") {
-  public_deps = [
-    ":address_edit_dialog_module",
-    ":autofill_page_module",
-    ":autofill_section_module",
-    ":credit_card_edit_dialog_module",
-    ":credit_card_list_entry_module",
-    ":modulize",
-    ":password_check_edit_dialog_module",
-    ":password_check_list_item_module",
-    ":password_check_module",
-    ":password_edit_dialog_module",
-    ":password_list_item_module",
-    ":password_remove_confirmation_dialog_module",
-    ":passwords_export_dialog_module",
-    ":passwords_section_module",
-    ":passwords_shared_css_module",
-    ":payments_list_module",
-    ":payments_section_module",
-    ":upi_id_list_entry_module",
-  ]
-}
-
-polymer_modulizer("address_edit_dialog") {
-  js_file = "address_edit_dialog.js"
-  html_file = "address_edit_dialog.html"
-  html_type = "dom-module"
-  auto_imports = [
-    "ui/webui/resources/html/assert.html|assertNotReached",
-    "ui/webui/resources/html/cr.html|addSingletonGetter",
-    "ui/webui/resources/html/polymer.html|html,flush,Polymer",
-  ]
-  namespace_rewrites =
-      settings_namespace_rewrites +
-      [ "settings.address.AddressComponentUI|AddressComponentUI" ]
-}
-
-polymer_modulizer("autofill_page") {
-  js_file = "autofill_page.js"
-  html_file = "autofill_page.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl",
-                   "chrome/browser/resources/settings/open_window_proxy.html|OpenWindowProxyImpl",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Router",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("autofill_section") {
-  js_file = "autofill_section.js"
-  html_file = "autofill_section.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "ui/webui/resources/html/assert.html|assert",
-                   "ui/webui/resources/html/cr.html|addSingletonGetter",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("credit_card_edit_dialog") {
-  js_file = "credit_card_edit_dialog.js"
-  html_file = "credit_card_edit_dialog.html"
-  html_type = "dom-module"
-}
-
-polymer_modulizer("credit_card_list_entry") {
-  js_file = "credit_card_list_entry.js"
-  html_file = "credit_card_list_entry.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("password_check") {
-  js_file = "password_check.js"
-  html_file = "password_check.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl,PasswordManagerProxy",
-                   "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxyImpl,SyncPrefs,SyncStatus",
-                   "chrome/browser/resources/settings/plural_string_proxy.html|PluralStringProxyImpl",
-                   "chrome/browser/resources/settings/router.html|Router",
-                   "ui/webui/resources/html/assert.html|assert",
-                   "ui/webui/resources/html/util.html|getDeepActiveElement",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("password_check_edit_dialog") {
-  js_file = "password_check_edit_dialog.js"
-  html_file = "password_check_edit_dialog.html"
-  html_type = "dom-module"
-  auto_imports = [
-    "ui/webui/resources/html/assert.html|assert",
-    "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl,PasswordManagerProxy",
-  ]
-}
-
-polymer_modulizer("password_check_list_item") {
-  js_file = "password_check_list_item.js"
-  html_file = "password_check_list_item.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/open_window_proxy.html|OpenWindowProxyImpl",
-                   "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl,PasswordManagerProxy",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("password_edit_dialog") {
-  js_file = "password_edit_dialog.js"
-  html_file = "password_edit_dialog.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports
-}
-
-polymer_modulizer("password_list_item") {
-  js_file = "password_list_item.js"
-  html_file = "password_list_item.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerProxy" ]
-}
-
-polymer_modulizer("passwords_export_dialog") {
-  js_file = "passwords_export_dialog.js"
-  html_file = "passwords_export_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl, PasswordManagerProxy" ]
-}
-
-polymer_modulizer("password_remove_confirmation_dialog") {
-  js_file = "password_remove_confirmation_dialog.js"
-  html_file = "password_remove_confirmation_dialog.html"
-  html_type = "dom-module"
-  auto_imports = [
-    "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl,PasswordManagerProxy",
-    "ui/webui/resources/html/assert.html|assert",
-  ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("passwords_section") {
-  js_file = "passwords_section.js"
-  html_file = "passwords_section.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites +
-                       [ "Polymer.IronA11yKeysBehavior|IronA11yKeysBehavior" ]
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl,PasswordManagerProxy",
-                   "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxyImpl,SyncPrefs,SyncStatus",
-                   "chrome/browser/resources/settings/plural_string_proxy.html|PluralStringProxyImpl",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Router",
-                   "third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html|IronA11yKeysBehavior",
-                   "ui/webui/resources/cr_elements/cr_toast/cr_toast_manager.html|getToastManager",
-                   "ui/webui/resources/html/assert.html|assert",
-                   "ui/webui/resources/html/polymer.html|afterNextRender,html,Polymer",
-                   "ui/webui/resources/html/util.html|getDeepActiveElement",
-                 ]
-}
-
-polymer_modulizer("passwords_shared_css") {
-  js_file = "passwords_shared_css.m.js"
-  html_file = "passwords_shared_css.html"
-  html_type = "style-module"
-}
-
-polymer_modulizer("payments_list") {
-  js_file = "payments_list.js"
-  html_file = "payments_list.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("payments_section") {
-  js_file = "payments_section.js"
-  html_file = "payments_section.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/autofill_page/autofill_section.html|AutofillManager",
-                   "chrome/browser/resources/settings/metrics_browser_proxy.html|MetricsBrowserProxyImpl,PrivacyElementInteractions",
-                   "ui/webui/resources/html/assert.html|assert",
-                   "ui/webui/resources/html/cr.html|addSingletonGetter",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites +
-                       [ "settings.PaymentsManager|PaymentsManager" ]
-}
-
-polymer_modulizer("upi_id_list_entry") {
-  js_file = "upi_id_list_entry.js"
-  html_file = "upi_id_list_entry.html"
-  html_type = "dom-module"
 }
 
-js_modulizer("modulize") {
-  input_files = [
-    "blocking_request_manager.js",
-    "password_check_behavior.js",
-    "password_manager_proxy.js",
-    "show_password_behavior.js",
+html_to_js("web_components") {
+  js_files = [
+    "address_edit_dialog.js",
+    "autofill_page.js",
+    "autofill_section.js",
+    "credit_card_edit_dialog.js",
+    "credit_card_list_entry.js",
+    "password_check_edit_dialog.js",
+    "password_check_edit_disclaimer_dialog.js",
+    "password_check_list_item.js",
+    "password_check.js",
+    "password_edit_dialog.js",
+    "password_list_item.js",
+    "password_remove_confirmation_dialog.js",
+    "passwords_export_dialog.js",
+    "passwords_section.js",
+    "passwords_shared_css.js",
+    "payments_list.js",
+    "payments_section.js",
+    "upi_id_list_entry.js",
   ]
-  namespace_rewrites = settings_namespace_rewrites
 }
diff --git a/chromium/chrome/browser/resources/settings/basic_page/BUILD.gn b/chromium/chrome/browser/resources/settings/basic_page/BUILD.gn
index 7d7144891ab..21924f68c30 100644
--- a/chromium/chrome/browser/resources/settings/basic_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/basic_page/BUILD.gn
@@ -3,10 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [ ":basic_page" ]
 }
 
@@ -14,52 +16,17 @@ js_library("basic_page") {
   deps = [
     "..:page_visibility",
     "..:route",
-    "..:router",
-    "..:search_settings",
-    "../chrome_cleanup_page:chrome_cleanup_proxy",
-    "../prefs:prefs_behavior",
-    "../settings_page:main_page_behavior",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-  externs_list = [ "$externs_path/pending_polymer.js" ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [ ":basic_page.m" ]
-}
-
-js_library("basic_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/basic_page/basic_page.m.js" ]
-  deps = [
-    "..:page_visibility.m",
-    "..:route.m",
     "..:router.m",
     "..:search_settings.m",
-    "../chrome_cleanup_page:chrome_cleanup_proxy.m",
+    "../chrome_cleanup_page:chrome_cleanup_proxy",
     "../prefs:prefs_behavior.m",
+    "../safety_check_page:safety_check_page",
+    "../search_page",
     "../settings_page:main_page_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":basic_page_module" ]
-}
-
-group("polymer3_elements") {
-  public_deps = [ ":basic_page_module" ]
 }
 
-polymer_modulizer("basic_page") {
-  js_file = "basic_page.js"
-  html_file = "basic_page.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/page_visibility.html|PageVisibility",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route, Router, RouteObserverBehavior",
-                   "chrome/browser/resources/settings/settings_page/main_page_behavior.html|MainPageBehavior",
-                   "chrome/browser/resources/settings/search_settings.html|getSearchManager, SearchResult",
-                   "ui/webui/resources/html/assert.html|assert",
-                   "ui/webui/resources/html/polymer.html|beforeNextRender,html,Polymer",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
+html_to_js("web_components") {
+  js_files = [ "basic_page.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/chrome_cleanup_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chrome_cleanup_page/BUILD.gn
index 71b108e45e9..1ca63afb2c8 100644
--- a/chromium/chrome/browser/resources/settings/chrome_cleanup_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chrome_cleanup_page/BUILD.gn
@@ -3,11 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":chrome_cleanup_page",
     ":chrome_cleanup_proxy",
@@ -15,103 +16,32 @@ js_type_check("closure_compile") {
   ]
 }
 
-js_library("chrome_cleanup_proxy") {
-  deps = [
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-  ]
-}
-
 js_library("chrome_cleanup_page") {
   deps = [
     ":chrome_cleanup_proxy",
-    "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:util",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("items_to_remove_list") {
-  deps = [
-    ":chrome_cleanup_proxy",
-    "//ui/webui/resources/js:cr",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":chrome_cleanup_page.m",
-    ":chrome_cleanup_proxy.m",
-    ":items_to_remove_list.m",
-  ]
-}
-
-js_library("chrome_cleanup_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_page.m.js" ]
-  deps = [
-    ":chrome_cleanup_proxy.m",
-    ":items_to_remove_list.m",
+    ":items_to_remove_list",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":chrome_cleanup_page_module" ]
   externs_list = [ "$externs_path/settings_private.js" ]
 }
 
-js_library("chrome_cleanup_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_proxy.m.js" ]
+js_library("chrome_cleanup_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("items_to_remove_list.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.m.js" ]
+js_library("items_to_remove_list") {
   deps = [
-    ":chrome_cleanup_proxy.m",
+    ":chrome_cleanup_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  extra_deps = [ ":items_to_remove_list_module" ]
-}
-
-group("polymer3_elements") {
-  public_deps = [
-    ":chrome_cleanup_page_module",
-    ":items_to_remove_list_module",
-    ":modulize",
-  ]
 }
 
-polymer_modulizer("chrome_cleanup_page") {
-  js_file = "chrome_cleanup_page.js"
-  html_file = "chrome_cleanup_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites + [
-                         "settings.ChromeCleaner|ChromeCleaner",
-                         "settings.ChromeCleanup|ChromeCleanup",
-                       ]
-  auto_imports = [
-    "ui/webui/resources/html/assert.html|assert",
-    "chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_proxy.html|ChromeCleanupProxyImpl,ChromeCleanupProxy",
-    "chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.html|ChromeCleanupRemovalListItem",
+html_to_js("web_components") {
+  js_files = [
+    "chrome_cleanup_page.js",
+    "items_to_remove_list.js",
   ]
 }
-
-polymer_modulizer("items_to_remove_list") {
-  js_file = "items_to_remove_list.js"
-  html_file = "items_to_remove_list.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = [ "chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_proxy.html|ChromeCleanupProxyImpl" ]
-}
-
-js_modulizer("modulize") {
-  input_files = [ "chrome_cleanup_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
index 01feaf04caa..2e345985162 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
@@ -5,6 +5,7 @@
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")
+import("//ui/webui/resources/tools/js_modulizer.gni")
 import("//ui/webui/webui_features.gni")
 import("../../optimize_webui.gni")
 
@@ -38,6 +39,8 @@ if (optimize_webui) {
       "chrome://os-settings/app-management/image_info.mojom-lite.js",
       "chrome://os-settings/app-management/image.mojom-lite.js",
       "chrome://os-settings/app-management/types.mojom-lite.js",
+      "chrome://os-settings/constants/routes.mojom-lite.js",
+      "chrome://os-settings/constants/setting.mojom-lite.js",
       "chrome://os-settings/search/search.mojom-lite.js",
       "chrome://os-settings/search/search_result_icon.mojom-lite.js",
       "chrome://os-settings/search/user_action_recorder.mojom-lite.js",
@@ -59,16 +62,14 @@ if (optimize_webui) {
   grit("flattened_resources") {
     source = "../os_settings_resources.grd"
 
-    deps = [
-      "//chrome/browser/ui/webui/app_management:mojo_bindings_js",
-      "//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js",
-    ]
+    deps = [ "//chrome/browser/ui/webui/settings/chromeos:mojom_js" ]
 
     grit_flags = [
       "-E",
       "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
     ]
 
+    deps += [ ":polymer3_elements" ]
     defines = chrome_grit_defines
     outputs = [
       "grit/os_settings_resources.h",
@@ -87,6 +88,7 @@ group("closure_compile") {
     ":os_route",
     ":os_settings_routes",
     ":route_origin_behavior",
+    ":search_handler",
     "ambient_mode_page:closure_compile",
     "bluetooth_page:closure_compile",
     "crostini_page:closure_compile",
@@ -98,7 +100,6 @@ group("closure_compile") {
     "multidevice_page:closure_compile",
     "os_a11y_page:closure_compile",
     "os_apps_page:closure_compile",
-    "os_apps_page/app_management_page:closure_compile",
     "os_files_page:closure_compile",
     "os_languages_page:closure_compile",
     "os_people_page:closure_compile",
@@ -113,7 +114,11 @@ group("closure_compile") {
     "os_settings_ui:closure_compile",
     "parental_controls_page:closure_compile",
     "personalization_page:closure_compile",
-    "plugin_vm_page:closure_compile",
+
+    # TODO: These subpages should be listed in the BUILD files of their direct
+    # parents instead of here.
+    "os_apps_page/app_management_page:closure_compile",
+    "os_apps_page/app_management_page/plugin_vm_page:closure_compile",
   ]
 }
 
@@ -128,6 +133,7 @@ js_library("os_route") {
   deps = [
     ":os_settings_routes",
     "..:router",
+    "//chrome/browser/ui/webui/settings/chromeos/constants:mojom_js_library_for_compile",
     "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:load_time_data",
   ]
@@ -153,3 +159,213 @@ js_library("metrics_recorder") {
     "//ui/webui/resources/js:cr",
   ]
 }
+
+js_library("search_handler") {
+  deps = [
+    "//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js_library_for_compile",
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+# Polymer 3 related rules.
+
+group("closure_compile_module") {
+  deps = [
+    # TODO: Uncomment as the Polymer3 migration makes progress.
+    #":closure_compile_local_module",
+    #"ambient_mode_page:closure_compile_module",
+    #"bluetooth_page:closure_compile_module",
+    #"crostini_page:closure_compile_module",
+    #"date_time_page:closure_compile_module",
+    #"device_page:closure_compile_module",
+    #"google_assistant_page:closure_compile_module",
+    #"internet_page:closure_compile_module",
+    #"localized_link:closure_compile_module",
+    #"multidevice_page:closure_compile_module",
+    #"os_a11y_page:closure_compile_module",
+    #"os_about_page:closure_compile_module",
+    #"os_apps_page:closure_compile_module",
+    #"os_apps_page/app_management_page/plugin_vm_page:closure_compile_module",
+    #"os_files_page:closure_compile_module",
+    #"os_languages_page:closure_compile_module",
+    #"os_people_page:closure_compile_module",
+    #"os_printing_page:closure_compile_module",
+    #"os_privacy_page:closure_compile_module",
+    #"os_reset_page:closure_compile_module",
+    #"os_search_page:closure_compile_module",
+    #"os_settings_main:closure_compile_module",
+    #"os_settings_menu:closure_compile_module",
+    #"os_settings_page:closure_compile_module",
+    #"os_settings_search_box:closure_compile_module",
+    #"os_settings_ui:closure_compile_module",
+    #"os_toolbar:closure_compile_module",
+    #"parental_controls_page:closure_compile_module",
+    #"personalization_page:closure_compile_module",
+  ]
+}
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_local_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":metrics_recorder.m",
+#    ":os_icons.m",
+#    ":os_page_visibility.m",
+#    ":os_route.m",
+#    ":os_settings.m",
+#    ":os_settings_icons_css.m",
+#    ":os_settings_routes.m",
+#    ":route_origin_behavior.m",
+#    ":search_handler.m",
+#  ]
+#}
+
+js_library("metrics_recorder.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/metrics_recorder.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":metrics_recorder_module" ]
+}
+
+js_library("os_icons.m") {
+  sources = [
+    "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_icons.m.js",
+  ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_icons_module" ]
+}
+
+js_library("os_page_visibility.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_page_visibility.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_page_visibility_module" ]
+}
+
+js_library("os_route.m") {
+  sources = [
+    "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_route.m.js",
+  ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_route_module" ]
+}
+
+js_library("os_settings_icons_css.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_icons_css.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_settings_icons_css_module" ]
+}
+
+js_library("os_settings_routes.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_routes.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("route_origin_behavior.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/route_origin_behavior.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("search_handler.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/search_handler.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    # Sub-folder targets
+    "ambient_mode_page:polymer3_elements",
+    "bluetooth_page:polymer3_elements",
+    "crostini_page:polymer3_elements",
+    "date_time_page:polymer3_elements",
+    "device_page:polymer3_elements",
+    "google_assistant_page:polymer3_elements",
+    "internet_page:polymer3_elements",
+    "localized_link:polymer3_elements",
+    "multidevice_page:polymer3_elements",
+    "os_a11y_page:polymer3_elements",
+    "os_about_page:polymer3_elements",
+    "os_apps_page:polymer3_elements",
+    "os_apps_page/app_management_page/plugin_vm_page:polymer3_elements",
+    "os_files_page:polymer3_elements",
+    "os_languages_page:polymer3_elements",
+    "os_people_page:polymer3_elements",
+    "os_printing_page:polymer3_elements",
+    "os_privacy_page:polymer3_elements",
+    "os_reset_page:polymer3_elements",
+    "os_search_page:polymer3_elements",
+    "os_settings_main:polymer3_elements",
+    "os_settings_menu:polymer3_elements",
+    "os_settings_page:polymer3_elements",
+    "os_settings_search_box:polymer3_elements",
+    "os_settings_ui:polymer3_elements",
+    "os_toolbar:polymer3_elements",
+    "parental_controls_page:polymer3_elements",
+    "personalization_page:polymer3_elements",
+
+    # Local targets
+    ":metrics_recorder_module",
+    ":modulize",
+    ":os_icons_module",
+    ":os_page_visibility_module",
+    ":os_route_module",
+    ":os_settings_icons_css_module",
+  ]
+}
+
+polymer_modulizer("metrics_recorder") {
+  js_file = "metrics_recorder.js"
+  html_file = "metrics_recorder.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_icons") {
+  js_file = "os_icons.m.js"
+  html_file = "os_icons.html"
+  html_type = "iron-iconset"
+}
+
+polymer_modulizer("os_page_visibility") {
+  js_file = "os_page_visibility.js"
+  html_file = "os_page_visibility.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_route") {
+  js_file = "os_route.js"
+  html_file = "os_route.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_settings_icons_css") {
+  js_file = "os_settings_icons_css.m.js"
+  html_file = "os_settings_icons_css.html"
+  html_type = "style-module"
+}
+
+js_modulizer("modulize") {
+  input_files = [
+    "os_settings_routes.js",
+    "route_origin_behavior.js",
+    "search_handler.js",
+  ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/ambient_mode_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/ambient_mode_page/BUILD.gn
index 583c5bdb26d..3e19c60857f 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/ambient_mode_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/ambient_mode_page/BUILD.gn
@@ -23,5 +23,52 @@ js_library("ambient_mode_page") {
     "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:load_time_data",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":ambient_mode_browser_proxy.m",
+#    ":ambient_mode_page.m"
+#  ]
+#}
+
+js_library("ambient_mode_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/ambient_mode_page/ambient_mode_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("ambient_mode_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/ambient_mode_page/ambient_mode_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":ambient_mode_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":ambient_mode_page_module",
+    ":modulize",
+  ]
+}
+
+polymer_modulizer("ambient_mode_page") {
+  js_file = "ambient_mode_page.js"
+  html_file = "ambient_mode_page.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [ "ambient_mode_browser_proxy.js" ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
index 8e257d5727e..a3432524ed1 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
@@ -68,3 +68,65 @@ js_library("bluetooth_system_on_extensions") {
   sources = []
   deps = [ "//services/device/public/mojom:mojom_js_library_for_compile" ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":bluetooth_device_list_item.m",
+#    ":bluetooth_page.m",
+#    ":bluetooth_subpage.m"
+#  ]
+#}
+
+js_library("bluetooth_device_list_item.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_device_list_item.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":bluetooth_device_list_item_module" ]
+}
+
+js_library("bluetooth_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":bluetooth_page_module" ]
+}
+
+js_library("bluetooth_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_subpage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":bluetooth_subpage_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":bluetooth_device_list_item_module",
+    ":bluetooth_page_module",
+    ":bluetooth_subpage_module",
+  ]
+}
+
+polymer_modulizer("bluetooth_device_list_item") {
+  js_file = "bluetooth_device_list_item.js"
+  html_file = "bluetooth_device_list_item.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("bluetooth_page") {
+  js_file = "bluetooth_page.js"
+  html_file = "bluetooth_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("bluetooth_subpage") {
+  js_file = "bluetooth_subpage.js"
+  html_file = "bluetooth_subpage.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
index 2cf11208bdd..8da221484d9 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
@@ -82,8 +82,13 @@ js_library("crostini_shared_usb_devices") {
 js_library("crostini_port_forwarding") {
   deps = [
     ":crostini_browser_proxy",
-    "../..:route",
+    "..:metrics_recorder",
+    "..:os_route",
     "../../prefs:prefs_behavior",
+    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
+    "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
 }
 
@@ -98,3 +103,240 @@ js_library("crostini_subpage") {
     "../../prefs:prefs_behavior",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":crostini_arc_adb.m",
+#    ":crostini_arc_adb_confirmation_dialog.m",
+#    ":crostini_browser_proxy.m",
+#    ":crostini_disk_resize_dialog.m",
+#    ":crostini_disk_resize_confirmation_dialog.m",
+#    ":crostini_export_import.m",
+#    ":crostini_import_confirmation_dialog.m",
+#    ":crostini_mic_sharing_dialog.m",
+#    ":crostini_page.m",
+#    ":crostini_port_forwarding.m",
+#    ":crostini_port_forwarding_add_port_dialog.m",
+#    ":crostini_shared_paths.m",
+#    ":crostini_shared_usb_devices.m",
+#    ":crostini_subpage.m"
+#  ]
+#}
+
+js_library("crostini_arc_adb.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_arc_adb.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_arc_adb_module" ]
+}
+
+js_library("crostini_arc_adb_confirmation_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_arc_adb_confirmation_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_arc_adb_confirmation_dialog_module" ]
+}
+
+js_library("crostini_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("crostini_disk_resize_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_disk_resize_dialog_module" ]
+}
+
+js_library("crostini_disk_resize_confirmation_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_confirmation_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_disk_resize_confirmation_dialog_module" ]
+}
+
+js_library("crostini_export_import.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_export_import.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_export_import_module" ]
+}
+
+js_library("crostini_import_confirmation_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_import_confirmation_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_import_confirmation_dialog_module" ]
+}
+
+js_library("crostini_mic_sharing_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_mic_sharing_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_mic_sharing_dialog_module" ]
+}
+
+js_library("crostini_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_page_module" ]
+}
+
+js_library("crostini_port_forwarding.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_port_forwarding.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_port_forwarding_module" ]
+}
+
+js_library("crostini_port_forwarding_add_port_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_port_forwarding_add_port_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_port_forwarding_add_port_dialog_module" ]
+}
+
+js_library("crostini_shared_paths.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_shared_paths.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_shared_paths_module" ]
+}
+
+js_library("crostini_shared_usb_devices.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_shared_usb_devices.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_shared_usb_devices_module" ]
+}
+
+js_library("crostini_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_subpage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":crostini_subpage_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":crostini_arc_adb_confirmation_dialog_module",
+    ":crostini_arc_adb_module",
+    ":crostini_disk_resize_dialog_module",
+    ":crostini_export_import_module",
+    ":crostini_import_confirmation_dialog_module",
+    ":crostini_mic_sharing_dialog_module",
+    ":crostini_page_module",
+    ":crostini_port_forwarding_add_port_dialog_module",
+    ":crostini_port_forwarding_module",
+    ":crostini_shared_paths_module",
+    ":crostini_shared_usb_devices_module",
+    ":crostini_subpage_module",
+    ":modulize",
+  ]
+}
+
+polymer_modulizer("crostini_arc_adb") {
+  js_file = "crostini_arc_adb.js"
+  html_file = "crostini_arc_adb.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_arc_adb_confirmation_dialog") {
+  js_file = "crostini_arc_adb_confirmation_dialog.js"
+  html_file = "crostini_arc_adb_confirmation_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_disk_resize_dialog") {
+  js_file = "crostini_disk_resize_dialog.js"
+  html_file = "crostini_disk_resize_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_disk_resize_confirmation_dialog") {
+  js_file = "crostini_disk_resize_confirmation_dialog.js"
+  html_file = "crostini_disk_resize_confirmation_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_export_import") {
+  js_file = "crostini_export_import.js"
+  html_file = "crostini_export_import.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_import_confirmation_dialog") {
+  js_file = "crostini_import_confirmation_dialog.js"
+  html_file = "crostini_import_confirmation_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_mic_sharing_dialog") {
+  js_file = "crostini_mic_sharing_dialog.js"
+  html_file = "crostini_mic_sharing_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_page") {
+  js_file = "crostini_page.js"
+  html_file = "crostini_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_port_forwarding") {
+  js_file = "crostini_port_forwarding.js"
+  html_file = "crostini_port_forwarding.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_port_forwarding_add_port_dialog") {
+  js_file = "crostini_port_forwarding_add_port_dialog.js"
+  html_file = "crostini_port_forwarding_add_port_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_shared_paths") {
+  js_file = "crostini_shared_paths.js"
+  html_file = "crostini_shared_paths.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_shared_usb_devices") {
+  js_file = "crostini_shared_usb_devices.js"
+  html_file = "crostini_shared_usb_devices.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("crostini_subpage") {
+  js_file = "crostini_subpage.js"
+  html_file = "crostini_subpage.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [ "crostini_browser_proxy.js" ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/date_time_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/date_time_page/BUILD.gn
index 7cbb19ab5e7..4d73c447751 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/date_time_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/date_time_page/BUILD.gn
@@ -51,3 +51,81 @@ js_library("timezone_subpage") {
     "//ui/webui/resources/js:cr",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":date_time_page.m",
+#    ":date_time_types.m",
+#    ":timezone_selector.m",
+#    ":timezone_subpage.m"
+#  ]
+#}
+
+js_library("date_time_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/date_time_page/date_time_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":date_time_page_module" ]
+}
+
+js_library("date_time_types.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/date_time_page/date_time_types.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":date_time_types_module" ]
+}
+
+js_library("timezone_selector.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/date_time_page/timezone_selector.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":timezone_selector_module" ]
+}
+
+js_library("timezone_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/date_time_page/timezone_subpage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":timezone_subpage_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":date_time_page_module",
+    ":date_time_types_module",
+    ":timezone_selector_module",
+    ":timezone_subpage_module",
+  ]
+}
+
+polymer_modulizer("date_time_page") {
+  js_file = "date_time_page.js"
+  html_file = "date_time_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("date_time_types") {
+  js_file = "date_time_types.js"
+  html_file = "date_time_types.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("timezone_selector") {
+  js_file = "timezone_selector.js"
+  html_file = "timezone_selector.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("timezone_subpage") {
+  js_file = "timezone_subpage.js"
+  html_file = "timezone_subpage.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
index 94869ce7620..a9273bb0410 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
@@ -11,6 +11,7 @@ js_type_check("closure_compile") {
     ":display",
     ":display_layout",
     ":display_overscan_dialog",
+    ":dlc_subpage",
     ":drag_behavior",
     ":keyboard",
     ":layout_behavior",
@@ -72,6 +73,7 @@ js_library("stylus") {
 js_library("display") {
   deps = [
     ":display_layout",
+    "../..:router",
     "../../controls:settings_dropdown_menu",
     "../../controls:settings_slider",
     "../../prefs:prefs_behavior",
@@ -107,6 +109,10 @@ js_library("display_overscan_dialog") {
   extra_sources = [ "$interfaces_path/system_display_interface.js" ]
 }
 
+js_library("dlc_subpage") {
+  deps = [ ":device_page_browser_proxy" ]
+}
+
 js_library("drag_behavior") {
   deps = [ "//ui/webui/resources/js:cr" ]
 }
@@ -149,3 +155,263 @@ js_library("storage") {
     "//ui/webui/resources/js/cr/ui:focus_without_ink",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":device_page.m",
+#    ":device_page_browser_proxy.m",
+#    ":display.m",
+#    ":display_layout.m",
+#    ":display_overscan_dialog.m",
+#    ":dlc_subpage.m",
+#    ":drag_behavior.m",
+#    ":keyboard.m",
+#    ":layout_behavior.m",
+#    ":night_light_slider.m",
+#    ":pointers.m",
+#    ":power.m",
+#    ":storage.m",
+#    ":storage_external.m",
+#    ":storage_external_entry.m",
+#    ":stylus.m"
+#  ]
+#}
+
+js_library("device_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/device_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":device_page_module" ]
+}
+
+js_library("device_page_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/device_page_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("display.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/display.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":display_module" ]
+}
+
+js_library("display_layout.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/display_layout.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":display_layout_module" ]
+}
+
+js_library("display_overscan_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/display_overscan_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":display_overscan_dialog_module" ]
+}
+
+js_library("dlc_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/dlc_subpage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":dlc_subpage_module" ]
+}
+
+js_library("drag_behavior.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/drag_behavior.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("keyboard.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/keyboard.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":keyboard_module" ]
+}
+
+js_library("layout_behavior.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/layout_behavior.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("night_light_slider.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/night_light_slider.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":night_light_slider_module" ]
+}
+
+js_library("pointers.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/pointers.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":pointers_module" ]
+}
+
+js_library("power.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/power.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":power_module" ]
+}
+
+js_library("storage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/storage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":storage_module" ]
+}
+
+js_library("storage_external.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/storage_external.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":storage_external_module" ]
+}
+
+js_library("storage_external_entry.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/storage_external_entry.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":storage_external_entry_module" ]
+}
+
+js_library("stylus.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/device_page/stylus.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":stylus_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":device_page_module",
+    ":display_layout_module",
+    ":display_module",
+    ":display_overscan_dialog_module",
+    ":dlc_subpage_module",
+    ":keyboard_module",
+    ":modulize",
+    ":night_light_slider_module",
+    ":pointers_module",
+    ":power_module",
+    ":storage_external_entry_module",
+    ":storage_external_module",
+    ":storage_module",
+    ":stylus_module",
+  ]
+}
+
+polymer_modulizer("device_page") {
+  js_file = "device_page.js"
+  html_file = "device_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("display") {
+  js_file = "display.js"
+  html_file = "display.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("display_layout") {
+  js_file = "display_layout.js"
+  html_file = "display_layout.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("display_overscan_dialog") {
+  js_file = "display_overscan_dialog.js"
+  html_file = "display_overscan_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("dlc_subpage") {
+  js_file = "dlc_subpage.js"
+  html_file = "dlc_subpage.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("keyboard") {
+  js_file = "keyboard.js"
+  html_file = "keyboard.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("night_light_slider") {
+  js_file = "night_light_slider.js"
+  html_file = "night_light_slider.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("pointers") {
+  js_file = "pointers.js"
+  html_file = "pointers.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("power") {
+  js_file = "power.js"
+  html_file = "power.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("storage") {
+  js_file = "storage.js"
+  html_file = "storage.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("storage_external") {
+  js_file = "storage_external.js"
+  html_file = "storage_external.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("storage_external_entry") {
+  js_file = "storage_external_entry.js"
+  html_file = "storage_external_entry.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("stylus") {
+  js_file = "stylus.js"
+  html_file = "stylus.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [
+    "device_page_browser_proxy.js",
+    "drag_behavior.js",
+    "layout_behavior.js",
+  ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/google_assistant_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/google_assistant_page/BUILD.gn
index 0c330bb0e5e..e6ec1bbc610 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/google_assistant_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/google_assistant_page/BUILD.gn
@@ -27,3 +27,49 @@ js_library("google_assistant_page") {
     "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":google_assistant_browser_proxy.m",
+#    ":google_assistant_page.m"
+#  ]
+#}
+
+js_library("google_assistant_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/google_assistant_page/google_assistant_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("google_assistant_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/google_assistant_page/google_assistant_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":google_assistant_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":google_assistant_page_module",
+    ":modulize",
+  ]
+}
+
+polymer_modulizer("google_assistant_page") {
+  js_file = "google_assistant_page.js"
+  html_file = "google_assistant_page.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [ "google_assistant_browser_proxy.js" ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
index e5182752260..c09ff76361b 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
@@ -26,7 +26,9 @@ js_library("internet_page") {
     "..:metrics_recorder",
     "..:os_route",
     "../..:router",
+    "../../people_page:sync_browser_proxy",
     "../../settings_page:settings_animated_pages",
+    "../os_people_page:os_sync_browser_proxy",
     "//chromeos/services/network_config/public/mojom:mojom_js_library_for_compile",
     "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
@@ -151,3 +153,193 @@ js_library("tether_connection_dialog") {
     "//ui/webui/resources/js:i18n_behavior",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":internet_config.m",
+#    ":internet_detail_page.m",
+#    ":internet_known_networks_page.m",
+#    ":internet_page.m",
+#    ":internet_page_browser_proxy.m",
+#    ":internet_shared_css.m",
+#    ":internet_subpage.m",
+#    ":network_proxy_section.m",
+#    ":network_summary.m",
+#    ":network_summary_item.m",
+#    ":tether_connection_dialog.m"
+#  ]
+#}
+
+js_library("internet_config.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_config.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":internet_config_module" ]
+}
+
+js_library("internet_detail_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":internet_detail_page_module" ]
+}
+
+js_library("internet_known_networks_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":internet_known_networks_page_module" ]
+}
+
+js_library("internet_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":internet_page_module" ]
+}
+
+js_library("internet_page_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("internet_shared_css.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_shared_css.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":internet_shared_css_module" ]
+}
+
+js_library("internet_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":internet_subpage_module" ]
+}
+
+js_library("network_proxy_section.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":network_proxy_section_module" ]
+}
+
+js_library("network_summary.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/network_summary.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":network_summary_module" ]
+}
+
+js_library("network_summary_item.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/network_summary_item.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":network_summary_item_module" ]
+}
+
+js_library("tether_connection_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/tether_connection_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":tether_connection_dialog_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":internet_config_module",
+    ":internet_detail_page_module",
+    ":internet_known_networks_page_module",
+    ":internet_page_module",
+    ":internet_shared_css_module",
+    ":internet_subpage_module",
+    ":modulize",
+    ":network_proxy_section_module",
+    ":network_summary_item_module",
+    ":network_summary_module",
+    ":tether_connection_dialog_module",
+  ]
+}
+
+polymer_modulizer("internet_config") {
+  js_file = "internet_config.js"
+  html_file = "internet_config.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("internet_detail_page") {
+  js_file = "internet_detail_page.js"
+  html_file = "internet_detail_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("internet_known_networks_page") {
+  js_file = "internet_known_networks_page.js"
+  html_file = "internet_known_networks_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("internet_page") {
+  js_file = "internet_page.js"
+  html_file = "internet_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("internet_shared_css") {
+  js_file = "internet_shared_css.m.js"
+  html_file = "internet_shared_css.html"
+  html_type = "style-module"
+}
+
+polymer_modulizer("internet_subpage") {
+  js_file = "internet_subpage.js"
+  html_file = "internet_subpage.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("network_proxy_section") {
+  js_file = "network_proxy_section.js"
+  html_file = "network_proxy_section.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("network_summary") {
+  js_file = "network_summary.js"
+  html_file = "network_summary.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("network_summary_item") {
+  js_file = "network_summary_item.js"
+  html_file = "network_summary_item.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("tether_connection_dialog") {
+  js_file = "tether_connection_dialog.js"
+  html_file = "tether_connection_dialog.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [ "internet_page_browser_proxy.js" ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/localized_link/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/localized_link/BUILD.gn
index c480094420a..7bd578dc434 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/localized_link/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/localized_link/BUILD.gn
@@ -11,3 +11,31 @@ js_type_check("closure_compile") {
 js_library("localized_link") {
   deps = [ "//ui/webui/resources/js:assert" ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":localized_link.m"
+#  ]
+#}
+
+js_library("localized_link.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/localized_link/localized_link.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":localized_link_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [ ":localized_link_module" ]
+}
+
+polymer_modulizer("localized_link") {
+  js_file = "localized_link.js"
+  html_file = "localized_link.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
index 9906b2220f9..238c338b802 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
@@ -67,6 +67,7 @@ js_library("multidevice_page") {
     "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
+  externs_list = [ "$externs_path/pending_polymer.js" ]
 }
 
 js_library("multidevice_radio_button") {
@@ -95,7 +96,6 @@ js_library("multidevice_subpage") {
     ":multidevice_constants",
     "..:os_route",
     "..:os_settings_routes",
-    "../..:settings_routes",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
   ]
   externs_list = [ "$externs_path/networking_private.js" ]
@@ -113,3 +113,173 @@ js_library("multidevice_tether_item") {
   externs_list = [ "$externs_path/networking_private.js" ]
   extra_sources = [ "$interfaces_path/networking_private_interface.js" ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":multidevice_browser_proxy.m",
+#    ":multidevice_constants.m",
+#    ":multidevice_feature_behavior.m",
+#    ":multidevice_feature_item.m",
+#    ":multidevice_feature_toggle.m",
+#    ":multidevice_page.m",
+#    ":multidevice_radio_button.m",
+#    ":multidevice_smartlock_subpage.m",
+#    ":multidevice_subpage.m",
+#    ":multidevice_tether_item.m"
+#  ]
+#}
+
+js_library("multidevice_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("multidevice_constants.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_constants.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":multidevice_constants_module" ]
+}
+
+js_library("multidevice_feature_behavior.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_behavior.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("multidevice_feature_item.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_item.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":multidevice_feature_item_module" ]
+}
+
+js_library("multidevice_feature_toggle.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_toggle.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":multidevice_feature_toggle_module" ]
+}
+
+js_library("multidevice_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":multidevice_page_module" ]
+}
+
+js_library("multidevice_radio_button.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":multidevice_radio_button_module" ]
+}
+
+js_library("multidevice_smartlock_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock_subpage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":multidevice_smartlock_subpage_module" ]
+}
+
+js_library("multidevice_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_subpage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":multidevice_subpage_module" ]
+}
+
+js_library("multidevice_tether_item.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_tether_item.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":multidevice_tether_item_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":modulize",
+    ":multidevice_constants_module",
+    ":multidevice_feature_item_module",
+    ":multidevice_feature_toggle_module",
+    ":multidevice_page_module",
+    ":multidevice_radio_button_module",
+    ":multidevice_smartlock_subpage_module",
+    ":multidevice_subpage_module",
+    ":multidevice_tether_item_module",
+  ]
+}
+
+polymer_modulizer("multidevice_constants") {
+  js_file = "multidevice_constants.js"
+  html_file = "multidevice_constants.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("multidevice_feature_item") {
+  js_file = "multidevice_feature_item.js"
+  html_file = "multidevice_feature_item.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("multidevice_feature_toggle") {
+  js_file = "multidevice_feature_toggle.js"
+  html_file = "multidevice_feature_toggle.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("multidevice_page") {
+  js_file = "multidevice_page.js"
+  html_file = "multidevice_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("multidevice_radio_button") {
+  js_file = "multidevice_radio_button.js"
+  html_file = "multidevice_radio_button.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("multidevice_smartlock_subpage") {
+  js_file = "multidevice_smartlock_subpage.js"
+  html_file = "multidevice_smartlock_subpage.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("multidevice_subpage") {
+  js_file = "multidevice_subpage.js"
+  html_file = "multidevice_subpage.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("multidevice_tether_item") {
+  js_file = "multidevice_tether_item.js"
+  html_file = "multidevice_tether_item.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [
+    "multidevice_browser_proxy.js",
+    "multidevice_feature_behavior.js",
+  ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_a11y_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_a11y_page/BUILD.gn
index c34b0f10c6e..e9d2407632d 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_a11y_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_a11y_page/BUILD.gn
@@ -64,3 +64,97 @@ js_library("tts_subpage") {
 
 js_library("externs") {
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":externs.m",
+#    ":manage_a11y_page.m",
+#    ":os_a11y_page.m",
+#    ":switch_access_subpage.m",
+#    ":tts_subpage.m"
+#  ]
+#}
+
+js_library("externs.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/externs.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("manage_a11y_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":manage_a11y_page_module" ]
+}
+
+js_library("os_a11y_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_a11y_page_module" ]
+}
+
+js_library("switch_access_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":switch_access_subpage_module" ]
+}
+
+js_library("tts_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":tts_subpage_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":manage_a11y_page_module",
+    ":modulize",
+    ":os_a11y_page_module",
+    ":switch_access_subpage_module",
+    ":tts_subpage_module",
+  ]
+}
+
+polymer_modulizer("manage_a11y_page") {
+  js_file = "manage_a11y_page.js"
+  html_file = "manage_a11y_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_a11y_page") {
+  js_file = "os_a11y_page.js"
+  html_file = "os_a11y_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("switch_access_subpage") {
+  js_file = "switch_access_subpage.js"
+  html_file = "switch_access_subpage.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("tts_subpage") {
+  js_file = "tts_subpage.js"
+  html_file = "tts_subpage.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [ "externs.js" ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_about_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_about_page/BUILD.gn
index c49063b1f47..e34ecfe812a 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_about_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_about_page/BUILD.gn
@@ -46,3 +46,81 @@ js_library("channel_switcher_dialog") {
     "//ui/webui/resources/js:load_time_data",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":channel_switcher_dialog.m",
+#    ":detailed_build_info.m",
+#    ":os_about_page.m",
+#    ":update_warning_dialog.m"
+#  ]
+#}
+
+js_library("channel_switcher_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":channel_switcher_dialog_module" ]
+}
+
+js_library("detailed_build_info.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":detailed_build_info_module" ]
+}
+
+js_library("os_about_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_about_page_module" ]
+}
+
+js_library("update_warning_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_about_page/update_warning_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":update_warning_dialog_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":channel_switcher_dialog_module",
+    ":detailed_build_info_module",
+    ":os_about_page_module",
+    ":update_warning_dialog_module",
+  ]
+}
+
+polymer_modulizer("channel_switcher_dialog") {
+  js_file = "channel_switcher_dialog.js"
+  html_file = "channel_switcher_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("detailed_build_info") {
+  js_file = "detailed_build_info.js"
+  html_file = "detailed_build_info.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_about_page") {
+  js_file = "os_about_page.js"
+  html_file = "os_about_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("update_warning_dialog") {
+  js_file = "update_warning_dialog.js"
+  html_file = "update_warning_dialog.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/BUILD.gn
index 0a79aec884e..f635bdada2b 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/BUILD.gn
@@ -44,3 +44,65 @@ js_library("os_apps_page") {
 
   externs_list = [ "$externs_path/metrics_private.js" ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":android_apps_browser_proxy.m",
+#    ":android_apps_subpage.m",
+#    ":os_apps_page.m"
+#  ]
+#}
+
+js_library("android_apps_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("android_apps_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_subpage.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":android_apps_subpage_module" ]
+}
+
+js_library("os_apps_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_apps_page/os_apps_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_apps_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":android_apps_subpage_module",
+    ":modulize",
+    ":os_apps_page_module",
+  ]
+}
+
+polymer_modulizer("android_apps_subpage") {
+  js_file = "android_apps_subpage.js"
+  html_file = "android_apps_subpage.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_apps_page") {
+  js_file = "os_apps_page.js"
+  html_file = "os_apps_page.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [ "android_apps_browser_proxy.js" ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/BUILD.gn
index 8c4309e620a..7de06d704df 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/BUILD.gn
@@ -67,10 +67,8 @@ js_library("app_management_page") {
 
 js_library("app_detail_view") {
   deps = [
-    ":arc_detail_view",
-    ":chrome_app_detail_view",
+    ":actions",
     ":dom_switch",
-    ":pwa_detail_view",
     ":store_client",
     "../..:os_route",
     "../../..:router",
@@ -104,6 +102,7 @@ js_library("chrome_app_detail_view") {
 }
 
 js_library("constants") {
+  deps = [ "//chrome/browser/ui/webui/app_management:mojo_bindings_js_library_for_compile" ]
 }
 
 js_library("dom_switch") {
@@ -131,6 +130,7 @@ js_library("main_view") {
 
 js_library("permission_item") {
   deps = [
+    ":browser_proxy",
     ":fake_page_handler",
     ":store_client",
     ":toggle_row",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/BUILD.gn
new file mode 100644
index 00000000000..3c63e8b8004
--- /dev/null
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/BUILD.gn
@@ -0,0 +1,94 @@
+# Copyright 2020 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("//third_party/closure_compiler/compile_js.gni")
+
+js_type_check("closure_compile") {
+  deps = [
+    ":plugin_vm_browser_proxy",
+    ":plugin_vm_detail_view",
+    ":plugin_vm_shared_paths",
+  ]
+}
+
+js_library("plugin_vm_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr" ]
+}
+
+js_library("plugin_vm_detail_view") {
+  deps = [
+    "../:constants",
+    "../:store_client",
+    "../:util",
+  ]
+}
+
+js_library("plugin_vm_shared_paths") {
+  deps = [
+    ":plugin_vm_browser_proxy",
+    "../../..:metrics_recorder",
+  ]
+}
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":plugin_vm_browser_proxy.m",
+#    ":plugin_vm_detail_view.m",
+#    ":plugin_vm_shared_paths.m",
+#  ]
+#}
+
+js_library("plugin_vm_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("plugin_vm_detail_view.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_detail_view.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":plugin_vm_detail_view_module" ]
+}
+
+js_library("plugin_vm_shared_paths.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_shared_paths.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":plugin_vm_shared_paths_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":modulize",
+    ":plugin_vm_detail_view_module",
+    ":plugin_vm_shared_paths_module",
+  ]
+}
+
+polymer_modulizer("plugin_vm_detail_view") {
+  js_file = "plugin_vm_detail_view.js"
+  html_file = "plugin_vm_detail_view.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("plugin_vm_shared_paths") {
+  js_file = "plugin_vm_shared_paths.js"
+  html_file = "plugin_vm_shared_paths.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [ "plugin_vm_browser_proxy.js" ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_files_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_files_page/BUILD.gn
index f5dbaca98bd..bec2d536c33 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_files_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_files_page/BUILD.gn
@@ -26,3 +26,49 @@ js_library("os_files_page") {
     "../..:router",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":os_files_page.m",
+#    ":smb_shares_page.m"
+#  ]
+#}
+
+js_library("os_files_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_files_page_module" ]
+}
+
+js_library("smb_shares_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_files_page/smb_shares_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":smb_shares_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":os_files_page_module",
+    ":smb_shares_page_module",
+  ]
+}
+
+polymer_modulizer("os_files_page") {
+  js_file = "os_files_page.js"
+  html_file = "os_files_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("smb_shares_page") {
+  js_file = "smb_shares_page.js"
+  html_file = "smb_shares_page.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_languages_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_languages_page/BUILD.gn
index 2fc4836f26f..1af53f2340e 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_languages_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_languages_page/BUILD.gn
@@ -68,3 +68,81 @@ js_library("os_add_languages_dialog") {
     "//ui/webui/resources/js:find_shortcut_behavior",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":manage_input_methods_page.m",
+#    ":os_add_languages_dialog.m",
+#    ":os_languages_page.m",
+#    ":os_languages_section.m"
+#  ]
+#}
+
+js_library("manage_input_methods_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/manage_input_methods_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":manage_input_methods_page_module" ]
+}
+
+js_library("os_add_languages_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/os_add_languages_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_add_languages_dialog_module" ]
+}
+
+js_library("os_languages_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_languages_page_module" ]
+}
+
+js_library("os_languages_section.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_languages_section_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":manage_input_methods_page_module",
+    ":os_add_languages_dialog_module",
+    ":os_languages_page_module",
+    ":os_languages_section_module",
+  ]
+}
+
+polymer_modulizer("manage_input_methods_page") {
+  js_file = "manage_input_methods_page.js"
+  html_file = "manage_input_methods_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_add_languages_dialog") {
+  js_file = "os_add_languages_dialog.js"
+  html_file = "os_add_languages_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_languages_page") {
+  js_file = "os_languages_page.js"
+  html_file = "os_languages_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_languages_section") {
+  js_file = "os_languages_section.js"
+  html_file = "os_languages_section.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_people_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_people_page/BUILD.gn
index 2b0c1a7178d..23cc34fa5db 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_people_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_people_page/BUILD.gn
@@ -171,8 +171,8 @@ js_library("setup_fingerprint_dialog") {
   deps = [
     ":fingerprint_browser_proxy",
     "..:metrics_recorder",
-    "//ui/webui/resources/cr_elements/chromeos/cr_lottie:cr_lottie",
     "//ui/webui/resources/cr_elements/cr_fingerprint:cr_fingerprint_progress_arc",
+    "//ui/webui/resources/cr_elements/cr_lottie:cr_lottie",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
@@ -213,3 +213,273 @@ js_library("users_page") {
     "//ui/webui/resources/js/cr/ui:focus_without_ink",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":account_manager.m",
+#    ":fingerprint_browser_proxy.m",
+#    ":fingerprint_list.m",
+#    ":kerberos_accounts.m",
+#    ":kerberos_accounts_browser_proxy.m",
+#    ":kerberos_add_account_dialog.m",
+#    ":lock_screen.m",
+#    ":lock_screen_password_prompt_dialog.m",
+#    ":lock_state_behavior.m",
+#    ":os_people_page.m",
+#    ":os_sync_browser_proxy.m",
+#    ":os_sync_controls.m",
+#    ":setup_fingerprint_dialog.m",
+#    ":setup_pin_dialog.m",
+#    ":user_list.m",
+#    ":users_add_user_dialog.m",
+#    ":users_page.m"
+#  ]
+#}
+
+js_library("account_manager.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":account_manager_module" ]
+}
+
+js_library("fingerprint_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/fingerprint_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("fingerprint_list.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/fingerprint_list.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":fingerprint_list_module" ]
+}
+
+js_library("kerberos_accounts.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/kerberos_accounts.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":kerberos_accounts_module" ]
+}
+
+js_library("kerberos_accounts_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/kerberos_accounts_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("kerberos_add_account_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/kerberos_add_account_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":kerberos_add_account_dialog_module" ]
+}
+
+js_library("lock_screen.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/lock_screen.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":lock_screen_module" ]
+}
+
+js_library("lock_screen_password_prompt_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/lock_screen_password_prompt_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":lock_screen_password_prompt_dialog_module" ]
+}
+
+js_library("lock_state_behavior.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/lock_state_behavior.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("os_people_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_people_page_module" ]
+}
+
+js_library("os_sync_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/os_sync_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("os_sync_controls.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/os_sync_controls.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_sync_controls_module" ]
+}
+
+js_library("setup_fingerprint_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/setup_fingerprint_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":setup_fingerprint_dialog_module" ]
+}
+
+js_library("setup_pin_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/setup_pin_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":setup_pin_dialog_module" ]
+}
+
+js_library("user_list.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/user_list.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":user_list_module" ]
+}
+
+js_library("users_add_user_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/users_add_user_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":users_add_user_dialog_module" ]
+}
+
+js_library("users_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/users_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":users_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":account_manager_module",
+    ":fingerprint_list_module",
+    ":kerberos_accounts_module",
+    ":kerberos_add_account_dialog_module",
+    ":lock_screen_module",
+    ":lock_screen_password_prompt_dialog_module",
+    ":modulize",
+    ":os_people_page_module",
+    ":os_sync_controls_module",
+    ":setup_fingerprint_dialog_module",
+    ":setup_pin_dialog_module",
+    ":user_list_module",
+    ":users_add_user_dialog_module",
+    ":users_page_module",
+  ]
+}
+
+polymer_modulizer("account_manager") {
+  js_file = "account_manager.js"
+  html_file = "account_manager.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("fingerprint_list") {
+  js_file = "fingerprint_list.js"
+  html_file = "fingerprint_list.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("kerberos_accounts") {
+  js_file = "kerberos_accounts.js"
+  html_file = "kerberos_accounts.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("kerberos_add_account_dialog") {
+  js_file = "kerberos_add_account_dialog.js"
+  html_file = "kerberos_add_account_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("lock_screen") {
+  js_file = "lock_screen.js"
+  html_file = "lock_screen.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("lock_screen_password_prompt_dialog") {
+  js_file = "lock_screen_password_prompt_dialog.js"
+  html_file = "lock_screen_password_prompt_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_people_page") {
+  js_file = "os_people_page.js"
+  html_file = "os_people_page.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_sync_controls") {
+  js_file = "os_sync_controls.js"
+  html_file = "os_sync_controls.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("setup_fingerprint_dialog") {
+  js_file = "setup_fingerprint_dialog.js"
+  html_file = "setup_fingerprint_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("setup_pin_dialog") {
+  js_file = "setup_pin_dialog.js"
+  html_file = "setup_pin_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("user_list") {
+  js_file = "user_list.js"
+  html_file = "user_list.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("users_add_user_dialog") {
+  js_file = "users_add_user_dialog.js"
+  html_file = "users_add_user_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("users_page") {
+  js_file = "users_page.js"
+  html_file = "users_page.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [
+    "fingerprint_browser_proxy.js",
+    "kerberos_accounts_browser_proxy.js",
+    "lock_state_behavior.js",
+    "os_sync_browser_proxy.js",
+  ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_printing_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_printing_page/BUILD.gn
index 04f4ad8d05e..5a9af5bd713 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_printing_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_printing_page/BUILD.gn
@@ -6,17 +6,43 @@ import("//third_party/closure_compiler/compile_js.gni")
 
 js_type_check("closure_compile") {
   deps = [
+    ":cups_add_print_server_dialog",
     ":cups_add_printer_dialog",
-    ":cups_add_printer_dialog_elements",
+    ":cups_add_printer_manually_dialog",
+    ":cups_add_printer_manufacturer_model_dialog",
     ":cups_edit_printer_dialog",
+    ":cups_printer_dialog_error",
     ":cups_printer_dialog_util",
     ":cups_printers",
     ":cups_printers_browser_proxy",
+    ":cups_settings_add_printer_dialog",
     ":os_printing_page",
   ]
 }
 
-js_library("cups_add_printer_dialog") {
+js_library("cups_settings_add_printer_dialog") {
+  deps = [
+    ":cups_add_print_server_dialog",
+    ":cups_add_printer_dialog",
+    ":cups_add_printer_manually_dialog",
+    ":cups_add_printer_manufacturer_model_dialog",
+    ":cups_printers_browser_proxy",
+    "../localized_link:localized_link",
+    "//ui/webui/resources/js:load_time_data",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
+  ]
+}
+
+js_library("cups_add_print_server_dialog") {
+  deps = [
+    ":cups_printers_browser_proxy",
+    "../localized_link:localized_link",
+    "//ui/webui/resources/js:load_time_data",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
+  ]
+}
+
+js_library("cups_add_printer_manufacturer_model_dialog") {
   deps = [
     ":cups_printers_browser_proxy",
     "../localized_link:localized_link",
@@ -25,7 +51,20 @@ js_library("cups_add_printer_dialog") {
   ]
 }
 
-js_library("cups_add_printer_dialog_elements") {
+js_library("cups_add_printer_manually_dialog") {
+  deps = [
+    ":cups_printers_browser_proxy",
+    "../localized_link:localized_link",
+    "//ui/webui/resources/js:load_time_data",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
+  ]
+}
+
+js_library("cups_add_printer_dialog") {
+  deps = [ ":cups_printers_browser_proxy" ]
+}
+
+js_library("cups_printer_dialog_error") {
   deps = [ ":cups_printers_browser_proxy" ]
 }
 
@@ -130,3 +169,301 @@ js_library("os_printing_page") {
     "//ui/webui/resources/js:load_time_data",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":cups_settings_add_printer_dialog.m",
+#    ":cups_add_print_server_dialog.m",
+#    ":cups_add_printer_manually_dialog.m",
+#    ":cups_add_printer_dialog.m",
+#    ":cups_add_printer_manufacturer_model_dialog",
+#    ":cups_printer_dialog_error.m"
+#    ":cups_edit_printer_dialog.m",
+#    ":cups_nearby_printers.m",
+#    ":cups_printer_dialog_util.m",
+#    ":cups_printer_shared_css.m",
+#    ":cups_printer_types.m",
+#    ":cups_printers.m",
+#    ":cups_printers_browser_proxy.m",
+#    ":cups_printers_entry.m",
+#    ":cups_printers_entry_list_behavior.m",
+#    ":cups_printers_entry_manager.m",
+#    ":cups_saved_printers.m",
+#    ":os_printing_page.m"
+#  ]
+#}
+
+js_library("cups_settings_add_printer_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_settings_add_printer_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_settings_add_printer_dialog_module" ]
+}
+
+js_library("cups_add_print_server_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_print_server_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_add_print_server_dialog_module" ]
+}
+
+js_library("cups_add_printer_manufacturer_model_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_add_printer_manufacturer_model_dialog_module" ]
+}
+
+js_library("cups_add_printer_manually_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_manually_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_add_printer_manually_dialog_module" ]
+}
+
+js_library("cups_add_printer_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_add_printer_dialog_module" ]
+}
+
+js_library("cups_printer_dialog_error.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_dialog_error.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_printer_dialog_error_module" ]
+}
+
+js_library("cups_edit_printer_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_edit_printer_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_edit_printer_dialog_module" ]
+}
+
+js_library("cups_nearby_printers.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_nearby_printers.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_nearby_printers_module" ]
+}
+
+js_library("cups_printer_dialog_util.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_dialog_util.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_printer_dialog_util_module" ]
+}
+
+js_library("cups_printer_shared_css.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_shared_css.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_printer_shared_css_module" ]
+}
+
+js_library("cups_printer_types.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_types.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_printer_types_module" ]
+}
+
+js_library("cups_printers.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_printers_module" ]
+}
+
+js_library("cups_printers_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cups_printers_entry.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_printers_entry_module" ]
+}
+
+js_library("cups_printers_entry_list_behavior.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry_list_behavior.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cups_printers_entry_manager.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry_manager.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_printers_entry_manager_module" ]
+}
+
+js_library("cups_saved_printers.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_saved_printers.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":cups_saved_printers_module" ]
+}
+
+js_library("os_printing_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/os_printing_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_printing_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":cups_add_print_server_dialog",
+    ":cups_add_printer_dialog",
+    ":cups_add_printer_dialog_module",
+    ":cups_add_printer_manually_dialog",
+    ":cups_add_printer_manufacturer_model_dialog",
+    ":cups_edit_printer_dialog_module",
+    ":cups_nearby_printers_module",
+    ":cups_printer_dialog_error_module",
+    ":cups_printer_dialog_util_module",
+    ":cups_printer_shared_css_module",
+    ":cups_printer_types_module",
+    ":cups_printers_entry_manager_module",
+    ":cups_printers_entry_module",
+    ":cups_printers_module",
+    ":cups_saved_printers_module",
+    ":modulize",
+    ":os_printing_page_module",
+  ]
+}
+
+polymer_modulizer("cups_settings_add_printer_dialog") {
+  js_file = "cups_settings_add_printer_dialog.js"
+  html_file = "cups_settings_add_printer_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_add_print_server_dialog") {
+  js_file = "cups_add_print_server_dialog.js"
+  html_file = "cups_add_print_server_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_add_printer_manufacturer_model_dialog") {
+  js_file = "cups_add_printer_manufacturer_model_dialog.js"
+  html_file = "cups_add_printer_manufacturer_model_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_add_printer_manually_dialog") {
+  js_file = "cups_add_printer_manually_dialog.js"
+  html_file = "cups_add_printer_manually_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_add_printer_dialog") {
+  js_file = "cups_add_printer_dialog.js"
+  html_file = "cups_add_printer_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_printer_dialog_error") {
+  js_file = "cups_printer_dialog_error.js"
+  html_file = "cups_printer_dialog_error.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_edit_printer_dialog") {
+  js_file = "cups_edit_printer_dialog.js"
+  html_file = "cups_edit_printer_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_nearby_printers") {
+  js_file = "cups_nearby_printers.js"
+  html_file = "cups_nearby_printers.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_printer_dialog_util") {
+  js_file = "cups_printer_dialog_util.js"
+  html_file = "cups_printer_dialog_util.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_printer_shared_css") {
+  js_file = "cups_printer_shared_css.m.js"
+  html_file = "cups_printer_shared_css.html"
+  html_type = "style-module"
+}
+
+polymer_modulizer("cups_printer_types") {
+  js_file = "cups_printer_types.js"
+  html_file = "cups_printer_types.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_printers") {
+  js_file = "cups_printers.js"
+  html_file = "cups_printers.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_printers_entry") {
+  js_file = "cups_printers_entry.js"
+  html_file = "cups_printers_entry.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_printers_entry_manager") {
+  js_file = "cups_printers_entry_manager.js"
+  html_file = "cups_printers_entry_manager.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("cups_saved_printers") {
+  js_file = "cups_saved_printers.js"
+  html_file = "cups_saved_printers.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_printing_page") {
+  js_file = "os_printing_page.js"
+  html_file = "os_printing_page.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [
+    "cups_printers_browser_proxy.js",
+    "cups_printers_entry_list_behavior.js",
+  ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_privacy_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_privacy_page/BUILD.gn
index 84cb81f6e22..f89ff3750c3 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_privacy_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_privacy_page/BUILD.gn
@@ -12,3 +12,31 @@ js_library("os_privacy_page") {
   deps =
       [ "//chrome/browser/resources/settings/controls:settings_toggle_button" ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":os_privacy_page.m"
+#  ]
+#}
+
+js_library("os_privacy_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_privacy_page/os_privacy_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_privacy_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [ ":os_privacy_page_module" ]
+}
+
+polymer_modulizer("os_privacy_page") {
+  js_file = "os_privacy_page.js"
+  html_file = "os_privacy_page.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_reset_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_reset_page/BUILD.gn
index b9af9f2bccf..cf97405216f 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_reset_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_reset_page/BUILD.gn
@@ -33,3 +33,65 @@ js_library("os_reset_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr" ]
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":os_powerwash_dialog.m",
+#    ":os_reset_browser_proxy.m",
+#    ":os_reset_page.m"
+#  ]
+#}
+
+js_library("os_powerwash_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_reset_page/os_powerwash_dialog.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_powerwash_dialog_module" ]
+}
+
+js_library("os_reset_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("os_reset_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_reset_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":modulize",
+    ":os_powerwash_dialog_module",
+    ":os_reset_page_module",
+  ]
+}
+
+polymer_modulizer("os_powerwash_dialog") {
+  js_file = "os_powerwash_dialog.js"
+  html_file = "os_powerwash_dialog.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_reset_page") {
+  js_file = "os_reset_page.js"
+  html_file = "os_reset_page.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [ "os_reset_browser_proxy.js" ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_search_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_search_page/BUILD.gn
index 03206cb5851..c48a50c3619 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_search_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_search_page/BUILD.gn
@@ -19,3 +19,31 @@ js_library("os_search_page") {
     "//ui/webui/resources/js:i18n_behavior",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":os_search_page.m"
+#  ]
+#}
+
+js_library("os_search_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_search_page/os_search_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_search_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [ ":os_search_page_module" ]
+}
+
+polymer_modulizer("os_search_page") {
+  js_file = "os_search_page.js"
+  html_file = "os_search_page.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings_main/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_settings_main/BUILD.gn
index de7de58cf2a..8d7c32450f0 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings_main/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings_main/BUILD.gn
@@ -20,3 +20,34 @@ js_library("os_settings_main") {
     "//ui/webui/resources/js:load_time_data",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":os_settings_main.m"
+#  ]
+#}
+
+js_library("os_settings_main.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_main/os_settings_main.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_settings_main_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    # TODO: Fix and re-enable
+    #":os_settings_main_module"
+  ]
+}
+
+polymer_modulizer("os_settings_main") {
+  js_file = "os_settings_main.js"
+  html_file = "os_settings_main.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings_menu/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_settings_menu/BUILD.gn
index f440c89ec61..1521e8cee6d 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings_menu/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings_menu/BUILD.gn
@@ -16,3 +16,31 @@ js_library("os_settings_menu") {
     "//ui/webui/resources/js:load_time_data",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":os_settings_menu.m"
+#  ]
+#}
+
+js_library("os_settings_menu.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_menu/os_settings_menu.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_settings_menu_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [ ":os_settings_menu_module" ]
+}
+
+polymer_modulizer("os_settings_menu") {
+  js_file = "os_settings_menu.js"
+  html_file = "os_settings_menu.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_settings_page/BUILD.gn
index 3588ee98f95..f9e55626477 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings_page/BUILD.gn
@@ -22,3 +22,31 @@ js_library("os_settings_page") {
   ]
   externs_list = [ "$externs_path/pending.js" ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":os_settings_page.m"
+#  ]
+#}
+
+js_library("os_settings_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_settings_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [ ":os_settings_page_module" ]
+}
+
+polymer_modulizer("os_settings_page") {
+  js_file = "os_settings_page.js"
+  html_file = "os_settings_page.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp b/chromium/chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp
new file mode 100644
index 00000000000..db555e9d3a1
--- /dev/null
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+ <include name="IDR_OS_SETTINGS_SEARCH_HANDLER_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/search_handler.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_SETTINGS_V3_HTML"
+           file="chromeos/os_settings_v3.html"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_SETTINGS_V3_JS"
+           file="chromeos/os_settings.js"
+           type="BINDATA" />
+</grit-part>
\ No newline at end of file
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings_search_box/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_settings_search_box/BUILD.gn
index 91cddc459c6..a206a3b623f 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings_search_box/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings_search_box/BUILD.gn
@@ -15,7 +15,8 @@ js_library("os_settings_search_box") {
   deps = [
     ":os_search_result_row",
     "..:metrics_recorder",
-    "//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js_library_for_compile",
+    "..:search_handler",
+    "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
     "//third_party/polymer/v1_0/components-chromium/iron-dropdown:iron-dropdown-extracted",
     "//third_party/polymer/v1_0/components-chromium/iron-list:iron-list-extracted",
     "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar_search_field",
@@ -26,7 +27,57 @@ js_library("os_settings_search_box") {
 js_library("os_search_result_row") {
   deps = [
     "..:os_route",
+    "..:search_handler",
     "../..:router",
+    "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":os_search_result_row.m",
+#    ":os_settings_search_box.m"
+#  ]
+#}
+
+js_library("os_search_result_row.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_search_box/os_search_result_row.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_search_result_row_module" ]
+}
+
+js_library("os_settings_search_box.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_search_box/os_settings_search_box.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_settings_search_box_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":os_search_result_row_module",
+    ":os_settings_search_box_module",
+  ]
+}
+
+polymer_modulizer("os_search_result_row") {
+  js_file = "os_search_result_row.js"
+  html_file = "os_search_result_row.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("os_settings_search_box") {
+  js_file = "os_settings_search_box.js"
+  html_file = "os_settings_search_box.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings_ui/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_settings_ui/BUILD.gn
index ffdf1bb4d37..3a4197151b3 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings_ui/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings_ui/BUILD.gn
@@ -25,3 +25,34 @@ js_library("os_settings_ui") {
     "//ui/webui/resources/js:find_shortcut_behavior",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":os_settings_ui.m"
+#  ]
+#}
+
+js_library("os_settings_ui.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_settings_ui_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    # TODO: Fix and re-enable
+    ":os_settings_ui_module",
+  ]
+}
+
+polymer_modulizer("os_settings_ui") {
+  js_file = "os_settings_ui.js"
+  html_file = "os_settings_ui.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_toolbar/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_toolbar/BUILD.gn
index eb6484e5902..c167fd3d098 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_toolbar/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_toolbar/BUILD.gn
@@ -14,3 +14,31 @@ js_library("os_toolbar") {
     "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar_search_field",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":os_toolbar.m"
+#  ]
+#}
+
+js_library("os_toolbar.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_toolbar/os_toolbar.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":os_toolbar_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [ ":os_toolbar_module" ]
+}
+
+polymer_modulizer("os_toolbar") {
+  js_file = "os_toolbar.js"
+  html_file = "os_toolbar.html"
+  html_type = "dom-module"
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/parental_controls_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/parental_controls_page/BUILD.gn
index 1f0323fbd66..9c9e665523a 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/parental_controls_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/parental_controls_page/BUILD.gn
@@ -21,3 +21,49 @@ js_library("parental_controls_page") {
     "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":parental_controls_browser_proxy.m",
+#    ":parental_controls_page.m"
+#  ]
+#}
+
+js_library("parental_controls_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("parental_controls_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":parental_controls_page_module" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":modulize",
+    ":parental_controls_page_module",
+  ]
+}
+
+polymer_modulizer("parental_controls_page") {
+  js_file = "parental_controls_page.js"
+  html_file = "parental_controls_page.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [ "parental_controls_browser_proxy.js" ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
index 5b6f3667c12..766826b0561 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
@@ -49,3 +49,77 @@ js_library("wallpaper_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr" ]
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
+
+# TODO: Uncomment as the Polymer3 migration makes progress.
+#js_type_check("closure_compile_module") {
+#  is_polymer3 = true
+#  deps = [
+#    ":change_picture.m",
+#    ":change_picture_browser_proxy.m",
+#    ":personalization_page.m",
+#    ":wallpaper_browser_proxy.m"
+#  ]
+#}
+
+js_library("change_picture.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/change_picture.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":change_picture_module" ]
+}
+
+js_library("change_picture_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/change_picture_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("personalization_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/personalization_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":personalization_page_module" ]
+}
+
+js_library("wallpaper_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/wallpaper_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+import("//tools/polymer/polymer.gni")
+
+group("polymer3_elements") {
+  public_deps = [
+    ":change_picture_module",
+    ":modulize",
+    ":personalization_page_module",
+  ]
+}
+
+polymer_modulizer("change_picture") {
+  js_file = "change_picture.js"
+  html_file = "change_picture.html"
+  html_type = "dom-module"
+}
+
+polymer_modulizer("personalization_page") {
+  js_file = "personalization_page.js"
+  html_file = "personalization_page.html"
+  html_type = "dom-module"
+}
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [
+    "change_picture_browser_proxy.js",
+    "wallpaper_browser_proxy.js",
+  ]
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/plugin_vm_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/plugin_vm_page/BUILD.gn
deleted file mode 100644
index aab887277ef..00000000000
--- a/chromium/chrome/browser/resources/settings/chromeos/plugin_vm_page/BUILD.gn
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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("//third_party/closure_compiler/compile_js.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":plugin_vm_browser_proxy",
-    ":plugin_vm_page",
-    ":plugin_vm_remove_confirmation_dialog",
-    ":plugin_vm_shared_paths",
-    ":plugin_vm_subpage",
-    "..:metrics_recorder",
-  ]
-}
-
-js_library("plugin_vm_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-}
-
-js_library("plugin_vm_page") {
-  deps = [
-    "..:os_route",
-    "../..:router",
-    "../../prefs:prefs_behavior",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("plugin_vm_shared_paths") {
-  deps = [
-    ":plugin_vm_browser_proxy",
-    "../..:router",
-  ]
-}
-
-js_library("plugin_vm_subpage") {
-  deps = [
-    "..:os_route",
-    "../..:router",
-    "../../prefs:prefs_behavior",
-  ]
-}
-
-js_library("plugin_vm_remove_confirmation_dialog") {
-  deps = [ ":plugin_vm_browser_proxy" ]
-}
diff --git a/chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/BUILD.gn b/chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/BUILD.gn
index c296d8d5edd..c39c2fc34fd 100644
--- a/chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/clear_browsing_data_dialog/BUILD.gn
@@ -3,135 +3,55 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":clear_browsing_data_browser_proxy",
     ":clear_browsing_data_dialog",
+    ":history_deletion_dialog",
     ":installed_app_checkbox",
   ]
 }
 
 js_library("clear_browsing_data_browser_proxy") {
-  deps = [
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
-    "//ui/webui/resources/js:cr",
-  ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
 }
 
 js_library("clear_browsing_data_dialog") {
   deps = [
     ":clear_browsing_data_browser_proxy",
     "..:route",
-    "..:router",
-    "../controls:settings_checkbox",
-    "../controls:settings_dropdown_menu",
-    "../people_page:sync_browser_proxy",
-    "//third_party/polymer/v1_0/components-chromium/iron-pages:iron-pages-extracted",
-    "//third_party/polymer/v1_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior-extracted",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("installed_app_checkbox") {
-  deps = [
-    ":clear_browsing_data_browser_proxy",
-    "../controls:settings_boolean_control_behavior",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":clear_browsing_data_browser_proxy.m",
-    ":clear_browsing_data_dialog.m",
-    ":history_deletion_dialog.m",
-    ":installed_app_checkbox.m",
-  ]
-}
-
-js_library("clear_browsing_data_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.m.js" ]
-  deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
-}
-
-js_library("clear_browsing_data_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.m.js" ]
-  deps = [
-    ":clear_browsing_data_browser_proxy.m",
-    "..:route.m",
     "..:router.m",
-    "../controls:settings_checkbox.m",
+    "../controls:settings_checkbox",
     "../controls:settings_dropdown_menu.m",
     "../people_page:sync_browser_proxy.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":clear_browsing_data_dialog_module" ]
 }
 
-js_library("history_deletion_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/clear_browsing_data_dialog/history_deletion_dialog.m.js" ]
+js_library("history_deletion_dialog") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
   ]
-  extra_deps = [ ":history_deletion_dialog_module" ]
 }
 
-js_library("installed_app_checkbox.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/clear_browsing_data_dialog/installed_app_checkbox.m.js" ]
+js_library("installed_app_checkbox") {
   deps = [
-    ":clear_browsing_data_browser_proxy.m",
+    ":clear_browsing_data_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  extra_deps = [ ":installed_app_checkbox_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":clear_browsing_data_dialog_module",
-    ":history_deletion_dialog_module",
-    ":installed_app_checkbox_module",
-    ":modulize",
+html_to_js("web_components") {
+  js_files = [
+    "clear_browsing_data_dialog.js",
+    "history_deletion_dialog.js",
+    "installed_app_checkbox.js",
   ]
 }
-
-polymer_modulizer("clear_browsing_data_dialog") {
-  js_file = "clear_browsing_data_dialog.js"
-  html_file = "clear_browsing_data_dialog.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route, Router, RouteObserverBehavior",
-                   "chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.html|ClearBrowsingDataBrowserProxy, ClearBrowsingDataBrowserProxyImpl, InstalledApp",
-                   "chrome/browser/resources/settings/controls/settings_dropdown_menu.html|DropdownMenuOptionList",
-                   "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|StatusAction, SyncBrowserProxy, SyncBrowserProxyImpl, SyncStatus",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("history_deletion_dialog") {
-  js_file = "history_deletion_dialog.js"
-  html_file = "history_deletion_dialog.html"
-  html_type = "dom-module"
-}
-
-polymer_modulizer("installed_app_checkbox") {
-  js_file = "installed_app_checkbox.js"
-  html_file = "installed_app_checkbox.html"
-  html_type = "dom-module"
-  auto_imports = [ "chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.html|InstalledApp" ]
-}
-
-js_modulizer("modulize") {
-  input_files = [ "clear_browsing_data_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
diff --git a/chromium/chrome/browser/resources/settings/controls/BUILD.gn b/chromium/chrome/browser/resources/settings/controls/BUILD.gn
index d8677c75898..69216da31e1 100644
--- a/chromium/chrome/browser/resources/settings/controls/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/controls/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/html_to_js.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../settings.gni")
@@ -15,7 +16,6 @@ js_type_check("closure_compile") {
     ":password_prompt_dialog",
     ":pref_control_behavior",
     ":settings_boolean_control_behavior",
-    ":settings_checkbox",
     ":settings_dropdown_menu",
     ":settings_idle_load",
     ":settings_radio_group",
@@ -29,7 +29,6 @@ js_library("controlled_button") {
   deps = [
     ":pref_control_behavior",
     "//ui/webui/resources/cr_elements/policy:cr_policy_pref_behavior",
-    "//ui/webui/resources/js:assert",
   ]
 }
 
@@ -75,10 +74,6 @@ js_library("settings_boolean_control_behavior") {
   ]
 }
 
-js_library("settings_checkbox") {
-  deps = [ ":settings_boolean_control_behavior" ]
-}
-
 js_library("settings_dropdown_menu") {
   deps = [
     ":pref_control_behavior",
@@ -127,6 +122,7 @@ js_library("settings_toggle_button") {
 
 js_type_check("closure_compile_module") {
   is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":controlled_button.m",
     ":controlled_radio_button.m",
@@ -134,7 +130,7 @@ js_type_check("closure_compile_module") {
     ":password_prompt_dialog.m",
     ":pref_control_behavior.m",
     ":settings_boolean_control_behavior.m",
-    ":settings_checkbox.m",
+    ":settings_checkbox",
     ":settings_dropdown_menu.m",
     ":settings_idle_load.m",
     ":settings_radio_group.m",
@@ -150,7 +146,6 @@ js_library("controlled_button.m") {
     ":pref_control_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/policy:cr_policy_pref_behavior.m",
-    "//ui/webui/resources/js:assert.m",
   ]
   extra_deps = [ ":controlled_button_module" ]
 }
@@ -209,13 +204,11 @@ js_library("settings_boolean_control_behavior.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("settings_checkbox.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/controls/settings_checkbox.m.js" ]
+js_library("settings_checkbox") {
   deps = [
     ":settings_boolean_control_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  extra_deps = [ ":settings_checkbox_module" ]
 }
 
 js_library("settings_dropdown_menu.m") {
@@ -291,21 +284,26 @@ group("polymer3_elements") {
     ":extension_controlled_indicator_module",
     ":modulize",
     ":password_prompt_dialog_module",
-    ":settings_checkbox_module",
     ":settings_dropdown_menu_module",
     ":settings_idle_load_module",
     ":settings_radio_group_module",
     ":settings_slider_module",
     ":settings_textarea_module",
     ":settings_toggle_button_module",
+    ":web_components",
   ]
 }
 
+html_to_js("web_components") {
+  js_files = [ "settings_checkbox.js" ]
+}
+
 polymer_modulizer("controlled_button") {
   js_file = "controlled_button.js"
   html_file = "controlled_button.html"
   html_type = "dom-module"
   auto_imports = settings_auto_imports
+  migrated_imports = settings_migrated_imports
 }
 
 polymer_modulizer("controlled_radio_button") {
@@ -328,6 +326,7 @@ polymer_modulizer("extension_controlled_indicator") {
     "chrome/browser/resources/settings/extension_control_browser_proxy.html|ExtensionControlBrowserProxyImpl",
     "ui/webui/resources/html/assert.html|assert",
   ]
+  migrated_imports = settings_migrated_imports
   namespace_rewrites = settings_namespace_rewrites
 }
 
@@ -337,17 +336,11 @@ polymer_modulizer("password_prompt_dialog") {
   html_type = "dom-module"
 }
 
-polymer_modulizer("settings_checkbox") {
-  js_file = "settings_checkbox.js"
-  html_file = "settings_checkbox.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports
-}
-
 polymer_modulizer("settings_dropdown_menu") {
   js_file = "settings_dropdown_menu.js"
   html_file = "settings_dropdown_menu.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
   auto_imports = settings_auto_imports + [
                    "chrome/browser/resources/settings/prefs/pref_util.html|stringToPrefValue, prefToString",
                    "ui/webui/resources/html/assert.html|assert",
@@ -359,14 +352,14 @@ polymer_modulizer("settings_idle_load") {
   js_file = "settings_idle_load.js"
   html_file = "settings_idle_load.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
   auto_imports = [
     "chrome/browser/resources/settings/ensure_lazy_loaded.html|ensureLazyLoaded",
     "ui/webui/resources/html/assert.html|assert",
     "ui/webui/resources/html/polymer.html|Polymer,html,templatize,TemplateInstanceBase",
   ]
-  namespace_rewrites = settings_namespace_rewrites + [
-    "Polymer.Templatize.templatize|templatize",
-  ]
+  namespace_rewrites = settings_namespace_rewrites +
+                       [ "Polymer.Templatize.templatize|templatize" ]
 }
 
 polymer_modulizer("settings_radio_group") {
@@ -381,6 +374,7 @@ polymer_modulizer("settings_slider") {
   js_file = "settings_slider.js"
   html_file = "settings_slider.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
   auto_imports =
       settings_auto_imports + [
         "ui/webui/resources/html/assert.html|assert",
diff --git a/chromium/chrome/browser/resources/settings/default_browser_page/BUILD.gn b/chromium/chrome/browser/resources/settings/default_browser_page/BUILD.gn
index dc82219540a..617370381ac 100644
--- a/chromium/chrome/browser/resources/settings/default_browser_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/default_browser_page/BUILD.gn
@@ -3,11 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":default_browser_browser_proxy",
     ":default_browser_page",
@@ -15,57 +16,17 @@ js_type_check("closure_compile") {
 }
 
 js_library("default_browser_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
 }
 
 js_library("default_browser_page") {
   deps = [
     ":default_browser_browser_proxy",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":default_browser_browser_proxy.m",
-    ":default_browser_page.m",
-  ]
-}
-
-js_library("default_browser_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/default_browser_page/default_browser_browser_proxy.m.js" ]
-  deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
-}
-
-js_library("default_browser_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/default_browser_page/default_browser_page.m.js" ]
-  deps = [
-    ":default_browser_browser_proxy.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":default_browser_page_module" ]
-}
-
-group("polymer3_elements") {
-  public_deps = [
-    ":default_browser_page_module",
-    ":modulize",
-  ]
-}
-
-polymer_modulizer("default_browser_page") {
-  js_file = "default_browser_page.js"
-  html_file = "default_browser_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = [ "chrome/browser/resources/settings/default_browser_page/default_browser_browser_proxy.html|DefaultBrowserBrowserProxyImpl,DefaultBrowserBrowserProxy,DefaultBrowserInfo" ]
 }
 
-js_modulizer("modulize") {
-  input_files = [ "default_browser_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
+html_to_js("web_components") {
+  js_files = [ "default_browser_page.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/downloads_page/BUILD.gn b/chromium/chrome/browser/resources/settings/downloads_page/BUILD.gn
index 9b31bc2d09c..a8679afb78f 100644
--- a/chromium/chrome/browser/resources/settings/downloads_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/downloads_page/BUILD.gn
@@ -3,11 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":downloads_browser_proxy",
     ":downloads_page",
@@ -15,64 +16,19 @@ js_type_check("closure_compile") {
 }
 
 js_library("downloads_browser_proxy") {
-  deps = [
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-  ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
 }
 
 js_library("downloads_page") {
   deps = [
     ":downloads_browser_proxy",
-    "../prefs:prefs_behavior",
-    "//ui/webui/resources/js:util",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":downloads_browser_proxy.m",
-    ":downloads_page.m",
-  ]
-}
-
-js_library("downloads_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/downloads_page/downloads_browser_proxy.m.js" ]
-  deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
-}
-
-js_library("downloads_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/downloads_page/downloads_page.m.js" ]
-  deps = [
-    ":downloads_browser_proxy.m",
     "../prefs:prefs_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:util.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":downloads_page_module" ]
-}
-
-group("polymer3_elements") {
-  public_deps = [
-    ":downloads_page_module",
-    ":modulize",
-  ]
-}
-
-polymer_modulizer("downloads_page") {
-  js_file = "downloads_page.js"
-  html_file = "downloads_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports =
-      settings_auto_imports + [ "ui/webui/resources/html/util.html|listenOnce" ]
 }
 
-js_modulizer("modulize") {
-  input_files = [ "downloads_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
+html_to_js("web_components") {
+  js_files = [ "downloads_page.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/incompatible_applications_page/BUILD.gn b/chromium/chrome/browser/resources/settings/incompatible_applications_page/BUILD.gn
index 29066a8fbe9..b8fe18792b9 100644
--- a/chromium/chrome/browser/resources/settings/incompatible_applications_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/incompatible_applications_page/BUILD.gn
@@ -3,11 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":incompatible_application_item",
     ":incompatible_applications_browser_proxy",
@@ -15,98 +16,33 @@ js_type_check("closure_compile") {
   ]
 }
 
-js_library("incompatible_applications_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-}
-
-js_library("incompatible_applications_page") {
-  deps = [
-    ":incompatible_applications_browser_proxy",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
 js_library("incompatible_application_item") {
   deps = [
     ":incompatible_applications_browser_proxy",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":incompatible_application_item.m",
-    ":incompatible_applications_browser_proxy.m",
-    ":incompatible_applications_page.m",
-  ]
-}
-
-js_library("incompatible_application_item.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/incompatible_applications_page/incompatible_application_item.m.js" ]
-  deps = [
-    ":incompatible_applications_browser_proxy.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  extra_deps = [ ":incompatible_application_item_module" ]
 }
 
-js_library("incompatible_applications_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/incompatible_applications_page/incompatible_applications_browser_proxy.m.js" ]
+js_library("incompatible_applications_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
   externs_list = [ "$externs_path/chrome_send.js" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("incompatible_applications_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/incompatible_applications_page/incompatible_applications_page.m.js" ]
+js_library("incompatible_applications_page") {
   deps = [
-    ":incompatible_applications_browser_proxy.m",
-    "..:i18n_setup.m",
+    ":incompatible_applications_browser_proxy",
+    "..:i18n_setup",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":incompatible_applications_page_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":incompatible_application_item_module",
-    ":incompatible_applications_page_module",
-    ":modulize",
+html_to_js("web_components") {
+  js_files = [
+    "incompatible_application_item.js",
+    "incompatible_applications_page.js",
   ]
 }
-
-polymer_modulizer("incompatible_application_item") {
-  js_file = "incompatible_application_item.js"
-  html_file = "incompatible_application_item.html"
-  html_type = "dom-module"
-  namespace_rewrites =
-      settings_namespace_rewrites + [ "settings.ActionTypes|ActionTypes" ]
-  auto_imports = [
-    "ui/webui/resources/html/assert.html|assertNotReached",
-    "chrome/browser/resources/settings/incompatible_applications_page/incompatible_applications_browser_proxy.html|ActionTypes,IncompatibleApplicationsBrowserProxyImpl,IncompatibleApplicationsBrowserProxy",
-  ]
-}
-
-polymer_modulizer("incompatible_applications_page") {
-  js_file = "incompatible_applications_page.js"
-  html_file = "incompatible_applications_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "ui/webui/resources/html/assert.html|assert",
-                   "chrome/browser/resources/settings/incompatible_applications_page/incompatible_applications_browser_proxy.html|IncompatibleApplicationsBrowserProxyImpl, IncompatibleApplication",
-                 ]
-}
-
-js_modulizer("modulize") {
-  input_files = [ "incompatible_applications_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
diff --git a/chromium/chrome/browser/resources/settings/languages_page/BUILD.gn b/chromium/chrome/browser/resources/settings/languages_page/BUILD.gn
index 9bbcf64228c..95ebf73a699 100644
--- a/chromium/chrome/browser/resources/settings/languages_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/languages_page/BUILD.gn
@@ -3,29 +3,15 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/html_to_js.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../settings.gni")
 
 js_type_check("closure_compile") {
   deps = [
-    ":add_languages_dialog",
-    ":edit_dictionary_page",
     ":languages",
     ":languages_browser_proxy",
-    ":languages_page",
-    ":languages_types",
-  ]
-}
-
-js_library("edit_dictionary_page") {
-  deps = [
-    ":languages_browser_proxy",
-    "..:global_scroll_target_behavior",
-    "..:route",
-    "../prefs",
-    "//ui/webui/resources/cr_elements/cr_button:cr_button",
-    "//ui/webui/resources/cr_elements/cr_input:cr_input",
   ]
 }
 
@@ -63,84 +49,52 @@ js_library("languages") {
   ]
 }
 
-js_library("languages_page") {
-  deps = [
-    ":languages",
-    ":languages_types",
-    "..:lifetime_browser_proxy",
-    "..:route",
-    "..:router",
-    "../settings_page:settings_animated_pages",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
-    "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button",
-    "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}
-
 js_library("languages_types") {
-  deps = []
   externs_list = [ "$externs_path/language_settings_private.js" ]
 }
 
-js_library("add_languages_dialog") {
-  deps = [
-    ":languages",
-    ":languages_types",
-    "//ui/webui/resources/cr_elements:cr_scrollable_behavior",
-    "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field",
-    "//ui/webui/resources/js:find_shortcut_behavior",
-  ]
-}
-
 js_type_check("closure_compile_module") {
   is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
-    ":add_languages_dialog.m",
-    ":edit_dictionary_page.m",
+    ":add_languages_dialog",
+    ":edit_dictionary_page",
     ":languages.m",
     ":languages_browser_proxy.m",
-    ":languages_page.m",
-    ":languages_types.m",
+    ":languages_page",
+    ":languages_types",
   ]
 }
 
-js_library("add_languages_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/languages_page/add_languages_dialog.m.js" ]
+js_library("add_languages_dialog") {
   deps = [
     ":languages.m",
-    ":languages_types.m",
+    ":languages_types",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
     "//ui/webui/resources/js:find_shortcut_behavior.m",
   ]
-  extra_deps = [ ":add_languages_dialog_module" ]
 }
 
-js_library("edit_dictionary_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/languages_page/edit_dictionary_page.m.js" ]
+js_library("edit_dictionary_page") {
   deps = [
     ":languages_browser_proxy.m",
     "..:global_scroll_target_behavior.m",
-    "..:route.m",
+    "..:route",
     "../prefs:prefs.m",
     "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
   ]
-  extra_deps = [ ":edit_dictionary_page_module" ]
 }
 
 js_library("languages.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/languages_page/languages.m.js" ]
   deps = [
     ":languages_browser_proxy.m",
-    ":languages_types.m",
+    ":languages_types",
     "../prefs:prefs.m",
     "../prefs:prefs_behavior.m",
     "../prefs:prefs_types.m",
@@ -176,13 +130,11 @@ js_library("languages_browser_proxy.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("languages_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/languages_page/languages_page.m.js" ]
+js_library("languages_page") {
   deps = [
     ":languages.m",
-    ":languages_types.m",
     "..:lifetime_browser_proxy.m",
-    "..:route.m",
+    "..:route",
     "..:router.m",
     "../settings_page:settings_animated_pages.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -194,41 +146,22 @@ js_library("languages_page.m") {
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  extra_deps = [ ":languages_page_module" ]
-}
-
-js_library("languages_types.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/languages_page/languages_types.m.js" ]
-  externs_list = [ "$externs_path/language_settings_private.js" ]
-  extra_deps = [ ":modulize" ]
 }
 
 group("polymer3_elements") {
   public_deps = [
-    ":add_languages_dialog_module",
-    ":edit_dictionary_page_module",
     ":languages_module",
-    ":languages_page_module",
     ":modulize",
+    ":web_components",
   ]
 }
 
-polymer_modulizer("add_languages_dialog") {
-  js_file = "add_languages_dialog.js"
-  html_file = "add_languages_dialog.html"
-  html_type = "dom-module"
-}
-
-polymer_modulizer("edit_dictionary_page") {
-  js_file = "edit_dictionary_page.js"
-  html_file = "edit_dictionary_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/languages_page/languages_browser_proxy.html|LanguagesBrowserProxyImpl",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "ui/webui/resources/html/polymer.html|Polymer,html,flush",
-                 ]
+html_to_js("web_components") {
+  js_files = [
+    "add_languages_dialog.js",
+    "edit_dictionary_page.js",
+    "languages_page.js",
+  ]
 }
 
 polymer_modulizer("languages") {
@@ -243,26 +176,7 @@ polymer_modulizer("languages") {
   namespace_rewrites = settings_namespace_rewrites
 }
 
-polymer_modulizer("languages_page") {
-  js_file = "languages_page.js"
-  html_file = "languages_page.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/lifetime_browser_proxy.html|LifetimeBrowserProxyImpl",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route,Router",
-                   "ui/webui/resources/html/assert.html|assert",
-                   "ui/webui/resources/html/cr.html|isChromeOS, isWindows",
-                   "ui/webui/resources/html/polymer.html|Polymer,html,flush",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites +
-                       [ "settings.kMenuCloseDelay|kMenuCloseDelay" ]
-}
-
 js_modulizer("modulize") {
-  input_files = [
-    "languages_browser_proxy.js",
-    "languages_types.js",
-  ]
+  input_files = [ "languages_browser_proxy.js" ]
   namespace_rewrites = settings_namespace_rewrites
 }
diff --git a/chromium/chrome/browser/resources/settings/on_startup_page/BUILD.gn b/chromium/chrome/browser/resources/settings/on_startup_page/BUILD.gn
index 93a4ce2f937..18ca090d579 100644
--- a/chromium/chrome/browser/resources/settings/on_startup_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/on_startup_page/BUILD.gn
@@ -3,11 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":on_startup_browser_proxy",
     ":on_startup_page",
@@ -19,183 +20,56 @@ js_type_check("closure_compile") {
 }
 
 js_library("on_startup_browser_proxy") {
-  deps = [
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-  ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
 }
 
 js_library("on_startup_page") {
   deps = [
     ":on_startup_browser_proxy",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("startup_urls_page") {
-  deps = [
-    ":startup_url_entry",
-    ":startup_urls_page_browser_proxy",
-    "//ui/webui/resources/cr_elements:cr_scrollable_behavior",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("startup_urls_page_browser_proxy") {
-  deps = [
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-  ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
-js_library("startup_url_entry") {
-  deps = [
-    ":startup_urls_page_browser_proxy",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
-    "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:icon",
-    "//ui/webui/resources/js/cr/ui:focus_row_behavior",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
 }
 
 js_library("startup_url_dialog") {
   deps = [
     ":startup_urls_page_browser_proxy",
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":on_startup_browser_proxy.m",
-    ":on_startup_page.m",
-    ":startup_url_dialog.m",
-    ":startup_url_entry.m",
-    ":startup_urls_page.m",
-    ":startup_urls_page_browser_proxy.m",
-  ]
-}
-
-js_library("on_startup_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/on_startup_browser_proxy.m.js" ]
-  deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
-}
-
-js_library("on_startup_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/on_startup_page.m.js" ]
-  deps = [
-    ":on_startup_browser_proxy.m",
-    "//ui/webui/resources/js:web_ui_listener_behavior.m",
-  ]
-  extra_deps = [ ":on_startup_page_module" ]
-}
-
-js_library("startup_url_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_url_dialog.m.js" ]
-  deps = [
-    ":startup_urls_page_browser_proxy.m",
-    "..:i18n_setup.m",
+    "..:i18n_setup",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
   ]
-  extra_deps = [ ":startup_url_dialog_module" ]
 }
 
-js_library("startup_url_entry.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_url_entry.m.js" ]
+js_library("startup_url_entry") {
   deps = [
-    ":startup_urls_page_browser_proxy.m",
+    ":startup_urls_page_browser_proxy",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
     "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:icon.m",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
-  extra_deps = [ ":startup_url_entry_module" ]
 }
 
-js_library("startup_urls_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_urls_page.m.js" ]
+js_library("startup_urls_page") {
   deps = [
-    ":startup_url_entry.m",
-    ":startup_urls_page_browser_proxy.m",
+    ":startup_url_entry",
+    ":startup_urls_page_browser_proxy",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
   externs_list = [ "$externs_path/settings_private.js" ]
-  extra_deps = [ ":startup_urls_page_module" ]
 }
 
-js_library("startup_urls_page_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.m.js" ]
+js_library("startup_urls_page_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
-}
-
-group("polymer3_elements") {
-  public_deps = [
-    ":modulize",
-    ":on_startup_page_module",
-    ":startup_url_dialog_module",
-    ":startup_url_entry_module",
-    ":startup_urls_page_module",
-  ]
-}
-
-polymer_modulizer("on_startup_page") {
-  js_file = "on_startup_page.js"
-  html_file = "on_startup_page.html"
-  html_type = "dom-module"
-  auto_imports = [ "chrome/browser/resources/settings/on_startup_page/on_startup_browser_proxy.html|NtpExtension, OnStartupBrowserProxyImpl" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("startup_url_dialog") {
-  js_file = "startup_url_dialog.js"
-  html_file = "startup_url_dialog.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.html|StartupPageInfo, StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("startup_url_entry") {
-  js_file = "startup_url_entry.js"
-  html_file = "startup_url_entry.html"
-  html_type = "dom-module"
-  auto_imports = [
-    "ui/webui/resources/html/assert.html|assert",
-    "chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.html|StartupPageInfo, StartupUrlsPageBrowserProxyImpl",
-  ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("startup_urls_page") {
-  js_file = "startup_urls_page.js"
-  html_file = "startup_urls_page.html"
-  html_type = "dom-module"
-  auto_imports = [
-    "ui/webui/resources/html/assert.html|assert",
-    "chrome/browser/resources/settings/on_startup_page/startup_url_entry.html|EDIT_STARTUP_URL_EVENT",
-    "chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.html|StartupPageInfo, StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl",
-  ]
-  namespace_rewrites = settings_namespace_rewrites
 }
 
-js_modulizer("modulize") {
-  input_files = [
-    "on_startup_browser_proxy.js",
-    "startup_urls_page_browser_proxy.js",
+html_to_js("web_components") {
+  js_files = [
+    "on_startup_page.js",
+    "startup_url_dialog.js",
+    "startup_url_entry.js",
+    "startup_urls_page.js",
   ]
-  namespace_rewrites = settings_namespace_rewrites
 }
diff --git a/chromium/chrome/browser/resources/settings/os_settings_resources.grd b/chromium/chrome/browser/resources/settings/os_settings_resources.grd
index 05e7cf5cad9..cf80563c962 100644
--- a/chromium/chrome/browser/resources/settings/os_settings_resources.grd
+++ b/chromium/chrome/browser/resources/settings/os_settings_resources.grd
@@ -12,1317 +12,1365 @@
   </outputs>
   <release seq="1">
     <includes>
+      <part file="chromeos/os_settings_resources_v3.grdp" />
+
+      <!-- Constants -->
+      <include name="IDR_OS_SETTINGS_ROUTES_MOJOM_LITE_JS"
+               file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\constants\routes.mojom-lite.js"
+               use_base_dir="false"
+               compress="false" type="BINDATA" />
+      <include name="IDR_OS_SETTINGS_SETTING_MOJOM_LITE_JS"
+               file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\constants\setting.mojom-lite.js"
+               use_base_dir="false"
+               compress="false" type="BINDATA" />
+
       <!-- App Management -->
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_BITMAP_MOJO_LITE_JS"
                file="${root_gen_dir}\skia\public\mojom\bitmap.mojom-lite.js"
                use_base_dir="false"
-               type="BINDATA" />
+               compress="false" type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_FILE_PATH_MOJO_LITE_JS"
                file="${root_gen_dir}\mojo\public\mojom\base\file_path.mojom-lite.js"
                use_base_dir="false"
-               type="BINDATA" />
+               compress="false" type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_IMAGE_INFO_MOJO_LITE_JS"
                file="${root_gen_dir}\skia\public\mojom\image_info.mojom-lite.js"
                use_base_dir="false"
-               type="BINDATA" />
+               compress="false" type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_IMAGE_MOJO_LITE_JS"
                file="${root_gen_dir}\ui\gfx\image\mojom\image.mojom-lite.js"
                use_base_dir="false"
-               type="BINDATA" />
+               compress="false" type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_MOJO_LITE_JS"
                file="${root_gen_dir}\chrome\browser\ui\webui\app_management\app_management.mojom-lite.js"
                use_base_dir="false"
-               type="BINDATA" />
+               compress="false" type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_TYPES_MOJO_LITE_JS"
                file="${root_gen_dir}\chrome\services\app_service\public\mojom\types.mojom-lite.js"
                use_base_dir="false"
-               type="BINDATA" />
+               compress="false" type="BINDATA" />
 
       <!-- Search -->
       <include name="IDR_OS_SETTINGS_SEARCH_MOJOM_LITE_JS"
                file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\search\search.mojom-lite.js"
                use_base_dir="false"
-               type="BINDATA" />
+               compress="false" type="BINDATA" />
       <include name="IDR_OS_SETTINGS_SEARCH_RESULT_ICON_MOJOM_LITE_JS"
                file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\search\search_result_icon.mojom-lite.js"
                use_base_dir="false"
-               type="BINDATA" />
+               compress="false" type="BINDATA" />
       <include name="IDR_OS_SETTINGS_USER_ACTION_RECORDER_MOJOM_LITE_JS"
                file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\search\user_action_recorder.mojom-lite.js"
                use_base_dir="false"
-               type="BINDATA" />
+               compress="false" type="BINDATA" />
     </includes>
     <structures>
       <structure name="IDR_OS_SETTINGS_LOCALIZED_LINK_JS"
                  file="chromeos/localized_link/localized_link.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LOCALIZED_LINK_HTML"
                  file="chromeos/localized_link/localized_link.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_A11Y_PAGE_JS"
                  file="chromeos/os_a11y_page/os_a11y_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_A11Y_PAGE_HTML"
                  file="chromeos/os_a11y_page/os_a11y_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_AMBIENT_MODE_PAGE_JS"
                  file="chromeos/ambient_mode_page/ambient_mode_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_AMBIENT_MODE_PAGE_HTML"
                  file="chromeos/ambient_mode_page/ambient_mode_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_AMBIENT_MODE_BROWSER_PROXY_JS"
                  file="chromeos/ambient_mode_page/ambient_mode_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_AMBIENT_MODE_BROWSER_PROXY_HTML"
                  file="chromeos/ambient_mode_page/ambient_mode_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APPS_PAGE_JS"
                  file="chromeos/os_apps_page/os_apps_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APPS_PAGE_HTML"
                  file="chromeos/os_apps_page/os_apps_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_JS"
                  file="chromeos/os_apps_page/app_management_page/app_management_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_HTML"
                  file="chromeos/os_apps_page/app_management_page/app_management_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CONSTANTS_JS"
                  file="chromeos/os_apps_page/app_management_page/constants.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CONSTANTS_HTML"
                  file="chromeos/os_apps_page/app_management_page/constants.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_STORE_CLIENT_JS"
                  file="chromeos/os_apps_page/app_management_page/store_client.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_STORE_CLIENT_HTML"
                  file="chromeos/os_apps_page/app_management_page/store_client.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_STORE_JS"
                  file="chromeos/os_apps_page/app_management_page/store.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_STORE_HTML"
                  file="chromeos/os_apps_page/app_management_page/store.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ACTIONS_JS"
                  file="chromeos/os_apps_page/app_management_page/actions.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ACTIONS_HTML"
                  file="chromeos/os_apps_page/app_management_page/actions.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_ITEM_JS"
                  file="chromeos/os_apps_page/app_management_page/app_item.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_ITEM_HTML"
                  file="chromeos/os_apps_page/app_management_page/app_item.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_BROWSER_PROXY_JS"
                  file="chromeos/os_apps_page/app_management_page/browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_BROWSER_PROXY_HTML"
                  file="chromeos/os_apps_page/app_management_page/browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_FAKE_PAGE_HANDLER_JS"
                  file="chromeos/os_apps_page/app_management_page/fake_page_handler.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_MAIN_VIEW_JS"
                  file="chromeos/os_apps_page/app_management_page/main_view.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_MAIN_VIEW_HTML"
                  file="chromeos/os_apps_page/app_management_page/main_view.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_TYPES_JS"
                  file="chromeos/os_apps_page/app_management_page/types.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_UTIL_JS"
                  file="chromeos/os_apps_page/app_management_page/util.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_UTIL_HTML"
                  file="chromeos/os_apps_page/app_management_page/util.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_SHARED_STYLE_HTML"
                  file="chromeos/os_apps_page/app_management_page/shared_style.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_SHARED_VARS_HTML"
                  file="chromeos/os_apps_page/app_management_page/shared_vars.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_REDUCERS_JS"
                  file="chromeos/os_apps_page/app_management_page/reducers.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_REDUCERS_HTML"
                  file="chromeos/os_apps_page/app_management_page/reducers.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_API_LISTENER_JS"
                  file="chromeos/os_apps_page/app_management_page/api_listener.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_API_LISTENER_HTML"
                  file="chromeos/os_apps_page/app_management_page/api_listener.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_DOM_SWITCH_JS"
                  file="chromeos/os_apps_page/app_management_page/dom_switch.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_DOM_SWITCH_HTML"
                  file="chromeos/os_apps_page/app_management_page/dom_switch.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PWA_DETAIL_VIEW_JS"
                  file="chromeos/os_apps_page/app_management_page/pwa_detail_view.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PWA_DETAIL_VIEW_HTML"
                  file="chromeos/os_apps_page/app_management_page/pwa_detail_view.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PERMISSION_ITEM_JS"
                  file="chromeos/os_apps_page/app_management_page/permission_item.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PERMISSION_ITEM_HTML"
                  file="chromeos/os_apps_page/app_management_page/permission_item.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PIN_TO_SHELF_ITEM_JS"
                  file="chromeos/os_apps_page/app_management_page/pin_to_shelf_item.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PIN_TO_SHELF_ITEM_HTML"
                  file="chromeos/os_apps_page/app_management_page/pin_to_shelf_item.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_TOGGLE_ROW_JS"
                  file="chromeos/os_apps_page/app_management_page/toggle_row.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_TOGGLE_ROW_HTML"
                  file="chromeos/os_apps_page/app_management_page/toggle_row.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_DETAIL_VIEW_JS"
                  file="chromeos/os_apps_page/app_management_page/app_detail_view.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_DETAIL_VIEW_HTML"
                  file="chromeos/os_apps_page/app_management_page/app_detail_view.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ARC_DETAIL_VIEW_JS"
                  file="chromeos/os_apps_page/app_management_page/arc_detail_view.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ARC_DETAIL_VIEW_HTML"
                  file="chromeos/os_apps_page/app_management_page/arc_detail_view.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CHROME_APP_DETAIL_VIEW_JS"
                  file="chromeos/os_apps_page/app_management_page/chrome_app_detail_view.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CHROME_APP_DETAIL_VIEW_HTML"
                  file="chromeos/os_apps_page/app_management_page/chrome_app_detail_view.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ICONS_HTML"
                  file="chromeos/os_apps_page/app_management_page/icons.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_UNINSTALL_BUTTON_JS"
                  file="chromeos/os_apps_page/app_management_page/uninstall_button.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_UNINSTALL_BUTTON_HTML"
                  file="chromeos/os_apps_page/app_management_page/uninstall_button.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_DETAIL_VIEW_JS"
+                 file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_detail_view.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_DETAIL_VIEW_HTML"
+                file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_detail_view.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_SHARED_PATHS_HTML"
+                file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_shared_paths.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_SHARED_PATHS_JS"
+                file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_shared_paths.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_BROWSER_PROXY_JS"
+                file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_browser_proxy.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_BROWSER_PROXY_HTML"
+                file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_browser_proxy.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CAPTIONS_SUBPAGE_JS"
                  file="a11y_page/captions_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CAPTIONS_SUBPAGE_HTML"
                  file="a11y_page/captions_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_FONTS_BROWSER_PROXY_HTML"
                  file="appearance_page/fonts_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_FONTS_BROWSER_PROXY_JS"
                  file="appearance_page/fonts_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_JS"
                  file="chromeos/os_a11y_page/manage_a11y_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_HTML"
                  file="chromeos/os_a11y_page/manage_a11y_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDS_OS_SETTINGS_SWITCH_ACCESS_SUBPAGE_JS"
                  file="chromeos/os_a11y_page/switch_access_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SWITCH_ACCESS_SUBPAGE_HTML"
                  file="chromeos/os_a11y_page/switch_access_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_JS"
                  file="chromeos/os_a11y_page/tts_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_HTML"
                  file="chromeos/os_a11y_page/tts_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MANIFEST"
                  file="os_settings_manifest.json"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ABOUT_PAGE_BROWSER_PROXY_HTML"
                  file="about_page/about_page_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ABOUT_PAGE_BROWSER_PROXY_JS"
                  file="about_page/about_page_browser_proxy.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_ABOUT_PAGE_JS"
                  file="chromeos/os_about_page/os_about_page.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_ABOUT_PAGE_HTML"
                  file="chromeos/os_about_page/os_about_page.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_CHANNEL_SWITCHER_DIALOG_HTML"
                  file="chromeos/os_about_page/channel_switcher_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CHANNEL_SWITCHER_DIALOG_JS"
                  file="chromeos/os_about_page/channel_switcher_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DETAILED_BUILD_INFO_JS"
                  file="chromeos/os_about_page/detailed_build_info.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DETAILED_BUILD_INFO_HTML"
                  file="chromeos/os_about_page/detailed_build_info.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_UPDATE_WARNING_DIALOG_HTML"
                  file="chromeos/os_about_page/update_warning_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_UPDATE_WARNING_DIALOG_JS"
                  file="chromeos/os_about_page/update_warning_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_HTML"
                  file="settings_page/settings_animated_pages.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_JS"
                  file="settings_page/settings_animated_pages.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PERSONALIZATION_PAGE_HTML"
                  file="chromeos/personalization_page/personalization_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PERSONALIZATION_PAGE_JS"
                  file="chromeos/personalization_page/personalization_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_SETTINGS_PAGE_JS"
                  file="chromeos/os_settings_page/os_settings_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_SETTINGS_PAGE_HTML"
                  file="chromeos/os_settings_page/os_settings_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ENSURE_LAZY_LOADED_HTML"
                  file="ensure_lazy_loaded.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_JS"
                  file="extension_control_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_HTML"
                  file="extension_control_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LIFETIME_BROWSER_PROXY_HTML"
                  file="lifetime_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LIFETIME_BROWSER_PROXY_JS"
                  file="lifetime_browser_proxy.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_SEARCH_SETTINGS_JS"
                  file="search_settings.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_MAIN_HTML"
                  file="chromeos/os_settings_main/os_settings_main.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_MAIN_JS"
                  file="chromeos/os_settings_main/os_settings_main.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_MENU_HTML"
                  file="chromeos/os_settings_menu/os_settings_menu.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_MENU_JS"
                  file="chromeos/os_settings_menu/os_settings_menu.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_SETTINGS_SECTION_HTML"
                  file="settings_page/settings_section.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_SETTINGS_SECTION_JS"
                  file="settings_page/settings_section.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_SETTINGS_SUBPAGE_HTML"
                  file="settings_page/settings_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_SETTINGS_SUBPAGE_JS"
                  file="settings_page/settings_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_SETTINGS_PAGE_CSS_HTML"
                  file="settings_page_css.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MAIN_PAGE_BEHAVIOR_HTML"
                  file="settings_page/main_page_behavior.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MAIN_PAGE_BEHAVIOR_JS"
                  file="settings_page/main_page_behavior.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_SETTINGS_VARS_CSS_HTML"
                  file="settings_vars_css.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SETTINGS_SHARED_CSS_HTML"
                  file="settings_shared_css.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_UI_HTML"
                  file="chromeos/os_settings_ui/os_settings_ui.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_UI_JS"
                  file="chromeos/os_settings_ui/os_settings_ui.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_HTML"
                  file="global_scroll_target_behavior.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_JS"
                  file="global_scroll_target_behavior.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_BOOLEAN_CONTROL_BEHAVIOR_HTML"
                  file="controls/settings_boolean_control_behavior.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_BOOLEAN_CONTROL_BEHAVIOR_JS"
                  file="controls/settings_boolean_control_behavior.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_CONTROLLED_BUTTON_JS"
                  file="controls/controlled_button.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_CONTROLLED_BUTTON_HTML"
                  file="controls/controlled_button.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_CONTROLLED_RADIO_BUTTON_JS"
                  file="controls/controlled_radio_button.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_CONTROLLED_RADIO_BUTTON_HTML"
                  file="controls/controlled_radio_button.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_EXTENSION_CONTROLLED_INDICATOR_JS"
                  file="controls/extension_controlled_indicator.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_EXTENSION_CONTROLLED_INDICATOR_HTML"
                  file="controls/extension_controlled_indicator.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_DROPDOWN_MENU_HTML"
                  file="controls/settings_dropdown_menu.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_DROPDOWN_MENU_JS"
                  file="controls/settings_dropdown_menu.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_PASSWORD_PROMPT_DIALOG_JS"
                  file="controls/password_prompt_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_PASSWORD_PROMPT_DIALOG_HTML"
                  file="controls/password_prompt_dialog.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_PREF_CONTROL_BEHAVIOR_HTML"
                  file="controls/pref_control_behavior.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_PREF_CONTROL_BEHAVIOR_JS"
                  file="controls/pref_control_behavior.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_RADIO_GROUP_HTML"
                  file="controls/settings_radio_group.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_RADIO_GROUP_JS"
                  file="controls/settings_radio_group.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_SETTINGS_IDLE_LOAD_HTML"
                  file="controls/settings_idle_load.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_SETTINGS_IDLE_LOAD_JS"
                  file="controls/settings_idle_load.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_SLIDER_HTML"
                  file="controls/settings_slider.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_SLIDER_JS"
                  file="controls/settings_slider.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_TEXTAREA_HTML"
                  file="controls/settings_textarea.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_TEXTAREA_JS"
                  file="controls/settings_textarea.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_TOGGLE_BUTTON_HTML"
                  file="controls/settings_toggle_button.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CONTROLS_TOGGLE_BUTTON_JS"
                  file="controls/settings_toggle_button.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_BROWSER_PROXY_HTML"
                  file="chromeos/device_page/device_page_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_BROWSER_PROXY_JS"
                  file="chromeos/device_page/device_page_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_HTML"
                  file="chromeos/device_page/display.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_JS"
                  file="chromeos/device_page/display.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_LAYOUT_HTML"
                  file="chromeos/device_page/display_layout.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_LAYOUT_JS"
                  file="chromeos/device_page/display_layout.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_OVERSCAN_DIALOG_HTML"
                  file="chromeos/device_page/display_overscan_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_OVERSCAN_DIALOG_JS"
                  file="chromeos/device_page/display_overscan_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_DEVICE_DLC_SUBPAGE_HTML"
+                 file="chromeos/device_page/dlc_subpage.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_DEVICE_DLC_SUBPAGE_JS"
+                 file="chromeos/device_page/dlc_subpage.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_KEYBOARD_HTML"
                  file="chromeos/device_page/keyboard.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_KEYBOARD_JS"
                  file="chromeos/device_page/keyboard.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_POWER_HTML"
                  file="chromeos/device_page/power.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_POWER_JS"
                  file="chromeos/device_page/power.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_STORAGE_HTML"
                  file="chromeos/device_page/storage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_STORAGE_JS"
                  file="chromeos/device_page/storage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_ENTRY_HTML"
                  file="chromeos/device_page/storage_external_entry.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_ENTRY_JS"
                  file="chromeos/device_page/storage_external_entry.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_HTML"
                  file="chromeos/device_page/storage_external.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_JS"
                  file="chromeos/device_page/storage_external.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_STYLUS_HTML"
                  file="chromeos/device_page/stylus.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_STYLUS_JS"
                  file="chromeos/device_page/stylus.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_PAGE_HTML"
                  file="chromeos/device_page/device_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_PAGE_JS"
                  file="chromeos/device_page/device_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_POINTERS_HTML"
                  file="chromeos/device_page/pointers.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_POINTERS_JS"
                  file="chromeos/device_page/pointers.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_DRAG_BEHAVIOR_HTML"
                  file="chromeos/device_page/drag_behavior.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_DRAG_BEHAVIOR_JS"
                  file="chromeos/device_page/drag_behavior.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_LAYOUT_BEHAVIOR_HTML"
                  file="chromeos/device_page/layout_behavior.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_LAYOUT_BEHAVIOR_JS"
                  file="chromeos/device_page/layout_behavior.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_NIGHT_LIGHT_SLIDER_HTML"
                  file="chromeos/device_page/night_light_slider.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DEVICE_NIGHT_LIGHT_SLIDER_JS"
                  file="chromeos/device_page/night_light_slider.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_FILES_PAGE_HTML"
                  file="chromeos/os_files_page/os_files_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_FILES_PAGE_JS"
                  file="chromeos/os_files_page/os_files_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SMB_SHARES_PAGE_HTML"
                  file="chromeos/os_files_page/smb_shares_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SMB_SHARES_PAGE_JS"
                  file="chromeos/os_files_page/smb_shares_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_I18n_SETUP_HTML"
                  file="i18n_setup.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ICONS"
                  file="icons.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_OS_ICONS"
                  file="chromeos/os_icons.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_OS_SETTINGS_ICONS_CSS_HTML"
                  file="chromeos/os_settings_icons_css.html"
                  flattenhtml="true"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_POWERWASH_DIALOG_HTML"
                  file="chromeos/os_reset_page/os_powerwash_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_POWERWASH_DIALOG_JS"
                  file="chromeos/os_reset_page/os_powerwash_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_RESET_PAGE_HTML"
                  file="chromeos/os_reset_page/os_reset_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_RESET_PAGE_JS"
                  file="chromeos/os_reset_page/os_reset_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_RESET_BROWSER_PROXY_JS"
                  file="chromeos/os_reset_page/os_reset_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_RESET_BROWSER_PROXY_HTML"
                  file="chromeos/os_reset_page/os_reset_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_HTML"
                  file="languages_page/languages.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_JS"
                  file="languages_page/languages.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_BROWSER_PROXY_HTML"
                  file="languages_page/languages_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_BROWSER_PROXY_JS"
                  file="languages_page/languages_browser_proxy.js"
                  preprocess="true"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_HTML"
                  file="chromeos/os_languages_page/os_add_languages_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_JS"
                  file="chromeos/os_languages_page/os_add_languages_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_PAGE_HTML"
                  file="chromeos/os_languages_page/os_languages_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_PAGE_JS"
                  file="chromeos/os_languages_page/os_languages_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_SECTION_HTML"
                  file="chromeos/os_languages_page/os_languages_section.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_SECTION_JS"
                  file="chromeos/os_languages_page/os_languages_section.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_MANAGE_INPUT_METHODS_PAGE_HTML"
                  file="chromeos/os_languages_page/manage_input_methods_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_MANAGE_INPUT_METHODS_PAGE_JS"
                  file="chromeos/os_languages_page/manage_input_methods_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_SMART_INPUTS_PAGE_HTML"
+                 file="chromeos/os_languages_page/smart_inputs_page.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_SMART_INPUTS_PAGE_JS"
+                 file="chromeos/os_languages_page/smart_inputs_page.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_SEARCH_RESULT_ROW_JS"
                  file="chromeos/os_settings_search_box/os_search_result_row.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_SEARCH_RESULT_ROW_HTML"
                  file="chromeos/os_settings_search_box/os_search_result_row.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_SETTINGS_SEARCH_BOX_JS"
                  file="chromeos/os_settings_search_box/os_settings_search_box.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_SETTINGS_SEARCH_BOX_HTML"
                  file="chromeos/os_settings_search_box/os_settings_search_box.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_TOOLBAR_JS"
                  file="chromeos/os_toolbar/os_toolbar.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_TOOLBAR_HTML"
                  file="chromeos/os_toolbar/os_toolbar.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_HTML"
                  file="chromeos/os_people_page/os_people_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_JS"
                  file="chromeos/os_people_page/os_people_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_SYNC_BROWSER_PROXY_HTML"
                  file="chromeos/os_people_page/os_sync_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_SYNC_BROWSER_PROXY_JS"
                  file="chromeos/os_people_page/os_sync_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_SYNC_CONTROLS_JS"
                  file="chromeos/os_people_page/os_sync_controls.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_OS_SYNC_CONTROLS_HTML"
                  file="chromeos/os_people_page/os_sync_controls.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_SIGNOUT_DIALOG_HTML"
                  file="people_page/signout_dialog.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_SIGNOUT_DIALOG_JS"
                  file="people_page/signout_dialog.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_PROFILE_INFO_BROWSER_PROXY_HTML"
                  file="people_page/profile_info_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_PROFILE_INFO_BROWSER_PROXY_JS"
                  file="people_page/profile_info_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_SYNC_BROWSER_PROXY_HTML"
                  file="people_page/sync_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_SYNC_BROWSER_PROXY_JS"
                  file="people_page/sync_browser_proxy.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PREF_UTIL_HTML"
                  file="prefs/pref_util.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PREF_UTIL_JS"
                  file="prefs/pref_util.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PREFS_HTML"
                  file="prefs/prefs.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PREFS_JS"
                  file="prefs/prefs.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PREFS_BEHAVIOR_HTML"
                  file="prefs/prefs_behavior.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PREFS_BEHAVIOR_JS"
                  file="prefs/prefs_behavior.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PREFS_TYPES_HTML"
                  file="prefs/prefs_types.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PREFS_TYPES_JS"
                  file="prefs/prefs_types.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PRINTING_PAGE_HTML"
                  file="chromeos/os_printing_page/os_printing_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PRINTING_PAGE_JS"
                  file="chromeos/os_printing_page/os_printing_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTER_TYPES_HTML"
                  file="chromeos/os_printing_page/cups_printer_types.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTER_TYPES_JS"
                  file="chromeos/os_printing_page/cups_printer_types.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTER_SHARED_CSS_HTML"
                  file="chromeos/os_printing_page/cups_printer_shared_css.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTING_PAGE_HTML"
                  file="chromeos/os_printing_page/cups_printers.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTING_PAGE_JS"
                  file="chromeos/os_printing_page/cups_printers.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_BROWSER_PROXY_HTML"
                  file="chromeos/os_printing_page/cups_printers_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_BROWSER_PROXY_JS"
                  file="chromeos/os_printing_page/cups_printers_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_HTML"
                  file="chromeos/os_printing_page/cups_printers_entry.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_JS"
                  file="chromeos/os_printing_page/cups_printers_entry.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_LIST_BEHAVIOR_HTML"
                  file="chromeos/os_printing_page/cups_printers_entry_list_behavior.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_LIST_BEHAVIOR_JS"
                  file="chromeos/os_printing_page/cups_printers_entry_list_behavior.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_MANAGER_HTML"
                  file="chromeos/os_printing_page/cups_printers_entry_manager.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_MANAGER_JS"
                  file="chromeos/os_printing_page/cups_printers_entry_manager.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_EDIT_PRINTER_DIALOG_HTML"
                  file="chromeos/os_printing_page/cups_edit_printer_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_EDIT_PRINTER_DIALOG_JS"
                  file="chromeos/os_printing_page/cups_edit_printer_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CUPS_SETTINGS_ADD_PRINTER_DIALOG_HTML"
+                 file="chromeos/os_printing_page/cups_settings_add_printer_dialog.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CUPS_SETTINGS_ADD_PRINTER_DIALOG_JS"
+                 file="chromeos/os_printing_page/cups_settings_add_printer_dialog.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_DIALOG_HTML"
                  file="chromeos/os_printing_page/cups_add_printer_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_DIALOG_JS"
                  file="chromeos/os_printing_page/cups_add_printer_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_DIALOG_ELEMENTS_HTML"
-                 file="chromeos/os_printing_page/cups_add_printer_dialog_elements.html"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_DIALOG_ELEMENTS_JS"
-                 file="chromeos/os_printing_page/cups_add_printer_dialog_elements.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINT_SERVER_DIALOG_HTML"
+                 file="chromeos/os_printing_page/cups_add_print_server_dialog.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINT_SERVER_DIALOG_JS"
+                 file="chromeos/os_printing_page/cups_add_print_server_dialog.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CUPS_PRINTER_DIALOG_ERROR_HTML"
+                 file="chromeos/os_printing_page/cups_printer_dialog_error.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CUPS_PRINTER_DIALOG_ERROR_JS"
+                 file="chromeos/os_printing_page/cups_printer_dialog_error.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_MANUFACTURER_MODEL_DIALOG_HTML"
+                 file="chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_MANUFACTURER_MODEL_DIALOG_JS"
+                 file="chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_MANUALLY_DIALOG_HTML"
+                 file="chromeos/os_printing_page/cups_add_printer_manually_dialog.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_MANUALLY_DIALOG_JS"
+                 file="chromeos/os_printing_page/cups_add_printer_manually_dialog.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTER_DIALOG_UTIL_HTML"
                  file="chromeos/os_printing_page/cups_printer_dialog_util.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_PRINTER_DIALOG_UTIL_JS"
                  file="chromeos/os_printing_page/cups_printer_dialog_util.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_SAVED_PRINTERS_HTML"
                  file="chromeos/os_printing_page/cups_saved_printers.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_SAVED_PRINTERS_JS"
                  file="chromeos/os_printing_page/cups_saved_printers.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_NEARBY_PRINTERS_HTML"
                  file="chromeos/os_printing_page/cups_nearby_printers.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CUPS_NEARBY_PRINTERS_JS"
                  file="chromeos/os_printing_page/cups_nearby_printers.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_PAGE_VISIBILITY_HTML"
                  file="chromeos/os_page_visibility.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_PAGE_VISIBILITY_JS"
                  file="chromeos/os_page_visibility.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <!-- TODO(jamescook): Remove after sync settings is forked. -->
       <structure name="IDR_OS_SETTINGS_PERSONALIZATION_OPTIONS_HTML"
                  file="privacy_page/personalization_options.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PERSONALIZATION_OPTIONS_JS"
                  file="privacy_page/personalization_options.js"
                  preprocess="true"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <!-- TODO(jamescook): Remove after sync settings is forked. -->
       <structure name="IDR_OS_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_HTML"
                  file="privacy_page/privacy_page_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_JS"
                  file="privacy_page/privacy_page_browser_proxy.js"
                  preprocess="true"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_PRIVACY_PAGE_HTML"
                  file="chromeos/os_privacy_page/os_privacy_page.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  flattenhtml="true"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_OS_PRIVACY_PAGE_JS"
                  file="chromeos/os_privacy_page/os_privacy_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_ROUTE_HTML"
                  file="chromeos/os_route.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_OS_ROUTE_JS"
                  file="chromeos/os_route.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ROUTER_HTML"
                  file="router.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ROUTER_JS"
                  file="router.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ROUTE_ORIGIN_BEHAVIOR_HTML"
                  file="chromeos/route_origin_behavior.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ROUTE_ORIGIN_BEHAVIOR_JS"
                  file="chromeos/route_origin_behavior.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SEARCH_ENGINES_BROWSER_PROXY_JS"
                  file="search_engines_page/search_engines_browser_proxy.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_SEARCH_ENGINES_BROWSER_PROXY_HTML"
                  file="search_engines_page/search_engines_browser_proxy.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_GOOGLE_ASSISTANT_PAGE_GOOGLE_ASSISTANT_PAGE_JS"
                  file="chromeos/google_assistant_page/google_assistant_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_GOOGLE_ASSISTANT_PAGE_GOOGLE_ASSISTANT_PAGE_HTML"
                  file="chromeos/google_assistant_page/google_assistant_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_GOOGLE_ASSISTANT_PAGE_GOOGLE_ASSISTANT_BROWSER_PROXY_JS"
                  file="chromeos/google_assistant_page/google_assistant_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_GOOGLE_ASSISTANT_PAGE_GOOGLE_ASSISTANT_BROWSER_PROXY_HTML"
                  file="chromeos/google_assistant_page/google_assistant_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SEARCH_PAGE_JS"
                  file="chromeos/os_search_page/os_search_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SEARCH_PAGE_HTML"
                  file="chromeos/os_search_page/os_search_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SYNC_CONTROLS_JS"
                  file="people_page/sync_controls.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_SYNC_CONTROLS_HTML"
                  file="people_page/sync_controls.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <!-- TODO(jamescook): Remove when SplitSettingsSync is the default. -->
       <structure name="IDR_OS_SETTINGS_SYNC_ENCRYPTION_OPTIONS_JS"
                  file="people_page/sync_encryption_options.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SYNC_ENCRYPTION_OPTIONS_HTML"
                  file="people_page/sync_encryption_options.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SYNC_PAGE_JS"
                  file="people_page/sync_page.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_SYNC_PAGE_HTML"
                  file="people_page/sync_page.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_ACCOUNT_CONTROL_HTML"
                   file="people_page/sync_account_control.html"
-                  type="chrome_html"
+                  compress="false" type="chrome_html"
                   flattenhtml="true"
                   allowexternalscript="true" />
       <structure name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_ACCOUNT_CONTROL_JS"
                   file="people_page/sync_account_control.js"
-                  type="chrome_html"
+                  compress="false" type="chrome_html"
                   preprocess="true" />
       <structure name="IDR_OS_SETTINGS_SETTINGS_HTML"
                  file="chromeos/os_settings.html"
                  preprocess="true"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LAZY_LOAD_HTML"
                  file="chromeos/lazy_load.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ANDROID_APPS_SUBPAGE_HTML"
                  file="chromeos/os_apps_page/android_apps_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ANDROID_APPS_SUBPAGE_JS"
                  file="chromeos/os_apps_page/android_apps_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_ANDROID_APPS_BROWSER_PROXY_JS"
                  file="chromeos/os_apps_page/android_apps_browser_proxy.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_ANDROID_APPS_BROWSER_PROXY_HTML"
                  file="chromeos/os_apps_page/android_apps_browser_proxy.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_PAGE_HTML"
                  file="chromeos/crostini_page/crostini_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_PAGE_JS"
                  file="chromeos/crostini_page/crostini_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_SUBPAGE_HTML"
                  file="chromeos/crostini_page/crostini_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_SUBPAGE_JS"
                  file="chromeos/crostini_page/crostini_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_ARC_ADB_HTML"
                  file="chromeos/crostini_page/crostini_arc_adb.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_ARC_ADB_JS"
                  file="chromeos/crostini_page/crostini_arc_adb.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_DIALOG_HTML"
                  file="chromeos/crostini_page/crostini_arc_adb_confirmation_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_ARC_ADB_CONFIRMATION_DIALOG_JS"
                  file="chromeos/crostini_page/crostini_arc_adb_confirmation_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_DISK_RESIZE_DIALOG_HTML"
                  file="chromeos/crostini_page/crostini_disk_resize_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_DISK_RESIZE_DIALOG_JS"
                  file="chromeos/crostini_page/crostini_disk_resize_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CROSTINI_DISK_RESIZE_CONFIRMATION_DIALOG_HTML"
+                 file="chromeos/crostini_page/crostini_disk_resize_confirmation_dialog.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CROSTINI_DISK_RESIZE_CONFIRMATION_DIALOG_JS"
+                 file="chromeos/crostini_page/crostini_disk_resize_confirmation_dialog.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_EXPORT_IMPORT_HTML"
                  file="chromeos/crostini_page/crostini_export_import.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_EXPORT_IMPORT_JS"
                  file="chromeos/crostini_page/crostini_export_import.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_PORT_FORWARDING_HTML"
                   file="chromeos/crostini_page/crostini_port_forwarding.html"
-                  type="chrome_html" />
+                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_PORT_FORWARDING_ADD_PORT_DIALOG_HTML"
                   file="chromeos/crostini_page/crostini_port_forwarding_add_port_dialog.html"
-                  type="chrome_html" />
+                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_PORT_FORWARDING_ADD_PORT_DIALOG_JS"
                   file="chromeos/crostini_page/crostini_port_forwarding_add_port_dialog.js"
-                  type="chrome_html" />
+                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_PORT_FORWARDING_JS"
                   file="chromeos/crostini_page/crostini_port_forwarding.js"
-                  type="chrome_html" />
+                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_MIC_SHARING_DIALOG_HTML"
                  file="chromeos/crostini_page/crostini_mic_sharing_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_MIC_SHARING_DIALOG_JS"
                  file="chromeos/crostini_page/crostini_mic_sharing_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_SHARED_PATHS_HTML"
                  file="chromeos/crostini_page/crostini_shared_paths.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_SHARED_PATHS_JS"
                  file="chromeos/crostini_page/crostini_shared_paths.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_SHARED_USB_DEVICES_HTML"
                  file="chromeos/crostini_page/crostini_shared_usb_devices.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_SHARED_USB_DEVICES_JS"
                  file="chromeos/crostini_page/crostini_shared_usb_devices.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_BROWSER_PROXY_JS"
                  file="chromeos/crostini_page/crostini_browser_proxy.js"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_CROSTINI_BROWSER_PROXY_HTML"
                  file="chromeos/crostini_page/crostini_browser_proxy.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_SETTINGS_CROSTINI_IMPORT_CONFIRMATION_DIALOG_HTML"
                  file="chromeos/crostini_page/crostini_import_confirmation_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_SETTINGS_CROSTINI_IMPORT_CONFIRMATION_DIALOG_JS"
                  file="chromeos/crostini_page/crostini_import_confirmation_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_HTML"
                  file="chromeos/bluetooth_page/bluetooth_device_list_item.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_JS"
                  file="chromeos/bluetooth_page/bluetooth_device_list_item.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_BLUETOOTH_PAGE_HTML"
                  file="chromeos/bluetooth_page/bluetooth_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_BLUETOOTH_PAGE_JS"
                  file="chromeos/bluetooth_page/bluetooth_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_BLUETOOTH_SUBPAGE_HTML"
                  file="chromeos/bluetooth_page/bluetooth_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_BLUETOOTH_SUBPAGE_JS"
                  file="chromeos/bluetooth_page/bluetooth_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DATE_TIME_PAGE_HTML"
                  file="chromeos/date_time_page/date_time_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DATE_TIME_PAGE_JS"
                  file="chromeos/date_time_page/date_time_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DATE_TIME_TYPES_HTML"
                  file="chromeos/date_time_page/date_time_types.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_DATE_TIME_TYPES_JS"
                  file="chromeos/date_time_page/date_time_types.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_TIMEZONE_SELECTOR_HTML"
                  file="chromeos/date_time_page/timezone_selector.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_TIMEZONE_SELECTOR_JS"
                  file="chromeos/date_time_page/timezone_selector.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_TIMEZONE_SUBPAGE_HTML"
                  file="chromeos/date_time_page/timezone_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_TIMEZONE_SUBPAGE_JS"
                  file="chromeos/date_time_page/timezone_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_CONFIG_HTML"
                  file="chromeos/internet_page/internet_config.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_CONFIG_JS"
                  file="chromeos/internet_page/internet_config.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_DETAIL_PAGE_HTML"
                  file="chromeos/internet_page/internet_detail_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_DETAIL_PAGE_JS"
                  file="chromeos/internet_page/internet_detail_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_KNOWN_NETWORKS_PAGE_HTML"
                  file="chromeos/internet_page/internet_known_networks_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_KNOWN_NETWORKS_PAGE_JS"
                  file="chromeos/internet_page/internet_known_networks_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_PAGE_BROWSER_PROXY_HTML"
                  file="chromeos/internet_page/internet_page_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_PAGE_BROWSER_PROXY_JS"
                  file="chromeos/internet_page/internet_page_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_PAGE_HTML"
                  file="chromeos/internet_page/internet_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_PAGE_JS"
                  file="chromeos/internet_page/internet_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_SHARED_CSS_HTML"
                  file="chromeos/internet_page/internet_shared_css.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_SUBPAGE_HTML"
                  file="chromeos/internet_page/internet_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_SUBPAGE_JS"
                  file="chromeos/internet_page/internet_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_BROWSER_PROXY_HTML"
                  file="chromeos/multidevice_page/multidevice_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_BROWSER_PROXY_JS"
                  file="chromeos/multidevice_page/multidevice_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_CONSTANTS_HTML"
                  file="chromeos/multidevice_page/multidevice_constants.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_CONSTANTS_JS"
                  file="chromeos/multidevice_page/multidevice_constants.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_BEHAVIOR_HTML"
                  file="chromeos/multidevice_page/multidevice_feature_behavior.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_BEHAVIOR_JS"
                  file="chromeos/multidevice_page/multidevice_feature_behavior.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_ITEM_HTML"
                  file="chromeos/multidevice_page/multidevice_feature_item.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_ITEM_JS"
                  file="chromeos/multidevice_page/multidevice_feature_item.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_TOGGLE_HTML"
                  file="chromeos/multidevice_page/multidevice_feature_toggle.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_FEATURE_TOGGLE_JS"
                  file="chromeos/multidevice_page/multidevice_feature_toggle.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_PAGE_HTML"
                  file="chromeos/multidevice_page/multidevice_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_PAGE_JS"
                  file="chromeos/multidevice_page/multidevice_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_RADIO_BUTTON_HTML"
                  file="chromeos/multidevice_page/multidevice_radio_button.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_RADIO_BUTTON_JS"
                  file="chromeos/multidevice_page/multidevice_radio_button.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_SMARTLOCK_SUBPAGE_HTML"
                  file="chromeos/multidevice_page/multidevice_smartlock_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_SMARTLOCK_SUBPAGE_JS"
                  file="chromeos/multidevice_page/multidevice_smartlock_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_SUBPAGE_HTML"
                  file="chromeos/multidevice_page/multidevice_subpage.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_SUBPAGE_JS"
                  file="chromeos/multidevice_page/multidevice_subpage.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_TETHER_ITEM_HTML"
                  file="chromeos/multidevice_page/multidevice_tether_item.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_TETHER_ITEM_JS"
                  file="chromeos/multidevice_page/multidevice_tether_item.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NETWORK_PROXY_SECTION_HTML"
                  file="chromeos/internet_page/network_proxy_section.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NETWORK_PROXY_SECTION_JS"
                  file="chromeos/internet_page/network_proxy_section.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NETWORK_SUMMARY_HTML"
                  file="chromeos/internet_page/network_summary.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NETWORK_SUMMARY_JS"
                  file="chromeos/internet_page/network_summary.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NETWORK_SUMMARY_ITEM_HTML"
                  file="chromeos/internet_page/network_summary_item.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NETWORK_SUMMARY_ITEM_JS"
                  file="chromeos/internet_page/network_summary_item.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_TETHER_CONNECTION_DIALOG_HTML"
                  file="chromeos/internet_page/tether_connection_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_TETHER_CONNECTION_DIALOG_JS"
                  file="chromeos/internet_page/tether_connection_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PARENTAL_CONTROLS_BROWSER_PROXY_HTML"
                  file="chromeos/parental_controls_page/parental_controls_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PARENTAL_CONTROLS_BROWSER_PROXY_JS"
                  file="chromeos/parental_controls_page/parental_controls_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PARENTAL_CONTROLS_PAGE_HTML"
                  file="chromeos/parental_controls_page/parental_controls_page.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PARENTAL_CONTROLS_PAGE_JS"
                  file="chromeos/parental_controls_page/parental_controls_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_ACCOUNT_MANAGER_HTML"
                  file="chromeos/os_people_page/account_manager.html"
-                 type="chrome_html"/>
+                 compress="false" type="chrome_html"/>
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_ACCOUNT_MANAGER_JS"
                  file="chromeos/os_people_page/account_manager.js"
-                 type="chrome_html"/>
+                 compress="false" type="chrome_html"/>
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_ACCOUNT_MANAGER_BROWSER_PROXY_HTML"
                  file="people_page/account_manager_browser_proxy.html"
-                 type="chrome_html"/>
+                 compress="false" type="chrome_html"/>
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_ACCOUNT_MANAGER_BROWSER_PROXY_JS"
                  file="people_page/account_manager_browser_proxy.js"
-                 type="chrome_html"/>
+                 compress="false" type="chrome_html"/>
       <structure name="IDR_OS_SETTINGS_PERSONALIZATION_PAGE_CHANGE_PICTURE_HTML"
                  file="chromeos/personalization_page/change_picture.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PERSONALIZATION_PAGE_CHANGE_PICTURE_JS"
                  file="chromeos/personalization_page/change_picture.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PERSONALIZATION_PAGE_CHANGE_PICTURE_BROWSER_PROXY_JS"
                  file="chromeos/personalization_page/change_picture_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PERSONALIZATION_PAGE_CHANGE_PICTURE_BROWSER_PROXY_HTML"
                  file="chromeos/personalization_page/change_picture_browser_proxy.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_KERBEROS_ACCOUNTS_HTML"
                  file="chromeos/os_people_page/kerberos_accounts.html"
-                 type="chrome_html"/>
+                 compress="false" type="chrome_html"/>
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_KERBEROS_ACCOUNTS_JS"
                  file="chromeos/os_people_page/kerberos_accounts.js"
-                 type="chrome_html"/>
+                 compress="false" type="chrome_html"/>
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_KERBEROS_ADD_ACCOUNT_DIALOG_HTML"
                  file="chromeos/os_people_page/kerberos_add_account_dialog.html"
-                 type="chrome_html"/>
+                 compress="false" type="chrome_html"/>
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_KERBEROS_ADD_ACCOUNT_DIALOG_JS"
                  file="chromeos/os_people_page/kerberos_add_account_dialog.js"
-                 type="chrome_html"/>
+                 compress="false" type="chrome_html"/>
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_KEREROS_ACCOUNTS_BROWSER_PROXY_HTML"
                  file="chromeos/os_people_page/kerberos_accounts_browser_proxy.html"
-                 type="chrome_html"/>
+                 compress="false" type="chrome_html"/>
       <structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_KEREROS_ACCOUNTS_BROWSER_PROXY_JS"
                  file="chromeos/os_people_page/kerberos_accounts_browser_proxy.js"
-                 type="chrome_html"/>
+                 compress="false" type="chrome_html"/>
       <structure name="IDR_OS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_PROMPT_DIALOG_JS"
                  file="chromeos/os_people_page/lock_screen_password_prompt_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_PROMPT_DIALOG_HTML"
                  file="chromeos/os_people_page/lock_screen_password_prompt_dialog.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_LOCK_SCREEN_JS"
                  file="chromeos/os_people_page/lock_screen.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_LOCK_SCREEN_HTML"
                  file="chromeos/os_people_page/lock_screen.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_LOCK_STATE_BEHAVIOR_JS"
                  file="chromeos/os_people_page/lock_state_behavior.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_LOCK_STATE_BEHAVIOR_HTML"
                  file="chromeos/os_people_page/lock_state_behavior.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"
                  file="chromeos/os_people_page/setup_pin_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"
                  file="chromeos/os_people_page/setup_pin_dialog.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_FINGERPRINT_LIST_JS"
                  file="chromeos/os_people_page/fingerprint_list.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_FINGERPRINT_LIST_HTML"
                  file="chromeos/os_people_page/fingerprint_list.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_SETUP_FINGERPRINT_DIALOG_JS"
                  file="chromeos/os_people_page/setup_fingerprint_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_SETUP_FINGERPRINT_DIALOG_HTML"
                  file="chromeos/os_people_page/setup_fingerprint_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_FINGERPRINT_BROWSER_PROXY_JS"
                  file="chromeos/os_people_page/fingerprint_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_PEOPLE_FINGERPRINT_BROWSER_PROXY_HTML"
                  file="chromeos/os_people_page/fingerprint_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_PLUGIN_VM_PAGE_HTML"
-                 file="chromeos/plugin_vm_page/plugin_vm_page.html"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_PLUGIN_VM_PAGE_JS"
-                 file="chromeos/plugin_vm_page/plugin_vm_page.js"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_PLUGIN_VM_SHARED_PATHS_HTML"
-                 file="chromeos/plugin_vm_page/plugin_vm_shared_paths.html"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_PLUGIN_VM_SHARED_PATHS_JS"
-                 file="chromeos/plugin_vm_page/plugin_vm_shared_paths.js"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_PLUGIN_VM_SUBPAGE_HTML"
-                 file="chromeos/plugin_vm_page/plugin_vm_subpage.html"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_PLUGIN_VM_SUBPAGE_JS"
-                 file="chromeos/plugin_vm_page/plugin_vm_subpage.js"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_PLUGIN_VM_BROWSER_PROXY_JS"
-                 file="chromeos/plugin_vm_page/plugin_vm_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_PLUGIN_VM_BROWSER_PROXY_HTML"
-                 file="chromeos/plugin_vm_page/plugin_vm_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_PLUGIN_VM_REMOVE_CONFIRMATION_DIALOG_JS"
-                 file="chromeos/plugin_vm_page/plugin_vm_remove_confirmation_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_PLUGIN_VM_REMOVE_CONFIRMATION_DIALOG_HTML"
-                 file="chromeos/plugin_vm_page/plugin_vm_remove_confirmation_dialog.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"
                  file="chromeos/os_people_page/users_add_user_dialog.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"
                  file="chromeos/os_people_page/users_add_user_dialog.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_USERS_PAGE_USER_LIST_JS"
                  file="chromeos/os_people_page/user_list.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_USERS_PAGE_USER_LIST_HTML"
                  file="chromeos/os_people_page/user_list.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_USERS_PAGE_JS"
                  file="chromeos/os_people_page/users_page.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_USERS_PAGE_HTML"
                  file="chromeos/os_people_page/users_page.html"
-                 type="chrome_html"
+                 compress="false" type="chrome_html"
                  preprocess="true" />
       <structure name="IDR_OS_SETTINGS_WALLPAPER_BROWSER_PROXY_HTML"
                  file="chromeos/personalization_page/wallpaper_browser_proxy.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_WALLPAPER_BROWSER_PROXY_JS"
                  file="chromeos/personalization_page/wallpaper_browser_proxy.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_METRICS_RECORDER_HTML"
                  file="chromeos/metrics_recorder.html"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_METRICS_RECORDER_JS"
                  file="chromeos/metrics_recorder.js"
-                 type="chrome_html" />
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_SEARCH_HANDLER_HTML"
+                 file="chromeos/search_handler.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_SEARCH_HANDLER_JS"
+                 file="chromeos/search_handler.js"
+                 compress="false" type="chrome_html" />
     </structures>
   </release>
 </grit>
diff --git a/chromium/chrome/browser/resources/settings/os_settings_resources_vulcanized.grd b/chromium/chrome/browser/resources/settings/os_settings_resources_vulcanized.grd
index 4518589cb40..88da13ccd00 100644
--- a/chromium/chrome/browser/resources/settings/os_settings_resources_vulcanized.grd
+++ b/chromium/chrome/browser/resources/settings/os_settings_resources_vulcanized.grd
@@ -43,6 +43,16 @@
                type="BINDATA"
                compress="gzip" />
 
+      <!-- Constants -->
+      <include name="IDR_OS_SETTINGS_ROUTES_MOJOM_LITE_JS"
+               file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\constants\routes.mojom-lite.js"
+               use_base_dir="false"
+               type="BINDATA" />
+      <include name="IDR_OS_SETTINGS_SETTING_MOJOM_LITE_JS"
+               file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\constants\setting.mojom-lite.js"
+               use_base_dir="false"
+               type="BINDATA" />
+
       <!-- App Management -->
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_BITMAP_MOJO_LITE_JS"
                file="${root_gen_dir}\skia\public\mojom\bitmap.mojom-lite.js"
diff --git a/chromium/chrome/browser/resources/settings/people_page/BUILD.gn b/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
index 526c7543251..efc53f2116e 100644
--- a/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
@@ -3,13 +3,13 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/html_to_js.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../settings.gni")
 
 js_type_check("closure_compile") {
   deps = [
-    ":people_page",
     ":profile_info_browser_proxy",
     ":signout_dialog",
     ":sync_account_control",
@@ -19,15 +19,6 @@ js_type_check("closure_compile") {
     ":sync_page",
   ]
 
-  if (!is_chromeos) {
-    deps += [
-      ":import_data_browser_proxy",
-      ":import_data_dialog",
-      ":manage_profile",
-      ":manage_profile_browser_proxy",
-    ]
-  }
-
   if (is_chromeos) {
     deps += [ ":account_manager_browser_proxy" ]
   }
@@ -37,50 +28,6 @@ js_library("account_manager_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr" ]
 }
 
-js_library("import_data_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-}
-
-js_library("manage_profile") {
-  deps = [
-    ":manage_profile_browser_proxy",
-    ":sync_browser_proxy",
-    "..:route",
-    "..:router",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("manage_profile_browser_proxy") {
-  deps = [
-    "//ui/webui/resources/cr_elements/cr_profile_avatar_selector:cr_profile_avatar_selector",
-    "//ui/webui/resources/js:cr",
-  ]
-}
-
-js_library("people_page") {
-  deps = [
-    ":profile_info_browser_proxy",
-    ":signout_dialog",
-    ":sync_browser_proxy",
-    "..:open_window_proxy",
-    "..:page_visibility",
-    "..:route",
-    "..:router",
-    "../settings_page:settings_animated_pages",
-    "//ui/webui/resources/cr_components/chromeos/quick_unlock:lock_screen_constants",
-    "//ui/webui/resources/cr_elements/chromeos/cr_picture:png",
-    "//ui/webui/resources/cr_elements/cr_toast:cr_toast",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:icon",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}
-
 js_library("profile_info_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr" ]
 }
@@ -103,8 +50,6 @@ js_library("sync_page") {
     ":sync_account_control",
     ":sync_browser_proxy",
     ":sync_encryption_options",
-    "..:page_visibility",
-    "..:router",
     "../settings_page:settings_animated_pages",
     "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button",
     "//ui/webui/resources/cr_elements/cr_input:cr_input",
@@ -128,16 +73,6 @@ js_library("sync_controls") {
   deps = [ "..:router" ]
 }
 
-js_library("import_data_dialog") {
-  deps = [
-    ":import_data_browser_proxy",
-    "../controls:settings_checkbox",
-    "../prefs:prefs_behavior",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
 js_library("sync_account_control") {
   deps = [
     ":profile_info_browser_proxy",
@@ -163,9 +98,10 @@ js_library("sync_encryption_options") {
 
 js_type_check("closure_compile_module") {
   is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":account_manager_browser_proxy.m",
-    ":people_page.m",
+    ":people_page",
     ":profile_info_browser_proxy.m",
     ":signout_dialog.m",
     ":sync_account_control.m",
@@ -177,10 +113,10 @@ js_type_check("closure_compile_module") {
 
   if (!is_chromeos) {
     deps += [
-      ":import_data_browser_proxy.m",
-      ":import_data_dialog.m",
-      ":manage_profile.m",
-      ":manage_profile_browser_proxy.m",
+      ":import_data_browser_proxy",
+      ":import_data_dialog",
+      ":manage_profile",
+      ":manage_profile_browser_proxy",
     ]
   }
 }
@@ -192,59 +128,50 @@ js_library("account_manager_browser_proxy.m") {
 }
 
 if (!is_chromeos) {
-  js_library("import_data_browser_proxy.m") {
-    sources = [ "$root_gen_dir/chrome/browser/resources/settings/people_page/import_data_browser_proxy.m.js" ]
+  js_library("import_data_browser_proxy") {
     deps = [ "//ui/webui/resources/js:cr.m" ]
     externs_list = [ "$externs_path/metrics_private.js" ]
-    extra_deps = [ ":modulize" ]
   }
 
-  js_library("import_data_dialog.m") {
-    sources = [ "$root_gen_dir/chrome/browser/resources/settings/people_page/import_data_dialog.m.js" ]
+  js_library("import_data_dialog") {
     deps = [
-      ":import_data_browser_proxy.m",
-      "../controls:settings_checkbox.m",
+      ":import_data_browser_proxy",
+      "../controls:settings_checkbox",
       "../prefs:prefs_behavior.m",
       "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
       "//ui/webui/resources/js:i18n_behavior.m",
       "//ui/webui/resources/js:web_ui_listener_behavior.m",
     ]
-    extra_deps = [ ":import_data_dialog_module" ]
   }
 
-  js_library("manage_profile.m") {
-    sources = [ "$root_gen_dir/chrome/browser/resources/settings/people_page/manage_profile.m.js" ]
+  js_library("manage_profile") {
     deps = [
-      ":manage_profile_browser_proxy.m",
+      ":manage_profile_browser_proxy",
       ":sync_browser_proxy.m",
-      "..:i18n_setup.m",
-      "..:route.m",
+      "..:i18n_setup",
+      "..:route",
       "..:router.m",
       "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     ]
-    extra_deps = [ ":manage_profile_module" ]
   }
 
-  js_library("manage_profile_browser_proxy.m") {
-    sources = [ "$root_gen_dir/chrome/browser/resources/settings/people_page/manage_profile_browser_proxy.m.js" ]
+  js_library("manage_profile_browser_proxy") {
     deps = [
       "//ui/webui/resources/cr_elements/cr_profile_avatar_selector:cr_profile_avatar_selector.m",
       "//ui/webui/resources/js:cr.m",
     ]
-    extra_deps = [ ":modulize" ]
   }
 }
 
-js_library("people_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/people_page/people_page.m.js" ]
+js_library("people_page") {
   deps = [
     ":account_manager_browser_proxy.m",
     ":profile_info_browser_proxy.m",
     ":sync_browser_proxy.m",
-    "..:i18n_setup.m",
-    "..:open_window_proxy.m",
-    "..:page_visibility.m",
-    "..:route.m",
+    "..:i18n_setup",
+    "..:open_window_proxy",
+    "..:page_visibility",
+    "..:route",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/chromeos/cr_picture:png.m",
@@ -254,7 +181,6 @@ js_library("people_page.m") {
     "//ui/webui/resources/js:icon.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":people_page_module" ]
 }
 
 js_library("profile_info_browser_proxy.m") {
@@ -268,7 +194,7 @@ js_library("signout_dialog.m") {
   deps = [
     ":profile_info_browser_proxy.m",
     ":sync_browser_proxy.m",
-    "..:i18n_setup.m",
+    "..:i18n_setup",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
@@ -280,7 +206,7 @@ js_library("sync_account_control.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/people_page/sync_account_control.m.js" ]
   deps = [
     ":sync_browser_proxy.m",
-    "..:i18n_setup.m",
+    "..:i18n_setup",
     "..:router.m",
     "../prefs:prefs_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -301,7 +227,7 @@ js_library("sync_controls.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/people_page/sync_controls.m.js" ]
   deps = [
     ":sync_browser_proxy.m",
-    "..:i18n_setup.m",
+    "..:i18n_setup",
     "..:router.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
@@ -323,7 +249,7 @@ js_library("sync_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/people_page/sync_page.m.js" ]
   deps = [
     ":sync_browser_proxy.m",
-    "..:i18n_setup.m",
+    "..:i18n_setup",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
@@ -336,69 +262,32 @@ js_library("sync_page.m") {
 group("polymer3_elements") {
   public_deps = [
     ":modulize",
-    ":people_page_module",
     ":signout_dialog_module",
     ":sync_account_control_module",
     ":sync_controls_module",
     ":sync_encryption_options_module",
     ":sync_page_module",
+    ":web_components",
   ]
+}
+
+html_to_js("web_components") {
+  js_files = [ "people_page.js" ]
 
   if (!is_chromeos) {
-    public_deps += [
-      ":import_data_dialog_module",
-      ":manage_profile_module",
+    js_files += [
+      "import_data_dialog.js",
+      "manage_profile.js",
     ]
   }
 }
 
-polymer_modulizer("import_data_dialog") {
-  js_file = "import_data_dialog.js"
-  html_file = "import_data_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/people_page/import_data_browser_proxy.html|ImportDataBrowserProxy,ImportDataBrowserProxyImpl,ImportDataStatus,BrowserProfile" ]
-}
-
-polymer_modulizer("manage_profile") {
-  js_file = "manage_profile.js"
-  html_file = "manage_profile.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/people_page/manage_profile_browser_proxy.html|ManageProfileBrowserProxy,ManageProfileBrowserProxyImpl,ProfileShortcutStatus",
-                   "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncStatus",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Router,RouteObserverBehavior",
-                   "ui/webui/resources/cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector.html|AvatarIcon",
-                 ]
-}
-
-polymer_modulizer("people_page") {
-  js_file = "people_page.js"
-  html_file = "people_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/open_window_proxy.html|OpenWindowProxyImpl",
-                   "chrome/browser/resources/settings/router.html|Router,RouteObserverBehavior",
-                   "ui/webui/resources/cr_elements/chromeos/cr_picture/png.html|convertImageSequenceToPng",
-                   "ui/webui/resources/html/assert.html|assert",
-                   "ui/webui/resources/html/cr.html|isChromeOS",
-                   "ui/webui/resources/html/icon.html|getImage",
-                   "chrome/browser/resources/settings/page_visibility.html|PageVisibility",
-                   "chrome/browser/resources/settings/people_page/account_manager_browser_proxy.html|AccountManagerBrowserProxyImpl",
-                   "chrome/browser/resources/settings/people_page/profile_info_browser_proxy.html|ProfileInfoBrowserProxyImpl,ProfileInfoBrowserProxy,ProfileInfo",
-                   "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxyImpl,SyncBrowserProxy,SyncStatus,StoredAccount",
-                 ]
-}
-
 polymer_modulizer("signout_dialog") {
   js_file = "signout_dialog.js"
   html_file = "signout_dialog.html"
   html_type = "dom-module"
   namespace_rewrites = settings_namespace_rewrites
+  migrated_imports = settings_migrated_imports
   auto_imports = settings_auto_imports + [
                    "chrome/browser/resources/settings/people_page/profile_info_browser_proxy.html|ProfileInfoBrowserProxyImpl",
                    "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxyImpl,SyncStatus",
@@ -410,9 +299,10 @@ polymer_modulizer("sync_account_control") {
   html_file = "sync_account_control.html"
   html_type = "dom-module"
   namespace_rewrites = settings_namespace_rewrites
+  migrated_imports = settings_migrated_imports
   auto_imports = settings_auto_imports + [
                    "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxy,SyncBrowserProxyImpl,SyncStatus,StatusAction,StoredAccount",
-                   "chrome/browser/resources/settings/router.html|Router",
+                   "chrome/browser/resources/settings/router.html|Route,Router",
                    "ui/webui/resources/html/assert.html|assert",
                  ]
 }
@@ -422,6 +312,7 @@ polymer_modulizer("sync_controls") {
   html_file = "sync_controls.html"
   html_type = "dom-module"
   namespace_rewrites = settings_namespace_rewrites
+  migrated_imports = settings_migrated_imports
   auto_imports = settings_auto_imports + [
                    "chrome/browser/resources/settings/router.html|Router,RouteObserverBehavior",
                    "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxy,SyncBrowserProxyImpl,StatusAction,SyncStatus,SyncPrefs",
@@ -445,9 +336,10 @@ polymer_modulizer("sync_page") {
   html_file = "sync_page.html"
   html_type = "dom-module"
   namespace_rewrites = settings_namespace_rewrites
+  migrated_imports = settings_migrated_imports
   auto_imports = settings_auto_imports + [
                    "ui/webui/resources/html/polymer.html|Polymer,html,flush",
-                   "chrome/browser/resources/settings/router.html|Router,RouteObserverBehavior",
+                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
                    "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxy,SyncBrowserProxyImpl,PageStatus,StatusAction,SyncStatus,SyncPrefs",
                    "ui/webui/resources/html/assert.html|assert,assertNotReached",
                  ]
@@ -460,12 +352,5 @@ js_modulizer("modulize") {
     "sync_browser_proxy.js",
   ]
 
-  if (!is_chromeos) {
-    input_files += [
-      "import_data_browser_proxy.js",
-      "manage_profile_browser_proxy.js",
-    ]
-  }
-
   namespace_rewrites = settings_namespace_rewrites
 }
diff --git a/chromium/chrome/browser/resources/settings/printing_page/BUILD.gn b/chromium/chrome/browser/resources/settings/printing_page/BUILD.gn
index 751b4e43c85..e7fa5f2ee31 100644
--- a/chromium/chrome/browser/resources/settings/printing_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/printing_page/BUILD.gn
@@ -3,11 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":cloud_printers",
     ":printing_page",
@@ -19,88 +20,28 @@ js_type_check("closure_compile") {
 }
 
 js_library("cloud_printers") {
-}
-
-js_library("printing_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-}
-
-js_library("printing_page") {
-  deps = [
-    ":printing_browser_proxy",
-    "..:route",
-    "..:router",
-    "../settings_page:settings_animated_pages",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":cloud_printers.m",
-    ":printing_page.m",
-  ]
-
-  if (!is_chromeos) {
-    deps += [ ":printing_browser_proxy.m" ]
-  }
-}
-
-js_library("cloud_printers.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/printing_page/cloud_printers.m.js" ]
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  extra_deps = [ ":cloud_printers_module" ]
 }
 
-js_library("printing_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/printing_page/printing_browser_proxy.m.js" ]
+js_library("printing_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("printing_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/printing_page/printing_page.m.js" ]
+js_library("printing_page") {
   deps = [
-    ":printing_browser_proxy.m",
-    "..:route.m",
+    ":printing_browser_proxy",
+    "..:route",
     "..:router.m",
     "../settings_page:settings_animated_pages.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  extra_deps = [ ":printing_page_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":cloud_printers_module",
-    ":printing_page_module",
+html_to_js("web_components") {
+  js_files = [
+    "cloud_printers.js",
+    "printing_page.js",
   ]
-
-  if (!is_chromeos) {
-    public_deps += [ ":modulize" ]
-  }
-}
-
-polymer_modulizer("cloud_printers") {
-  js_file = "cloud_printers.js"
-  html_file = "cloud_printers.html"
-  html_type = "dom-module"
-}
-
-polymer_modulizer("printing_page") {
-  js_file = "printing_page.js"
-  html_file = "printing_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Router",
-                 ]
-}
-
-js_modulizer("modulize") {
-  input_files = [ "printing_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
 }
diff --git a/chromium/chrome/browser/resources/settings/privacy_page/BUILD.gn b/chromium/chrome/browser/resources/settings/privacy_page/BUILD.gn
index 414008552b4..c8b89afc3b5 100644
--- a/chromium/chrome/browser/resources/settings/privacy_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/privacy_page/BUILD.gn
@@ -3,72 +3,24 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/html_to_js.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../settings.gni")
 
 js_type_check("closure_compile") {
   deps = [
-    ":collapse_radio_button",
-    ":cookies_page",
-    ":disable_safebrowsing_dialog",
-    ":do_not_track_toggle",
-    ":passwords_leak_detection_toggle",
     ":personalization_options",
-    ":privacy_page",
     ":privacy_page_browser_proxy",
-    ":safe_browsing_browser_proxy",
-    ":secure_dns",
-    ":secure_dns_input",
-    ":security_keys_bio_enroll_dialog",
-    ":security_keys_credential_management_dialog",
-    ":security_keys_reset_dialog",
-    ":security_keys_set_pin_dialog",
-    ":security_keys_subpage",
-    ":security_page",
-  ]
-}
-
-js_library("collapse_radio_button") {
-  deps = [
-    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button_behavior",
-    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator",
-  ]
-}
-
-js_library("cookies_page") {
-  deps = [
-    "..:metrics_browser_proxy",
-    "..:route",
-    "..:router",
-    "../prefs:prefs_behavior",
-    "../site_settings:constants",
-    "../site_settings:site_settings_prefs_browser_proxy",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}
-
-js_library("disable_safebrowsing_dialog") {
-  deps = [ "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog" ]
-}
-
-js_library("do_not_track_toggle") {
-  deps = [
-    "..:metrics_browser_proxy",
-    "../controls:settings_toggle_button",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
   ]
 }
 
 js_library("personalization_options") {
   deps = [
     ":privacy_page_browser_proxy",
-    "..:page_visibility",
     "..:router",
     "../controls:settings_toggle_button",
+    "../people_page:signout_dialog",
     "../people_page:sync_browser_proxy",
     "../prefs:prefs_behavior",
     "//ui/webui/resources/js:load_time_data",
@@ -77,16 +29,6 @@ js_library("personalization_options") {
   externs_list = [ "$externs_path/settings_private.js" ]
 }
 
-js_library("passwords_leak_detection_toggle") {
-  deps = [
-    "../people_page:sync_browser_proxy",
-    "../prefs:prefs_behavior",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
 js_library("privacy_page_browser_proxy") {
   deps = [
     "..:lifetime_browser_proxy",
@@ -95,239 +37,106 @@ js_library("privacy_page_browser_proxy") {
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
 
-js_library("privacy_page") {
-  deps = [
-    ":privacy_page_browser_proxy",
-    "..:hats_browser_proxy",
-    "..:metrics_browser_proxy",
-    "..:page_visibility",
-    "..:route",
-    "..:router",
-    "../controls:settings_toggle_button",
-    "../people_page:signout_dialog",
-    "../people_page:sync_browser_proxy",
-    "../settings_page:settings_animated_pages",
-    "../site_settings:constants",
-    "../site_settings:site_data_details_subpage",
-    "../site_settings:site_settings_prefs_browser_proxy",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("safe_browsing_browser_proxy") {
-  deps = [
-    "../site_settings:site_settings_prefs_browser_proxy",
-    "//ui/webui/resources/js:cr",
-  ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
-js_library("secure_dns") {
-  deps = [
-    ":privacy_page_browser_proxy",
-    "../prefs:prefs_behavior",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("secure_dns_input") {
-  deps = [
-    ":privacy_page_browser_proxy",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("security_keys_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
-js_library("security_keys_subpage") {
-  deps = [
-    ":security_keys_browser_proxy",
-    "..:router",
-    "../settings_page:settings_animated_pages",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("security_keys_set_pin_dialog") {
-  deps = [
-    ":security_keys_browser_proxy",
-    "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("security_keys_pin_field") {
-  deps = [ "//ui/webui/resources/js:i18n_behavior" ]
-}
-
-js_library("security_keys_credential_management_dialog") {
-  deps = [
-    ":security_keys_browser_proxy",
-    ":security_keys_pin_field",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("security_keys_reset_dialog") {
-  deps = [
-    ":security_keys_browser_proxy",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("security_keys_bio_enroll_dialog") {
-  deps = [
-    ":security_keys_browser_proxy",
-    ":security_keys_pin_field",
-    "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
-    "//ui/webui/resources/cr_elements/cr_fingerprint:cr_fingerprint_progress_arc",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("security_page") {
-  deps = [
-    ":disable_safebrowsing_dialog",
-    ":privacy_page_browser_proxy",
-    ":safe_browsing_browser_proxy",
-    "..:metrics_browser_proxy",
-    "..:route",
-    "..:router",
-    "../people_page:sync_browser_proxy",
-    "../prefs:prefs_behavior",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}
-
 js_type_check("closure_compile_module") {
   is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
-    ":collapse_radio_button.m",
-    ":cookies_page.m",
-    ":disable_safebrowsing_dialog.m",
-    ":do_not_track_toggle.m",
-    ":passwords_leak_detection_toggle.m",
+    ":collapse_radio_button",
+    ":cookies_page",
+    ":disable_safebrowsing_dialog",
+    ":do_not_track_toggle",
+    ":passwords_leak_detection_toggle",
     ":personalization_options.m",
-    ":privacy_page.m",
+    ":privacy_page",
     ":privacy_page_browser_proxy.m",
-    ":safe_browsing_browser_proxy.m",
-    ":secure_dns.m",
-    ":secure_dns_input.m",
-    ":security_keys_bio_enroll_dialog.m",
-    ":security_keys_browser_proxy.m",
-    ":security_keys_credential_management_dialog.m",
-    ":security_keys_pin_field.m",
-    ":security_keys_reset_dialog.m",
-    ":security_keys_set_pin_dialog.m",
-    ":security_keys_subpage.m",
-    ":security_page.m",
+    ":safe_browsing_browser_proxy",
+    ":secure_dns",
+    ":secure_dns_input",
+    ":security_keys_bio_enroll_dialog",
+    ":security_keys_browser_proxy",
+    ":security_keys_credential_management_dialog",
+    ":security_keys_pin_field",
+    ":security_keys_reset_dialog",
+    ":security_keys_set_pin_dialog",
+    ":security_keys_subpage",
+    ":security_page",
   ]
 }
 
-js_library("cookies_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/cookies_page.m.js" ]
+js_library("cookies_page") {
   deps = [
-    "..:metrics_browser_proxy.m",
-    "..:route.m",
+    ":collapse_radio_button",
+    "..:metrics_browser_proxy",
+    "..:route",
     "..:router.m",
+    "../controls:settings_toggle_button.m",
     "../prefs:prefs_behavior.m",
-    "../site_settings:site_settings_prefs_browser_proxy.m",
+    "../site_settings:site_list",
+    "../site_settings:site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":cookies_page_module" ]
 }
 
-js_library("collapse_radio_button.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/collapse_radio_button.m.js" ]
+js_library("collapse_radio_button") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button_behavior.m",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
   ]
-  extra_deps = [ ":collapse_radio_button_module" ]
 }
 
-js_library("secure_dns.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/secure_dns.m.js" ]
+js_library("secure_dns") {
   deps = [
     ":privacy_page_browser_proxy.m",
-    "..:i18n_setup.m",
+    "..:i18n_setup",
     "../prefs:prefs_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":secure_dns_module" ]
 }
 
-js_library("secure_dns_input.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/secure_dns_input.m.js" ]
+js_library("secure_dns_input") {
   deps = [
     ":privacy_page_browser_proxy.m",
-    "..:i18n_setup.m",
+    "..:i18n_setup",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  extra_deps = [ ":secure_dns_input_module" ]
 }
 
-js_library("disable_safebrowsing_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.m.js" ]
+js_library("disable_safebrowsing_dialog") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
   ]
-  extra_deps = [ ":disable_safebrowsing_dialog_module" ]
 }
 
-js_library("do_not_track_toggle.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/do_not_track_toggle.m.js" ]
+js_library("do_not_track_toggle") {
   deps = [
-    "..:metrics_browser_proxy.m",
+    "..:metrics_browser_proxy",
     "../controls:settings_toggle_button.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  extra_deps = [ ":do_not_track_toggle_module" ]
 }
 
-js_library("passwords_leak_detection_toggle.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/passwords_leak_detection_toggle.m.js" ]
+js_library("passwords_leak_detection_toggle") {
   deps = [
-    "..:metrics_browser_proxy.m",
+    "..:metrics_browser_proxy",
     "../people_page:sync_browser_proxy.m",
     "../prefs:prefs_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":passwords_leak_detection_toggle_module" ]
 }
 
 js_library("personalization_options.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/personalization_options.m.js" ]
   deps = [
     ":privacy_page_browser_proxy.m",
-    "..:i18n_setup.m",
+    "..:i18n_setup",
     "..:lifetime_browser_proxy.m",
     "../controls:settings_toggle_button.m",
     "../people_page:signout_dialog.m",
@@ -339,29 +148,27 @@ js_library("personalization_options.m") {
   extra_deps = [ ":personalization_options_module" ]
 }
 
-js_library("privacy_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/privacy_page.m.js" ]
+js_library("privacy_page") {
   deps = [
     ":privacy_page_browser_proxy.m",
-    "..:hats_browser_proxy.m",
-    "..:i18n_setup.m",
-    "..:metrics_browser_proxy.m",
-    "..:page_visibility.m",
-    "..:route.m",
+    "..:hats_browser_proxy",
+    "..:i18n_setup",
+    "..:metrics_browser_proxy",
+    "..:page_visibility",
+    "..:route",
     "..:router.m",
     "../controls:settings_toggle_button.m",
     "../people_page:sync_browser_proxy.m",
     "../prefs:prefs_behavior.m",
-    "../site_settings:constants.m",
-    "../site_settings:site_data_details_subpage.m",
-    "../site_settings:site_settings_prefs_browser_proxy.m",
+    "../site_settings:constants",
+    "../site_settings:site_data_details_subpage",
+    "../site_settings:site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  extra_deps = [ ":privacy_page_module" ]
 }
 
 js_library("privacy_page_browser_proxy.m") {
@@ -370,20 +177,17 @@ js_library("privacy_page_browser_proxy.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("safe_browsing_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/safe_browsing_browser_proxy.m.js" ]
+js_library("safe_browsing_browser_proxy") {
   deps = [
-    "../site_settings:site_settings_prefs_browser_proxy.m",
+    "../site_settings:site_settings_prefs_browser_proxy",
     "//ui/webui/resources/js:cr.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("security_keys_bio_enroll_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/security_keys_bio_enroll_dialog.m.js" ]
+js_library("security_keys_bio_enroll_dialog") {
   deps = [
-    ":security_keys_browser_proxy.m",
-    ":security_keys_pin_field.m",
+    ":security_keys_browser_proxy",
+    ":security_keys_pin_field",
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_fingerprint:cr_fingerprint_progress_arc.m",
@@ -391,78 +195,64 @@ js_library("security_keys_bio_enroll_dialog.m") {
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":security_keys_bio_enroll_dialog_module" ]
 }
 
-js_library("security_keys_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/security_keys_browser_proxy.m.js" ]
+js_library("security_keys_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("security_keys_credential_management_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/security_keys_credential_management_dialog.m.js" ]
+js_library("security_keys_credential_management_dialog") {
   deps = [
-    ":security_keys_browser_proxy.m",
-    ":security_keys_pin_field.m",
+    ":security_keys_browser_proxy",
+    ":security_keys_pin_field",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":security_keys_credential_management_dialog_module" ]
 }
 
-js_library("security_keys_pin_field.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/security_keys_pin_field.m.js" ]
+js_library("security_keys_pin_field") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  extra_deps = [ ":security_keys_pin_field_module" ]
 }
 
-js_library("security_keys_reset_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/security_keys_reset_dialog.m.js" ]
+js_library("security_keys_reset_dialog") {
   deps = [
-    ":security_keys_browser_proxy.m",
+    ":security_keys_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  extra_deps = [ ":security_keys_reset_dialog_module" ]
 }
 
-js_library("security_keys_set_pin_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/security_keys_set_pin_dialog.m.js" ]
+js_library("security_keys_set_pin_dialog") {
   deps = [
-    ":security_keys_browser_proxy.m",
+    ":security_keys_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  extra_deps = [ ":security_keys_set_pin_dialog_module" ]
 }
 
-js_library("security_keys_subpage.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/security_keys_subpage.m.js" ]
+js_library("security_keys_subpage") {
   deps = [
-    "..:i18n_setup.m",
+    "..:i18n_setup",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
   ]
-  extra_deps = [ ":security_keys_subpage_module" ]
 }
 
-js_library("security_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/security_page.m.js" ]
+js_library("security_page") {
   deps = [
-    ":disable_safebrowsing_dialog.m",
+    ":disable_safebrowsing_dialog",
     ":privacy_page_browser_proxy.m",
-    ":safe_browsing_browser_proxy.m",
-    "..:i18n_setup.m",
-    "..:metrics_browser_proxy.m",
-    "..:route.m",
+    ":safe_browsing_browser_proxy",
+    "..:i18n_setup",
+    "..:metrics_browser_proxy",
+    "..:route",
     "..:router.m",
     "../people_page:sync_browser_proxy.m",
     "../prefs:prefs_behavior.m",
@@ -470,101 +260,34 @@ js_library("security_page.m") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  extra_deps = [ ":security_page_module" ]
 }
 
 group("polymer3_elements") {
   public_deps = [
-    ":collapse_radio_button_module",
-    ":cookies_page_module",
-    ":disable_safebrowsing_dialog_module",
-    ":do_not_track_toggle_module",
     ":modulize",
-    ":passwords_leak_detection_toggle_module",
     ":personalization_options_module",
-    ":privacy_page_module",
-    ":secure_dns_input_module",
-    ":secure_dns_module",
-    ":security_keys_bio_enroll_dialog_module",
-    ":security_keys_credential_management_dialog_module",
-    ":security_keys_pin_field_module",
-    ":security_keys_reset_dialog_module",
-    ":security_keys_set_pin_dialog_module",
-    ":security_keys_subpage_module",
-    ":security_page_module",
+    ":v3_ready_elements",
   ]
 }
 
-polymer_modulizer("cookies_page") {
-  js_file = "cookies_page.js"
-  html_file = "cookies_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Router",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|SiteSettingsPrefsBrowserProxy,SiteSettingsPrefsBrowserProxyImpl,ContentSettingProvider,CookieControlsManagedState,DefaultContentSetting",
-                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSettingsTypes,SiteSettingSource,CookieControlsMode,ContentSetting",
-                   "ui/webui/resources/html/assert.html|assert",
-                   "chrome/browser/resources/settings/metrics_browser_proxy.html|PrivacyElementInteractions,MetricsBrowserProxy,MetricsBrowserProxyImpl",
-                 ]
-}
-
-polymer_modulizer("collapse_radio_button") {
-  js_file = "collapse_radio_button.js"
-  html_file = "collapse_radio_button.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "ui/webui/resources/cr_elements/policy/cr_policy_indicator_behavior.html|CrPolicyIndicatorType",
-                   "ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button_behavior.html|CrRadioButtonBehavior",
-                 ]
-}
-
-polymer_modulizer("disable_safebrowsing_dialog") {
-  js_file = "disable_safebrowsing_dialog.js"
-  html_file = "disable_safebrowsing_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports
-}
-
-polymer_modulizer("secure_dns") {
-  js_file = "secure_dns.js"
-  html_file = "secure_dns.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.html|PrivacyPageBrowserProxy,PrivacyPageBrowserProxyImpl,SecureDnsUiManagementMode,SecureDnsMode,ResolverOption,SecureDnsSetting",
-                   "ui/webui/resources/html/assert.html|assertNotReached",
-                 ]
-}
-
-polymer_modulizer("secure_dns_input") {
-  js_file = "secure_dns_input.js"
-  html_file = "secure_dns_input.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.html|PrivacyPageBrowserProxy,PrivacyPageBrowserProxyImpl" ]
-}
-
-polymer_modulizer("do_not_track_toggle") {
-  js_file = "do_not_track_toggle.js"
-  html_file = "do_not_track_toggle.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/metrics_browser_proxy.html|PrivacyElementInteractions,MetricsBrowserProxyImpl" ]
-}
-
-polymer_modulizer("passwords_leak_detection_toggle") {
-  js_file = "passwords_leak_detection_toggle.js"
-  html_file = "passwords_leak_detection_toggle.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxyImpl,SyncStatus,StoredAccount",
-                   "chrome/browser/resources/settings/metrics_browser_proxy.html|PrivacyElementInteractions,MetricsBrowserProxyImpl",
-                 ]
+html_to_js("v3_ready_elements") {
+  js_files = [
+    "collapse_radio_button.js",
+    "cookies_page.js",
+    "disable_safebrowsing_dialog.js",
+    "do_not_track_toggle.js",
+    "passwords_leak_detection_toggle.js",
+    "privacy_page.js",
+    "secure_dns.js",
+    "secure_dns_input.js",
+    "security_keys_bio_enroll_dialog.js",
+    "security_keys_credential_management_dialog.js",
+    "security_keys_pin_field.js",
+    "security_keys_reset_dialog.js",
+    "security_keys_set_pin_dialog.js",
+    "security_keys_subpage.js",
+    "security_page.js",
+  ]
 }
 
 polymer_modulizer("personalization_options") {
@@ -572,6 +295,7 @@ polymer_modulizer("personalization_options") {
   html_file = "personalization_options.html"
   html_type = "dom-module"
   namespace_rewrites = settings_namespace_rewrites
+  migrated_imports = settings_migrated_imports
   auto_imports = settings_auto_imports + [
                    "chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.html|PrivacyPageBrowserProxy,PrivacyPageBrowserProxyImpl,MetricsReporting",
                    "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|StatusAction,SyncStatus",
@@ -579,108 +303,7 @@ polymer_modulizer("personalization_options") {
                  ]
 }
 
-polymer_modulizer("privacy_page") {
-  js_file = "privacy_page.js"
-  html_file = "privacy_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "ui/webui/resources/html/assert.html|assert",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/metrics_browser_proxy.html|PrivacyElementInteractions,MetricsBrowserProxyImpl",
-                   "chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.html|PrivacyPageBrowserProxy,PrivacyPageBrowserProxyImpl",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|SiteSettingsPrefsBrowserProxyImpl",
-                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSettingsTypes,CookieControlsMode,ChooserType",
-                   "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxyImpl,SyncStatus",
-                   "chrome/browser/resources/settings/hats_browser_proxy.html|HatsBrowserProxyImpl",
-                   "chrome/browser/resources/settings/page_visibility.html|PrivacyPageVisibility",
-                   "chrome/browser/resources/settings/router.html|RouteObserverBehavior,Router",
-                 ]
-}
-
-polymer_modulizer("security_keys_bio_enroll_dialog") {
-  js_file = "security_keys_bio_enroll_dialog.js"
-  html_file = "security_keys_bio_enroll_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/privacy_page/security_keys_browser_proxy.html|SecurityKeysBioEnrollProxy,SecurityKeysBioEnrollProxyImpl,Ctap2Status,SampleStatus,Enrollment,EnrollmentResponse,SampleResponse,",
-                   "ui/webui/resources/html/assert.html|assert,assertNotReached",
-                   "ui/webui/resources/html/polymer.html|afterNextRender,html,Polymer",
-                 ]
-}
-
-polymer_modulizer("security_keys_credential_management_dialog") {
-  js_file = "security_keys_credential_management_dialog.js"
-  html_file = "security_keys_credential_management_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/privacy_page/security_keys_browser_proxy.html|SecurityKeysCredentialBrowserProxy,SecurityKeysCredentialBrowserProxyImpl,Credential",
-                   "ui/webui/resources/html/assert.html|assert,assertNotReached",
-                 ]
-}
-
-polymer_modulizer("security_keys_pin_field") {
-  js_file = "security_keys_pin_field.js"
-  html_file = "security_keys_pin_field.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports =
-      settings_auto_imports +
-      [ "ui/webui/resources/html/polymer.html|afterNextRender,html,Polymer" ]
-}
-
-polymer_modulizer("security_keys_reset_dialog") {
-  js_file = "security_keys_reset_dialog.js"
-  html_file = "security_keys_reset_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/privacy_page/security_keys_browser_proxy.html|SecurityKeysResetBrowserProxy,SecurityKeysResetBrowserProxyImpl" ]
-}
-
-polymer_modulizer("security_keys_set_pin_dialog") {
-  js_file = "security_keys_set_pin_dialog.js"
-  html_file = "security_keys_set_pin_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/privacy_page/security_keys_browser_proxy.html|SecurityKeysPINBrowserProxy,SecurityKeysPINBrowserProxyImpl",
-                   "ui/webui/resources/html/polymer.html|afterNextRender,html,Polymer",
-                 ]
-}
-
-polymer_modulizer("security_keys_subpage") {
-  js_file = "security_keys_subpage.js"
-  html_file = "security_keys_subpage.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports =
-      settings_auto_imports + [ "ui/webui/resources/html/assert.html|assert" ]
-}
-
-polymer_modulizer("security_page") {
-  js_file = "security_page.js"
-  html_file = "security_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "ui/webui/resources/html/assert.html|assert",
-                   "chrome/browser/resources/settings/router.html|Router",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/metrics_browser_proxy.html|PrivacyElementInteractions,MetricsBrowserProxy,MetricsBrowserProxyImpl",
-                   "chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.html|PrivacyPageBrowserProxy,PrivacyPageBrowserProxyImpl",
-                   "chrome/browser/resources/settings/privacy_page/safe_browsing_browser_proxy.html|SafeBrowsingBrowserProxy,SafeBrowsingBrowserProxyImpl,SafeBrowsingRadioManagedState",
-                   "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncStatus",
-                 ]
-}
-
 js_modulizer("modulize") {
-  input_files = [
-    "privacy_page_browser_proxy.js",
-    "safe_browsing_browser_proxy.js",
-    "security_keys_browser_proxy.js",
-  ]
-
+  input_files = [ "privacy_page_browser_proxy.js" ]
   namespace_rewrites = settings_namespace_rewrites
 }
diff --git a/chromium/chrome/browser/resources/settings/reset_page/BUILD.gn b/chromium/chrome/browser/resources/settings/reset_page/BUILD.gn
index 31c4ec6700d..c3285ca5844 100644
--- a/chromium/chrome/browser/resources/settings/reset_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/reset_page/BUILD.gn
@@ -3,11 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":reset_browser_proxy",
     ":reset_page",
@@ -16,146 +17,47 @@ js_type_check("closure_compile") {
   ]
 }
 
-js_library("reset_page") {
-  deps = [
-    ":reset_profile_dialog",
-    "..:route",
-    "..:router",
-    "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}
-
 js_library("reset_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
-js_library("reset_profile_dialog") {
-  deps = [
-    ":reset_browser_proxy",
-    "..:route",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("reset_profile_banner") {
-  deps = [
-    ":reset_browser_proxy",
-    "..:route",
-    "..:router",
-    "//ui/webui/resources/cr_elements/cr_dialog",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":reset_browser_proxy.m",
-    ":reset_page.m",
-    ":reset_profile_banner.m",
-    ":reset_profile_dialog.m",
-  ]
-}
-
-js_library("reset_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/reset_page/reset_browser_proxy.m.js" ]
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("reset_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/reset_page/reset_page.m.js" ]
+js_library("reset_page") {
   deps = [
-    ":reset_profile_dialog.m",
-    "..:route.m",
+    ":reset_profile_dialog",
+    "..:route",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render.m",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":reset_page_module" ]
 }
 
-js_library("reset_profile_banner.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/reset_page/reset_profile_banner.m.js" ]
+js_library("reset_profile_banner") {
   deps = [
-    ":reset_browser_proxy.m",
-    "..:route.m",
+    ":reset_browser_proxy",
+    "..:route",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
   ]
-  extra_deps = [ ":reset_profile_banner_module" ]
 }
 
-js_library("reset_profile_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/reset_page/reset_profile_dialog.m.js" ]
+js_library("reset_profile_dialog") {
   deps = [
-    ":reset_browser_proxy.m",
-    "..:route.m",
+    ":reset_browser_proxy",
+    "..:route",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":reset_profile_dialog_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":modulize",
-    ":reset_page_module",
-    ":reset_profile_banner_module",
-    ":reset_profile_dialog_module",
+html_to_js("web_components") {
+  js_files = [
+    "reset_page.js",
+    "reset_profile_banner.js",
+    "reset_profile_dialog.js",
   ]
 }
-
-polymer_modulizer("reset_page") {
-  js_file = "reset_page.js"
-  html_file = "reset_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "ui/webui/resources/html/assert.html|assert",
-                   "chrome/browser/resources/settings/reset_page/reset_browser_proxy.html|ResetBrowserProxyImpl",
-                   "chrome/browser/resources/settings/router.html|Router,Route,RouteObserverBehavior",
-                   "chrome/browser/resources/settings/route.html|routes",
-                 ]
-}
-
-polymer_modulizer("reset_profile_banner") {
-  js_file = "reset_profile_banner.js"
-  html_file = "reset_profile_banner.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/reset_page/reset_browser_proxy.html|ResetBrowserProxyImpl",
-                   "chrome/browser/resources/settings/router.html|Router",
-                   "chrome/browser/resources/settings/route.html|routes",
-                 ]
-}
-
-polymer_modulizer("reset_profile_dialog") {
-  js_file = "reset_profile_dialog.js"
-  html_file = "reset_profile_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/reset_page/reset_browser_proxy.html|ResetBrowserProxyImpl,ResetBrowserProxy",
-                   "chrome/browser/resources/settings/router.html|Router",
-                   "chrome/browser/resources/settings/route.html|routes",
-                 ]
-}
-
-js_modulizer("modulize") {
-  input_files = [ "reset_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
diff --git a/chromium/chrome/browser/resources/settings/safety_check_page/BUILD.gn b/chromium/chrome/browser/resources/settings/safety_check_page/BUILD.gn
index 539f64fd088..bbe3b9a0e4d 100644
--- a/chromium/chrome/browser/resources/settings/safety_check_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/safety_check_page/BUILD.gn
@@ -3,103 +3,109 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":safety_check_browser_proxy",
+    ":safety_check_child",
+    ":safety_check_extensions_element",
     ":safety_check_page",
-    "..:lifetime_browser_proxy",
+    ":safety_check_passwords_element",
+    ":safety_check_safe_browsing_element",
+    ":safety_check_updates_element",
+  ]
+}
+
+js_library("safety_check_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+}
+
+js_library("safety_check_child") {
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
+js_library("safety_check_extensions_element") {
+  deps = [
+    ":safety_check_child",
     "..:metrics_browser_proxy",
-    "../autofill_page:password_manager_proxy",
+    "..:open_window_proxy",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
 }
 
 js_library("safety_check_page") {
   deps = [
     ":safety_check_browser_proxy",
+    ":safety_check_extensions_element",
+    ":safety_check_passwords_element",
+    ":safety_check_safe_browsing_element",
+    ":safety_check_updates_element",
     "..:hats_browser_proxy",
-    "..:lifetime_browser_proxy",
     "..:metrics_browser_proxy",
-    "..:open_window_proxy",
-    "..:route",
-    "..:router",
     "../autofill_page:password_manager_proxy",
-    "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
+    "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
+    "//third_party/polymer/v3_0/components-chromium/iron-collapse:iron-collapse",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
 }
 
-js_library("safety_check_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
+js_library("safety_check_passwords_element") {
   deps = [
-    ":safety_check_browser_proxy.m",
-    ":safety_check_page.m",
+    ":safety_check_child",
+    "..:metrics_browser_proxy",
+    "..:route",
+    "..:router.m",
+    "../autofill_page:password_manager_proxy",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
 }
 
-js_library("safety_check_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/safety_check_page/safety_check_browser_proxy.m.js" ]
-  deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
-}
-
-js_library("safety_check_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/safety_check_page/safety_check_page.m.js" ]
+js_library("safety_check_safe_browsing_element") {
   deps = [
-    ":safety_check_browser_proxy.m",
-    "..:hats_browser_proxy.m",
-    "..:lifetime_browser_proxy.m",
-    "..:metrics_browser_proxy.m",
-    "..:open_window_proxy.m",
-    "..:route.m",
+    ":safety_check_child",
+    "..:metrics_browser_proxy",
+    "..:route",
     "..:router.m",
-    "../autofill_page:password_manager_proxy.m",
-    "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":safety_check_page_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":modulize",
-    ":safety_check_page_module",
+js_library("safety_check_updates_element") {
+  deps = [
+    ":safety_check_child",
+    "..:lifetime_browser_proxy.m",
+    "..:metrics_browser_proxy",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
 }
 
-polymer_modulizer("safety_check_page") {
-  js_file = "safety_check_page.js"
-  html_file = "safety_check_page.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Router",
-                   "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl,PasswordManagerProxy",
-                   "chrome/browser/resources/settings/lifetime_browser_proxy.html|LifetimeBrowserProxy,LifetimeBrowserProxyImpl",
-                   "chrome/browser/resources/settings/hats_browser_proxy.html|HatsBrowserProxyImpl",
-                   "chrome/browser/resources/settings/metrics_browser_proxy.html|SafetyCheckInteractions,MetricsBrowserProxy,MetricsBrowserProxyImpl",
-                   "chrome/browser/resources/settings/open_window_proxy.html|OpenWindowProxyImpl",
-                   "chrome/browser/resources/settings/safety_check_page/safety_check_browser_proxy.html|SafetyCheckBrowserProxy,SafetyCheckBrowserProxyImpl,SafetyCheckExtensionsStatus,SafetyCheckPasswordsStatus,SafetyCheckUpdatesStatus,SafetyCheckSafeBrowsingStatus,SafetyCheckCallbackConstants",
-                   "ui/webui/resources/html/assert.html|assertNotReached",
-                   "ui/webui/resources/html/polymer.html|Polymer,html,flush",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-js_modulizer("modulize") {
-  input_files = [ "safety_check_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
+html_to_js("web_components") {
+  js_files = [
+    "safety_check_child.js",
+    "safety_check_extensions_element.js",
+    "safety_check_page.js",
+    "safety_check_passwords_element.js",
+    "safety_check_safe_browsing_element.js",
+    "safety_check_updates_element.js",
+  ]
 }
diff --git a/chromium/chrome/browser/resources/settings/search_engines_page/BUILD.gn b/chromium/chrome/browser/resources/settings/search_engines_page/BUILD.gn
index 95e4d6c114e..8e4934f6d98 100644
--- a/chromium/chrome/browser/resources/settings/search_engines_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/search_engines_page/BUILD.gn
@@ -3,53 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../settings.gni")
 
 js_type_check("closure_compile") {
-  deps = [
-    ":omnibox_extension_entry",
-    ":search_engine_dialog",
-    ":search_engine_entry",
-    ":search_engines_browser_proxy",
-    ":search_engines_list",
-    ":search_engines_page",
-  ]
-}
-
-js_library("search_engine_dialog") {
-  deps = [
-    ":search_engines_browser_proxy",
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("search_engine_entry") {
-  deps = [
-    ":search_engines_browser_proxy",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:icon",
-    "//ui/webui/resources/js/cr/ui:focus_row_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}
-
-js_library("omnibox_extension_entry") {
-  deps = [
-    ":search_engines_browser_proxy",
-    "..:extension_control_browser_proxy",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:icon",
-    "//ui/webui/resources/js/cr/ui:focus_row_behavior",
-  ]
+  deps = [ ":search_engines_browser_proxy" ]
 }
 
 js_library("search_engines_browser_proxy") {
@@ -59,41 +18,20 @@ js_library("search_engines_browser_proxy") {
   ]
 }
 
-js_library("search_engines_list") {
-  deps = [
-    ":search_engines_browser_proxy",
-    "//ui/webui/resources/js:cr",
-  ]
-}
-
-js_library("search_engines_page") {
-  deps = [
-    ":search_engines_browser_proxy",
-    "..:global_scroll_target_behavior",
-    "..:route",
-    "//third_party/polymer/v1_0/components-chromium/iron-list:iron-list-extracted",
-    "//third_party/polymer/v1_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior-extracted",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}
-
 js_type_check("closure_compile_module") {
   is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
-    ":omnibox_extension_entry.m",
-    ":search_engine_dialog.m",
-    ":search_engine_entry.m",
+    ":omnibox_extension_entry",
+    ":search_engine_dialog",
+    ":search_engine_entry",
     ":search_engines_browser_proxy.m",
-    ":search_engines_list.m",
-    ":search_engines_page.m",
+    ":search_engines_list",
+    ":search_engines_page",
   ]
 }
 
-js_library("omnibox_extension_entry.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/search_engines_page/omnibox_extension_entry.m.js" ]
+js_library("omnibox_extension_entry") {
   deps = [
     ":search_engines_browser_proxy.m",
     "..:extension_control_browser_proxy.m",
@@ -102,23 +40,19 @@ js_library("omnibox_extension_entry.m") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
-  extra_deps = [ ":omnibox_extension_entry_module" ]
 }
 
-js_library("search_engine_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.m.js" ]
+js_library("search_engine_dialog") {
   deps = [
     ":search_engines_browser_proxy.m",
-    "..:i18n_setup.m",
+    "..:i18n_setup",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":search_engine_dialog_module" ]
 }
 
-js_library("search_engine_entry.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/search_engines_page/search_engine_entry.m.js" ]
+js_library("search_engine_entry") {
   deps = [
     ":search_engines_browser_proxy.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -126,7 +60,6 @@ js_library("search_engine_entry.m") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
-  extra_deps = [ ":search_engine_entry_module" ]
 }
 
 js_library("search_engines_browser_proxy.m") {
@@ -135,97 +68,41 @@ js_library("search_engines_browser_proxy.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("search_engines_list.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/search_engines_page/search_engines_list.m.js" ]
+js_library("search_engines_list") {
   deps = [
     ":search_engines_browser_proxy.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  extra_deps = [ ":search_engines_list_module" ]
 }
 
-js_library("search_engines_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/search_engines_page/search_engines_page.m.js" ]
+js_library("search_engines_page") {
   deps = [
     ":search_engines_browser_proxy.m",
     "..:global_scroll_target_behavior.m",
-    "..:settings_routes.m",
+    "..:settings_routes",
     "//third_party/polymer/v3_0/components-chromium/iron-list",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":search_engines_page_module" ]
 }
 
-group("polymer3_elements") {
+group("web_components") {
   public_deps = [
     ":modulize",
-    ":omnibox_extension_entry_module",
-    ":search_engine_dialog_module",
-    ":search_engine_entry_css_module",
-    ":search_engine_entry_module",
-    ":search_engines_list_module",
-    ":search_engines_page_module",
+    ":web_components_local",
   ]
 }
 
-polymer_modulizer("omnibox_extension_entry") {
-  js_file = "omnibox_extension_entry.js"
-  html_file = "omnibox_extension_entry.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.html|SearchEngine",
-                   "ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu.html|AnchorAlignment",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-}
-
-polymer_modulizer("search_engine_dialog") {
-  js_file = "search_engine_dialog.js"
-  html_file = "search_engine_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.html|SearchEnginesBrowserProxyImpl,SearchEnginesBrowserProxy,SearchEngine,SearchEnginesInfo" ]
-}
-
-polymer_modulizer("search_engine_entry") {
-  js_file = "search_engine_entry.js"
-  html_file = "search_engine_entry.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.html|SearchEnginesBrowserProxyImpl,SearchEnginesBrowserProxy,SearchEngine",
-                   "ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu.html|AnchorAlignment",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-}
-
-polymer_modulizer("search_engine_entry_css") {
-  js_file = "search_engine_entry_css.m.js"
-  html_file = "search_engine_entry_css.html"
-  html_type = "style-module"
-}
-
-polymer_modulizer("search_engines_list") {
-  js_file = "search_engines_list.js"
-  html_file = "search_engines_list.html"
-  html_type = "dom-module"
-  auto_imports = [ "chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.html|SearchEngine" ]
-}
-
-polymer_modulizer("search_engines_page") {
-  js_file = "search_engines_page.js"
-  html_file = "search_engines_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.html|SearchEnginesBrowserProxyImpl,SearchEngine,SearchEnginesInfo",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "ui/webui/resources/html/assert.html|assert",
-                   "ui/webui/resources/html/polymer.html|afterNextRender,html,Polymer",
-                 ]
+html_to_js("web_components_local") {
+  js_files = [
+    "omnibox_extension_entry.js",
+    "search_engine_dialog.js",
+    "search_engine_entry_css.js",
+    "search_engine_entry.js",
+    "search_engines_list.js",
+    "search_engines_page.js",
+  ]
 }
 
 js_modulizer("modulize") {
diff --git a/chromium/chrome/browser/resources/settings/search_page/BUILD.gn b/chromium/chrome/browser/resources/settings/search_page/BUILD.gn
index 8f902780a4d..19a32b66c7f 100644
--- a/chromium/chrome/browser/resources/settings/search_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/search_page/BUILD.gn
@@ -3,55 +3,26 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [ ":search_page" ]
 }
 
 js_library("search_page") {
   deps = [
     "..:route",
-    "..:router",
-    "../prefs",
-    "../search_engines_page:search_engines_browser_proxy",
-    "../settings_page:settings_animated_pages",
-    "//ui/webui/resources/js:cr",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [ ":search_page.m" ]
-}
-
-js_library("search_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/search_page/search_page.m.js" ]
-  deps = [
-    "..:route.m",
     "..:router.m",
     "../search_engines_page:search_engines_browser_proxy.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:cr.m",
   ]
-  extra_deps = [ ":search_page_module" ]
   externs_list = [ "$externs_path/settings_private.js" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [ ":search_page_module" ]
-}
-
-polymer_modulizer("search_page") {
-  js_file = "search_page.js"
-  html_file = "search_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = [
-    "chrome/browser/resources/settings/route.html|routes",
-    "chrome/browser/resources/settings/router.html|Router",
-    "chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.html|SearchEnginesBrowserProxyImpl,SearchEnginesBrowserProxy,SearchEngine",
-    "ui/webui/resources/html/cr.html|addWebUIListener",
-  ]
+html_to_js("web_components") {
+  js_files = [ "search_page.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/settings.gni b/chromium/chrome/browser/resources/settings/settings.gni
index e3ba931f4fc..48e79e57b99 100644
--- a/chromium/chrome/browser/resources/settings/settings.gni
+++ b/chromium/chrome/browser/resources/settings/settings.gni
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//third_party/closure_compiler/compile_js.gni")
+
 # Common namespace rewrites for all polymer_modulizer() or js_modulizer()
 # targets in Settings.
 settings_namespace_rewrites = [
@@ -96,6 +98,8 @@ settings_namespace_rewrites = [
   "settings.SafetyCheckBrowserProxy|SafetyCheckBrowserProxy",
   "settings.SafetyCheckCallbackConstants|SafetyCheckCallbackConstants",
   "settings.SafetyCheckExtensionsStatus|SafetyCheckExtensionsStatus",
+  "settings.SafetyCheckIconStatus|SafetyCheckIconStatus",
+  "settings.SafetyCheckParentStatus|SafetyCheckParentStatus",
   "settings.SafetyCheckPasswordsStatus|SafetyCheckPasswordsStatus",
   "settings.SafetyCheckSafeBrowsingStatus|SafetyCheckSafeBrowsingStatus",
   "settings.SafetyCheckUpdatesStatus|SafetyCheckUpdatesStatus",
@@ -132,5 +136,17 @@ settings_auto_imports = [
   "chrome/browser/resources/settings/prefs/prefs_behavior.html|PrefsBehavior",
   "chrome/browser/resources/settings/prefs/prefs_types.html|CrSettingsPrefs",
   "chrome/browser/resources/settings/printing_page/printing_browser_proxy.html|PrintingBrowserProxyImpl",
-  "chrome/browser/resources/settings/site_settings/site_settings_behavior.html|SiteSettingsBehavior",
+]
+
+settings_closure_flags =
+    default_closure_args + [
+      "js_module_root=../../chrome/browser/resources/settings/",
+      "js_module_root=./gen/chrome/browser/resources/settings/",
+    ]
+
+settings_migrated_imports = [
+  "chrome/browser/resources/settings/i18n_setup.html",
+  "chrome/browser/resources/settings/ensure_lazy_loaded.html",
+  "chrome/browser/resources/settings/settings_main/settings_main.html",
+  "chrome/browser/resources/settings/settings_menu/settings_menu.html",
 ]
diff --git a/chromium/chrome/browser/resources/settings/settings_main/BUILD.gn b/chromium/chrome/browser/resources/settings/settings_main/BUILD.gn
index 19101578cb4..acd8b51d278 100644
--- a/chromium/chrome/browser/resources/settings/settings_main/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/settings_main/BUILD.gn
@@ -3,10 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [ ":settings_main" ]
 }
 
@@ -14,54 +16,18 @@ js_library("settings_main") {
   deps = [
     "..:page_visibility",
     "..:route",
-    "..:router",
-    "..:search_settings",
-    "../about_page",
-    "../basic_page:basic_page",
-    "../settings_page:main_page_behavior",
-    "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [ ":settings_main.m" ]
-}
-
-js_library("settings_main.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/settings_main/settings_main.m.js" ]
-  deps = [
-    "..:page_visibility.m",
-    "..:route.m",
     "..:router.m",
     "..:search_settings.m",
-    "../about_page:about_page.m",
+    "../about_page:about_page",
     "../about_page:about_page_browser_proxy.m",
-    "../basic_page:basic_page.m",
+    "../basic_page:basic_page",
     "../settings_page:main_page_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":settings_main_module" ]
-}
-
-group("polymer3_elements") {
-  public_deps = [ ":settings_main_module" ]
 }
 
-polymer_modulizer("settings_main") {
-  js_file = "settings_main.js"
-  html_file = "settings_main.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/about_page/about_page_browser_proxy.html|AboutPageBrowserProxyImpl",
-                   "chrome/browser/resources/settings/page_visibility.html|PageVisibility",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
-                   "ui/webui/resources/html/assert.html|assert,assertNotReached",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
+html_to_js("web_components") {
+  js_files = [ "settings_main.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/settings_menu/BUILD.gn b/chromium/chrome/browser/resources/settings/settings_menu/BUILD.gn
index 94d054eae0c..c19f01c1bba 100644
--- a/chromium/chrome/browser/resources/settings/settings_menu/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/settings_menu/BUILD.gn
@@ -3,50 +3,25 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [ ":settings_menu" ]
 }
 
 js_library("settings_menu") {
   deps = [
     "..:page_visibility",
-    "..:router",
-    "//third_party/polymer/v1_0/components-chromium/paper-ripple:paper-ripple-extracted",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [ ":settings_menu.m" ]
-}
-
-js_library("settings_menu.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/settings_menu/settings_menu.m.js" ]
-  deps = [
-    "..:page_visibility.m",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":settings_menu_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [ ":settings_menu_module" ]
-}
-
-polymer_modulizer("settings_menu") {
-  js_file = "settings_menu.js"
-  html_file = "settings_menu.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = [
-    "chrome/browser/resources/settings/page_visibility.html|PageVisibility",
-    "chrome/browser/resources/settings/router.html|RouteObserverBehavior,Router,Route",
-    "ui/webui/resources/html/assert.html|assert",
-  ]
+html_to_js("web_components") {
+  js_files = [ "settings_menu.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn b/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
index e8a15f26d84..fda50ecb1e5 100644
--- a/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
@@ -144,6 +144,7 @@ polymer_modulizer("settings_subpage") {
   js_file = "settings_subpage.js"
   html_file = "settings_subpage.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
   auto_imports = settings_auto_imports + [
                    "chrome/browser/resources/settings/router.html|RouteObserverBehavior,Router",
                    "third_party/polymer/v1_0/components-chromium/iron-resizable-behavior/iron-resizable-behavior.html|IronResizableBehavior",
diff --git a/chromium/chrome/browser/resources/settings/settings_resources.grd b/chromium/chrome/browser/resources/settings/settings_resources.grd
index 27b17e0fb2a..fcb4816318b 100644
--- a/chromium/chrome/browser/resources/settings/settings_resources.grd
+++ b/chromium/chrome/browser/resources/settings/settings_resources.grd
@@ -15,1220 +15,54 @@
       <part file="settings_resources_v3.grdp" />
     </includes>
     <structures>
-      <structure name="IDR_SETTINGS_A11Y_PAGE_JS"
-                 file="a11y_page/a11y_page.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_A11Y_PAGE_HTML"
-                 file="a11y_page/a11y_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
-
-      <if expr="not is_macosx and not chromeos">
-        <structure name="IDR_SETTINGS_CAPTIONS_SUBPAGE_HTML"
-                   file="a11y_page/captions_subpage.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_CAPTIONS_SUBPAGE_JS"
-                   file="a11y_page/captions_subpage.js"
-                   type="chrome_html" />
-      </if>
-      <if expr="is_win or is_macosx">
-        <structure name="IDR_SETTINGS_CAPTIONS_BROWSER_PROXY_HTML"
-                   file="a11y_page/captions_browser_proxy.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_CAPTIONS_BROWSER_PROXY_JS"
-                   file="a11y_page/captions_browser_proxy.js"
-                   type="chrome_html" />
-      </if>
-      <structure name="IDR_SETTINGS_ABOUT_PAGE_BROWSER_PROXY_HTML"
-                 file="about_page/about_page_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ABOUT_PAGE_BROWSER_PROXY_JS"
-                 file="about_page/about_page_browser_proxy.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_ABOUT_PAGE_JS"
-                 file="about_page/about_page.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_ABOUT_PAGE_HTML"
-                 file="about_page/about_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_ADD_SITE_DIALOG_HTML"
-                 file="site_settings/add_site_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ADD_SITE_DIALOG_JS"
-                 file="site_settings/add_site_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ALL_SITES_HTML"
-                 file="site_settings/all_sites.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ALL_SITES_JS"
-                 file="site_settings/all_sites.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_ALL_SITES_ICONS_HTML"
-                 file="site_settings/all_sites_icons.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_ENTRY_HTML"
-                 file="site_settings/site_entry.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_ENTRY_JS"
-                 file="site_settings/site_entry.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CLEAR_STORAGE_DIALOG_CSS"
-                 file="site_settings/clear_storage_dialog_css.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CATEGORY_DEFAULT_SETTING_HTML"
-                 file="site_settings/category_default_setting.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CATEGORY_DEFAULT_SETTING_JS"
-                 file="site_settings/category_default_setting.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CATEGORY_SETTING_EXCEPTIONS_HTML"
-                 file="site_settings/category_setting_exceptions.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_CATEGORY_SETTING_EXCEPTIONS_JS"
-                 file="site_settings/category_setting_exceptions.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CHOOSER_EXCEPTION_LIST_HTML"
-                 file="site_settings/chooser_exception_list.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CHOOSER_EXCEPTION_LIST_JS"
-                 file="site_settings/chooser_exception_list.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CHOOSER_EXCEPTION_LIST_ENTRY_HTML"
-                 file="site_settings/chooser_exception_list_entry.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CHOOSER_EXCEPTION_LIST_ENTRY_JS"
-                 file="site_settings/chooser_exception_list_entry.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_HTML"
-                 file="settings_page/settings_animated_pages.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_JS"
-                 file="settings_page/settings_animated_pages.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_APPEARANCE_BROWSER_PROXY_HTML"
-                 file="appearance_page/appearance_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_APPEARANCE_BROWSER_PROXY_JS"
-                 file="appearance_page/appearance_browser_proxy.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_APPEARANCE_FONTS_PAGE_HTML"
-                 file="appearance_page/appearance_fonts_page.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_APPEARANCE_FONTS_PAGE_JS"
-                 file="appearance_page/appearance_fonts_page.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_APPEARANCE_PAGE_HTML"
-                 file="appearance_page/appearance_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_APPEARANCE_PAGE_JS"
-                 file="appearance_page/appearance_page.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_APPEARANCE_HOME_URL_INPUT_HTML"
-                 file="appearance_page/home_url_input.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_APPEARANCE_HOME_URL_INPUT_JS"
-                 file="appearance_page/home_url_input.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_BASIC_PAGE_JS"
-                 file="basic_page/basic_page.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_BASIC_PAGE_HTML"
-                 file="basic_page/basic_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_EDIT_EXCEPTION_DIALOG_HTML"
-                 file="site_settings/edit_exception_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_EDIT_EXCEPTION_DIALOG_JS"
-                 file="site_settings/edit_exception_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_JS"
-                 file="extension_control_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_HTML"
-                 file="extension_control_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_FONTS_BROWSER_PROXY_HTML"
-                 file="appearance_page/fonts_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_FONTS_BROWSER_PROXY_JS"
-                 file="appearance_page/fonts_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LIFETIME_BROWSER_PROXY_HTML"
-                 file="lifetime_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LIFETIME_BROWSER_PROXY_JS"
-                 file="lifetime_browser_proxy.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_ON_STARTUP_BROWSER_PROXY_HTML"
-                 file="on_startup_page/on_startup_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ON_STARTUP_BROWSER_PROXY_JS"
-                 file="on_startup_page/on_startup_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ON_STARTUP_PAGE_HTML"
-                 file="on_startup_page/on_startup_page.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ON_STARTUP_PAGE_JS"
-                 file="on_startup_page/on_startup_page.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SEARCH_SETTINGS_HTML"
-                 file="search_settings.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SEARCH_SETTINGS_JS"
-                 file="search_settings.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_STARTUP_URLS_PAGE_HTML"
-                 file="on_startup_page/startup_urls_page.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_STARTUP_URLS_PAGE_JS"
-                 file="on_startup_page/startup_urls_page.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_STARTUP_URLS_PAGE_BROWSER_PROXY_JS"
-                 file="on_startup_page/startup_urls_page_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_STARTUP_URLS_PAGE_BROWSER_PROXY_HTML"
-                 file="on_startup_page/startup_urls_page_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_STARTUP_URL_DIALOG_JS"
-                 file="on_startup_page/startup_url_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_STARTUP_URL_DIALOG_HTML"
-                 file="on_startup_page/startup_url_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_STARTUP_URL_ENTRY_JS"
-                 file="on_startup_page/startup_url_entry.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_STARTUP_URL_ENTRY_HTML"
-                 file="on_startup_page/startup_url_entry.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_HTML"
-                 file="settings_main/settings_main.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_JS"
-                 file="settings_main/settings_main.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_MENU_HTML"
-                 file="settings_menu/settings_menu.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_MENU_JS"
-                 file="settings_menu/settings_menu.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_SECTION_HTML"
-                 file="settings_page/settings_section.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_SECTION_JS"
-                 file="settings_page/settings_section.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_SUBPAGE_HTML"
-                 file="settings_page/settings_subpage.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_SUBPAGE_JS"
-                 file="settings_page/settings_subpage.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_CSS_HTML"
-                 file="settings_page_css.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_MAIN_PAGE_BEHAVIOR_HTML"
-                 file="settings_page/main_page_behavior.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_MAIN_PAGE_BEHAVIOR_JS"
-                 file="settings_page/main_page_behavior.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SETTINGS_VARS_CSS_HTML"
-                 file="settings_vars_css.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SETTINGS_SHARED_CSS_HTML"
-                 file="settings_shared_css.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML"
-                 file="settings_ui/settings_ui.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"
-                 file="settings_ui/settings_ui.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_HTML"
-                 file="global_scroll_target_behavior.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_JS"
-                 file="global_scroll_target_behavior.js"
-                 type="chrome_html" />
-      <if expr="is_win">
-        <structure name="IDR_SETTINGS_CHROME_CLEANUP_PROXY_HTML"
-                   file="chrome_cleanup_page/chrome_cleanup_proxy.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_CHROME_CLEANUP_PROXY_JS"
-                   file="chrome_cleanup_page/chrome_cleanup_proxy.js"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_CHROME_CLEANUP_PAGE_HTML"
-                   file="chrome_cleanup_page/chrome_cleanup_page.html"
-                   type="chrome_html"
-                   preprocess="true" />
-        <structure name="IDR_SETTINGS_CHROME_CLEANUP_PAGE_JS"
-                   file="chrome_cleanup_page/chrome_cleanup_page.js"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_CHROME_CLEANUP_ITEMS_TO_REMOVE_LIST_HTML"
-                   file="chrome_cleanup_page/items_to_remove_list.html"
-                   type="chrome_html"/>
-        <structure name="IDR_SETTINGS_CHROME_CLEANUP_ITEMS_TO_REMOVE_LIST_JS"
-                   file="chrome_cleanup_page/items_to_remove_list.js"
-                   type="chrome_html"/>
-      </if>
-      <if expr="is_win and _google_chrome">
-        <structure name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_PAGE_HTML"
-                   file="incompatible_applications_page/incompatible_applications_page.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_PAGE_JS"
-                   file="incompatible_applications_page/incompatible_applications_page.js"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_BROWSER_PROXY_HTML"
-                   file="incompatible_applications_page/incompatible_applications_browser_proxy.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_BROWSER_PROXY_JS"
-                   file="incompatible_applications_page/incompatible_applications_browser_proxy.js"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_INCOMPATIBLE_APPLICATION_ITEM_HTML"
-                   file="incompatible_applications_page/incompatible_application_item.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_INCOMPATIBLE_APPLICATION_ITEM_JS"
-                   file="incompatible_applications_page/incompatible_application_item.js"
-                   type="chrome_html" />
-      </if>
-      <structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_BROWSER_PROXY_HTML"
-                 file="clear_browsing_data_dialog/clear_browsing_data_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_BROWSER_PROXY_JS"
-                 file="clear_browsing_data_dialog/clear_browsing_data_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_HTML"
-                 file="clear_browsing_data_dialog/clear_browsing_data_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_JS"
-                 file="clear_browsing_data_dialog/clear_browsing_data_dialog.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_INSTALLED_APP_CHECKBOX_HTML"
-                 file="clear_browsing_data_dialog/installed_app_checkbox.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CLEAR_BROWSING_DATA_INSTALLED_APP_CHECKBOX_JS"
-                 file="clear_browsing_data_dialog/installed_app_checkbox.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_HISTORY_DELETION_DIALOG_HTML"
-                 file="clear_browsing_data_dialog/history_deletion_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_HISTORY_DELETION_DIALOG_JS"
-                 file="clear_browsing_data_dialog/history_deletion_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_SUBPAGE_HTML"
-                 file="privacy_page/security_keys_subpage.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_SUBPAGE_JS"
-                 file="privacy_page/security_keys_subpage.js"
-                 type="chrome_html"/>
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_SET_PIN_DIALOG_HTML"
-                 file="privacy_page/security_keys_set_pin_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_SET_PIN_DIALOG_JS"
-                 file="privacy_page/security_keys_set_pin_dialog.js"
-                 type="chrome_html"/>
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_PIN_FIELD_HTML"
-                 file="privacy_page/security_keys_pin_field.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_PIN_FIELD_JS"
-                 file="privacy_page/security_keys_pin_field.js"
-                 type="chrome_html"/>
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DIALOG_HTML"
-                 file="privacy_page/security_keys_credential_management_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DIALOG_JS"
-                 file="privacy_page/security_keys_credential_management_dialog.js"
-                 type="chrome_html"/>
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_RESET_DIALOG_HTML"
-                 file="privacy_page/security_keys_reset_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_RESET_DIALOG_JS"
-                 file="privacy_page/security_keys_reset_dialog.js"
-                 type="chrome_html"/>
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_BIO_ENROLL_DIALOG_HTML"
-                 file="privacy_page/security_keys_bio_enroll_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_BIO_ENROLL_DIALOG_JS"
-                 file="privacy_page/security_keys_bio_enroll_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_BROWSER_PROXY_HTML"
-                 file="privacy_page/security_keys_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_KEYS_BROWSER_PROXY_JS"
-                 file="privacy_page/security_keys_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_BOOLEAN_CONTROL_BEHAVIOR_HTML"
-                 file="controls/settings_boolean_control_behavior.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_BOOLEAN_CONTROL_BEHAVIOR_JS"
-                 file="controls/settings_boolean_control_behavior.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_CONTROLLED_BUTTON_JS"
-                 file="controls/controlled_button.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_CONTROLLED_BUTTON_HTML"
-                 file="controls/controlled_button.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_CONTROLLED_RADIO_BUTTON_JS"
-                 file="controls/controlled_radio_button.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_CONTROLLED_RADIO_BUTTON_HTML"
-                 file="controls/controlled_radio_button.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_EXTENSION_CONTROLLED_INDICATOR_JS"
-                 file="controls/extension_controlled_indicator.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_EXTENSION_CONTROLLED_INDICATOR_HTML"
-                 file="controls/extension_controlled_indicator.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_CHECKBOX_HTML"
-                 file="controls/settings_checkbox.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_CHECKBOX_JS"
-                 file="controls/settings_checkbox.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_DROPDOWN_MENU_HTML"
-                 file="controls/settings_dropdown_menu.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_DROPDOWN_MENU_JS"
-                 file="controls/settings_dropdown_menu.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_PASSWORD_PROMPT_DIALOG_JS"
-                   file="controls/password_prompt_dialog.js"
-                   type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_PASSWORD_PROMPT_DIALOG_HTML"
-                 file="controls/password_prompt_dialog.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_CONTROLS_PREF_CONTROL_BEHAVIOR_HTML"
-                 file="controls/pref_control_behavior.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_PREF_CONTROL_BEHAVIOR_JS"
-                 file="controls/pref_control_behavior.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_RADIO_GROUP_HTML"
-                 file="controls/settings_radio_group.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_RADIO_GROUP_JS"
-                 file="controls/settings_radio_group.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_SETTINGS_IDLE_LOAD_HTML"
-                 file="controls/settings_idle_load.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_SETTINGS_IDLE_LOAD_JS"
-                 file="controls/settings_idle_load.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_SLIDER_HTML"
-                 file="controls/settings_slider.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_SLIDER_JS"
-                 file="controls/settings_slider.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_TEXTAREA_HTML"
-                 file="controls/settings_textarea.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_TEXTAREA_JS"
-                 file="controls/settings_textarea.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_TOGGLE_BUTTON_HTML"
-                 file="controls/settings_toggle_button.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONTROLS_TOGGLE_BUTTON_JS"
-                 file="controls/settings_toggle_button.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_COOKIE_INFO_HTML"
-                 file="site_settings/cookie_info.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_COOKIE_INFO_JS"
-                 file="site_settings/cookie_info.js"
-                 type="chrome_html" />
-      <if expr="not chromeos">
-        <structure name="IDR_SETTINGS_DEFAULT_BROWSER_BROWSER_PROXY_HTML"
-                   file="default_browser_page/default_browser_browser_proxy.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_DEFAULT_BROWSER_BROWSER_PROXY_JS"
-                   file="default_browser_page/default_browser_browser_proxy.js"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_HTML"
-                   file="default_browser_page/default_browser_page.html"
-                   type="chrome_html"
-                   preprocess="true" />
-        <structure name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_JS"
-                   file="default_browser_page/default_browser_page.js"
-                   type="chrome_html" />
-      </if>
-      <structure name="IDR_SETTINGS_DOWNLOADS_BROWSER_PROXY_HTML"
-                 file="downloads_page/downloads_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_DOWNLOADS_BROWSER_PROXY_JS"
-                 file="downloads_page/downloads_browser_proxy.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_HTML"
-                 file="downloads_page/downloads_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_JS"
-                 file="downloads_page/downloads_page.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_I18n_SETUP_HTML"
-                 file="i18n_setup.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ICONS"
-                 file="icons.html"
-                 type="chrome_html"
-                 preprocess="true" />
       <structure name="IDR_SETTINGS_IMAGES_COOKIES_BANNER_SVG"
                  file="images/cookies_banner.svg"
+                 compress="false"
                  type="chrome_html" />
       <structure name="IDR_SETTINGS_IMAGES_COOKIES_BANNER_DARK_SVG"
                  file="images/cookies_banner_dark.svg"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_PERMISSIONS_BANNER_SVG"
-                 file="images/permissions_banner.svg"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_PERMISSIONS_BANNER_DARK_SVG"
-                 file="images/permissions_banner_dark.svg"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_SAFE_BROWSING_BANNER_SVG"
-                 file="images/safe_browsing_banner.svg"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_SAFE_BROWSING_BANNER_DARK_SVG"
-                 file="images/safe_browsing_banner_dark.svg"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_SYNC_BANNER_SVG"
-                 file="images/sync_banner.svg"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_IMAGES_SYNC_BANNER_DARK_SVG"
-                 file="images/sync_banner_dark.svg"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_RESET_PAGE_HTML"
-                 file="reset_page/reset_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_RESET_PAGE_JS"
-                 file="reset_page/reset_page.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_RESET_PROFILE_DIALOG_HTML"
-                 file="reset_page/reset_profile_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_RESET_PROFILE_DIALOG_JS"
-                 file="reset_page/reset_profile_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_RESET_PROFILE_BANNER_HTML"
-                 file="reset_page/reset_profile_banner.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_RESET_PROFILE_BANNER_JS"
-                 file="reset_page/reset_profile_banner.js"
-                 type="chrome_html"/>
-      <structure name="IDR_SETTINGS_RESET_BROWSER_PROXY_JS"
-                 file="reset_page/reset_browser_proxy.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_RESET_BROWSER_PROXY_HTML"
-                 file="reset_page/reset_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LANGUAGES_HTML"
-                 file="languages_page/languages.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LANGUAGES_JS"
-                 file="languages_page/languages.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_LANGUAGES_BROWSER_PROXY_HTML"
-                 file="languages_page/languages_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LANGUAGES_BROWSER_PROXY_JS"
-                 file="languages_page/languages_browser_proxy.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_HTML"
-                 file="languages_page/add_languages_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_JS"
-                 file="languages_page/add_languages_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LANGUAGES_PAGE_HTML"
-                 file="languages_page/languages_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_LANGUAGES_PAGE_JS"
-                 file="languages_page/languages_page.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <if expr="not is_macosx">
-        <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_HTML"
-                   file="languages_page/edit_dictionary_page.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_JS"
-                   file="languages_page/edit_dictionary_page.js"
-                   type="chrome_html" />
-      </if>
-      <structure name="IDR_SETTINGS_MEDIA_PICKER_HTML"
-                 file="site_settings/media_picker.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_MEDIA_PICKER_JS"
-                 file="site_settings/media_picker.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_AUTOFILL_PAGE_HTML"
-                 file="autofill_page/autofill_page.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_AUTOFILL_PAGE_JS"
-                 file="autofill_page/autofill_page.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PAYMENTS_LIST_HTML"
-                 file="autofill_page/payments_list.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PAYMENTS_LIST_JS"
-                 file="autofill_page/payments_list.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CREDIT_CARD_LIST_ENTRY_HTML"
-                 file="autofill_page/credit_card_list_entry.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CREDIT_CARD_LIST_ENTRY_JS"
-                 file="autofill_page/credit_card_list_entry.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_UPI_ID_LIST_ENTRY_HTML"
-                 file="autofill_page/upi_id_list_entry.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_UPI_ID_LIST_ENTRY_JS"
-                 file="autofill_page/upi_id_list_entry.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORDS_SHARED_CSS_HTML"
-                 file="autofill_page/passwords_shared_css.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_CREDIT_CARD_EDIT_DIALOG_HTML"
-                 file="autofill_page/credit_card_edit_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CREDIT_CARD_EDIT_DIALOG_JS"
-                 file="autofill_page/credit_card_edit_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_AUTOFILL_SECTION_HTML"
-                 file="autofill_page/autofill_section.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_AUTOFILL_SECTION_JS"
-                 file="autofill_page/autofill_section.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ADDRESS_EDIT_DIALOG_HTML"
-                 file="autofill_page/address_edit_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ADDRESS_EDIT_DIALOG_JS"
-                 file="autofill_page/address_edit_dialog.js"
-                 type="chrome_html" />
-      <if expr="chromeos">
-        <structure name="IDR_SETTINGS_BLOCKING_REQUEST_MANAGER_HTML"
-                   file="autofill_page/blocking_request_manager.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_BLOCKING_REQUEST_MANAGER_JS"
-                   file="autofill_page/blocking_request_manager.js"
-                   type="chrome_html" />
-      </if>
-      <structure name="IDR_SETTINGS_SHOW_PASSWORD_BEHAVIOR_HTML"
-                 file="autofill_page/show_password_behavior.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SHOW_PASSWORD_BEHAVIOR_JS"
-                 file="autofill_page/show_password_behavior.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORD_CHECK_HTML"
-                 file="autofill_page/password_check.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORD_CHECK_JS"
-                 file="autofill_page/password_check.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORD_CHECK_BEHAVIOR_HTML"
-                 file="autofill_page/password_check_behavior.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORD_CHECK_BEHAVIOR_JS"
-                 file="autofill_page/password_check_behavior.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORD_CHECK_EDIT_DIALOG_HTML"
-                 file="autofill_page/password_check_edit_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORD_CHECK_EDIT_DIALOG_JS"
-                 file="autofill_page/password_check_edit_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORD_CHECK_LIST_ITEM_HTML"
-                 file="autofill_page/password_check_list_item.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORD_CHECK_LIST_ITEM_JS"
-                 file="autofill_page/password_check_list_item.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORD_LIST_ITEM_HTML"
-                 file="autofill_page/password_list_item.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORD_LIST_ITEM_JS"
-                 file="autofill_page/password_list_item.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORD_MANAGER_PROXY_HTML"
-                 file="autofill_page/password_manager_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORD_MANAGER_PROXY_JS"
-                 file="autofill_page/password_manager_proxy.js"
+                 compress="false"
                  type="chrome_html" />
       <structure name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_NEUTRAL_SVG"
                  file="images/password_check_neutral.svg"
+                 compress="false"
                  type="chrome_html" />
       <structure name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_NEUTRAL_DARK_SVG"
                  file="images/password_check_neutral_dark.svg"
+                 compress="false"
                  type="chrome_html" />
       <structure name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_POSITIVE_SVG"
                  file="images/password_check_positive.svg"
+                 compress="false"
                  type="chrome_html" />
       <structure name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_POSITIVE_DARK_SVG"
                  file="images/password_check_positive_dark.svg"
+                 compress="false"
                  type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORDS_SECTION_HTML"
-                 file="autofill_page/passwords_section.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORDS_SECTION_JS"
-                 file="autofill_page/passwords_section.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORD_EDIT_DIALOG_HTML"
-                 file="autofill_page/password_edit_dialog.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORD_EDIT_DIALOG_JS"
-                 file="autofill_page/password_edit_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORDS_EXPORT_DIALOG_HTML"
-                 file="autofill_page/passwords_export_dialog.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORDS_EXPORT_DIALOG_JS"
-                 file="autofill_page/passwords_export_dialog.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PASSWORD_REMOVE_CONFIRMATION_DIALOG_HTML"
-                 file="autofill_page/password_remove_confirmation_dialog.html"
-                 type="chrome_html" />
-       <structure name="IDR_SETTINGS_PASSWORD_REMOVE_CONFIRMATION_DIALOG_JS"
-                 file="autofill_page/password_remove_confirmation_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PAYMENTS_SECTION_HTML"
-                 file="autofill_page/payments_section.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PAYMENTS_SECTION_JS"
-                 file="autofill_page/payments_section.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PEOPLE_PAGE_HTML"
-                 file="people_page/people_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"
-                 file="people_page/people_page.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_ACCOUNT_CONTROL_HTML"
-                 file="people_page/sync_account_control.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_ACCOUNT_CONTROL_JS"
-                 file="people_page/sync_account_control.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <if expr="not chromeos">
-        <structure name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_DIALOG_HTML"
-                   file="people_page/import_data_dialog.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_DIALOG_JS"
-                   file="people_page/import_data_dialog.js"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_BROWSER_PROXY_HTML"
-                   file="people_page/import_data_browser_proxy.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_BROWSER_PROXY_JS"
-                   file="people_page/import_data_browser_proxy.js"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_HTML"
-                   file="people_page/manage_profile.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_JS"
-                   file="people_page/manage_profile.js"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_BROWSER_PROXY_HTML"
-                   file="people_page/manage_profile_browser_proxy.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_BROWSER_PROXY_JS"
-                   file="people_page/manage_profile_browser_proxy.js"
-                   type="chrome_html" />
-      </if>
-      <structure name="IDR_SETTINGS_PEOPLE_PAGE_SIGNOUT_DIALOG_HTML"
-                 file="people_page/signout_dialog.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PEOPLE_PAGE_SIGNOUT_DIALOG_JS"
-                 file="people_page/signout_dialog.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PEOPLE_PAGE_PROFILE_INFO_BROWSER_PROXY_HTML"
-                 file="people_page/profile_info_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PEOPLE_PAGE_PROFILE_INFO_BROWSER_PROXY_JS"
-                 file="people_page/profile_info_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_BROWSER_PROXY_HTML"
-                 file="people_page/sync_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_BROWSER_PROXY_JS"
-                 file="people_page/sync_browser_proxy.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PREF_UTIL_HTML"
-                 file="prefs/pref_util.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PREF_UTIL_JS"
-                 file="prefs/pref_util.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PREFS_HTML"
-                 file="prefs/prefs.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PREFS_JS"
-                 file="prefs/prefs.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PREFS_BEHAVIOR_HTML"
-                 file="prefs/prefs_behavior.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PREFS_BEHAVIOR_JS"
-                 file="prefs/prefs_behavior.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PREFS_TYPES_HTML"
-                 file="prefs/prefs_types.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PREFS_TYPES_JS"
-                 file="prefs/prefs_types.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PRINTING_PAGE_HTML"
-                 file="printing_page/printing_page.html"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PRINTING_PAGE_JS"
-                 file="printing_page/printing_page.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <if expr="not chromeos">
-        <structure name="IDR_SETTINGS_PRINTING_BROWSER_PROXY_HTML"
-                   file="printing_page/printing_browser_proxy.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_PRINTING_BROWSER_PROXY_JS"
-                   file="printing_page/printing_browser_proxy.js"
-                   type="chrome_html" />
-      </if>
-      <structure name="IDR_SETTINGS_CLOUD_PRINTING_PAGE_HTML"
-                 file="printing_page/cloud_printers.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CLOUD_PRINTING_PAGE_JS"
-                 file="printing_page/cloud_printers.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LOCAL_DATA_BROWSER_PROXY_HTML"
-                 file="site_settings/local_data_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LOCAL_DATA_BROWSER_PROXY_JS"
-                 file="site_settings/local_data_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_OPEN_WINDOW_PROXY_HTML"
-                 file="open_window_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_OPEN_WINDOW_PROXY_JS"
-                 file="open_window_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PLURAL_STRING_PROXY_HTML"
-                 file="plural_string_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PLURAL_STRING_PROXY_JS"
-                 file="plural_string_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PAGE_VISIBILITY_HTML"
-                 file="page_visibility.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PAGE_VISIBILITY_JS"
-                 file="page_visibility.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PDF_DOCUMENTS_HTML"
-                 file="site_settings/pdf_documents.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PDF_DOCUMENTS_JS"
-                 file="site_settings/pdf_documents.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_COOKIES_PAGE_HTML"
-                 file="privacy_page/cookies_page.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_COOKIES_PAGE_JS"
-                 file="privacy_page/cookies_page.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_DO_NOT_TRACK_TOGGLE_HTML"
-                 file="privacy_page/do_not_track_toggle.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_DO_NOT_TRACK_TOGGLE_JS"
-                 file="privacy_page/do_not_track_toggle.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PERSONALIZATION_OPTIONS_HTML"
-                 file="privacy_page/personalization_options.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_PERSONALIZATION_OPTIONS_JS"
-                 file="privacy_page/personalization_options.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORDS_LEAK_DETECTION_TOGGLE_HTML"
-                 file="privacy_page/passwords_leak_detection_toggle.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PASSWORDS_LEAK_DETECTION_TOGGLE_JS"
-                 file="privacy_page/passwords_leak_detection_toggle.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_COLLAPSE_RADIO_BUTTON_HTML"
-                 file="privacy_page/collapse_radio_button.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_COLLAPSE_RADIO_BUTTON_JS"
-                 file="privacy_page/collapse_radio_button.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURE_DNS_HTML"
-                 file="privacy_page/secure_dns.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURE_DNS_JS"
-                 file="privacy_page/secure_dns.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURE_DNS_INPUT_HTML"
-                 file="privacy_page/secure_dns_input.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURE_DNS_INPUT_JS"
-                 file="privacy_page/secure_dns_input.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_PAGE_HTML"
-                 file="privacy_page/security_page.html"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SECURITY_PAGE_JS"
-                 file="privacy_page/security_page.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_DISABLE_SAFEBROWSING_DIALOG_HTML"
-                 file="privacy_page/disable_safebrowsing_dialog.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_DISABLE_SAFEBROWSING_DIALOG_JS"
-                 file="privacy_page/disable_safebrowsing_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PRIVACY_PAGE_HTML"
-                 file="privacy_page/privacy_page.html"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"
-                 file="privacy_page/privacy_page.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_HTML"
-                 file="privacy_page/privacy_page_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_JS"
-                 file="privacy_page/privacy_page_browser_proxy.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SAFE_BROWSING_BROWSER_PROXY_HTML"
-                 file="privacy_page/safe_browsing_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SAFE_BROWSING_BROWSER_PROXY_JS"
-                 file="privacy_page/safe_browsing_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SAFETY_CHECK_PAGE_HTML"
-                 file="safety_check_page/safety_check_page.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SAFETY_CHECK_PAGE_JS"
-                 file="safety_check_page/safety_check_page.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SAFETY_CHECK_BROWSER_PROXY_HTML"
-                 file="safety_check_page/safety_check_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SAFETY_CHECK_BROWSER_PROXY_JS"
-                 file="safety_check_page/safety_check_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PROTOCOL_HANDLERS_HTML"
-                 file="site_settings/protocol_handlers.html"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_PROTOCOL_HANDLERS_JS"
-                 file="site_settings/protocol_handlers.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_HATS_BROWSER_PROXY_HTML"
-                 file="hats_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_HATS_BROWSER_PROXY_JS"
-                 file="hats_browser_proxy.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_METRICS_BROWSER_PROXY_HTML"
-                 file="metrics_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_METRICS_BROWSER_PROXY_JS"
-                 file="metrics_browser_proxy.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_RECENT_SITE_PERMISSIONS_HTML"
-                 file="site_settings_page/recent_site_permissions.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_RECENT_SITE_PERMISSIONS_JS"
-                 file="site_settings_page/recent_site_permissions.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ROUTE_HTML"
-                 file="route.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ROUTE_JS"
-                 file="route.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_ROUTER_HTML"
-                 file="router.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_ROUTER_JS"
-                 file="router.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_FAVICON_HTML"
-                 file="site_favicon.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_FAVICON_JS"
-                 file="site_favicon.js"
-                 type="chrome_html" />
-      <if expr="chromeos">
-        <structure name="IDR_SETTINGS_ANDROID_INFO_BROWSER_PROXY_HTML"
-                   file="site_settings/android_info_browser_proxy.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_ANDROID_INFO_BROWSER_PROXY_JS"
-                   file="site_settings/android_info_browser_proxy.js"
-                   type="chrome_html" />
-      </if>
-      <structure name="IDR_SETTINGS_SITE_DATA_HTML"
-                 file="site_settings/site_data.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_DATA_JS"
-                 file="site_settings/site_data.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_DATA_DETAILS_SUBPAGE_HTML"
-                 file="site_settings/site_data_details_subpage.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_DATA_DETAILS_SUBPAGE_JS"
-                 file="site_settings/site_data_details_subpage.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_DATA_ENTRY_HTML"
-                 file="site_settings/site_data_entry.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_DATA_ENTRY_JS"
-                 file="site_settings/site_data_entry.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_LIST_HTML"
-                 file="site_settings/site_list.html"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_LIST_JS"
-                 file="site_settings/site_list.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_LIST_ENTRY_HTML"
-                 file="site_settings/site_list_entry.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_LIST_ENTRY_JS"
-                 file="site_settings/site_list_entry.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_SETTINGS_BEHAVIOR_HTML"
-                 file="site_settings/site_settings_behavior.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_SETTINGS_BEHAVIOR_JS"
-                 file="site_settings/site_settings_behavior.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_CONSTANTS_JS"
-                 file="site_settings/constants.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_CONSTANTS_HTML"
-                 file="site_settings/constants.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_HTML"
-                 file="site_settings_page/site_settings_page.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_JS"
-                 file="site_settings_page/site_settings_page.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SITE_SETTINGS_LIST_HTML"
-                 file="site_settings_page/site_settings_list.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_SETTINGS_LIST_JS"
-                 file="site_settings_page/site_settings_list.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_HTML"
-                 file="site_settings/site_settings_prefs_browser_proxy.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_JS"
-                 file="site_settings/site_settings_prefs_browser_proxy.js"
-                 preprocess="true"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_DETAILS_HTML"
-                 file="site_settings/site_details.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SITE_DETAILS_JS"
-                 file="site_settings/site_details.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SITE_DETAILS_PERMISSION_HTML"
-                 file="site_settings/site_details_permission.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SITE_DETAILS_PERMISSION_JS"
-                 file="site_settings/site_details_permission.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_DIALOG_JS"
-                 file="search_engines_page/search_engine_dialog.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_DIALOG_HTML"
-                 file="search_engines_page/search_engine_dialog.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_JS"
-                 file="search_engines_page/search_engine_entry.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_HTML"
-                 file="search_engines_page/search_engine_entry.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_CSS_HTML"
-                 file="search_engines_page/search_engine_entry_css.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_OMNIBOX_EXTENSION_ENTRY_JS"
-                 file="search_engines_page/omnibox_extension_entry.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_OMNIBOX_EXTENSION_ENTRY_HTML"
-                 file="search_engines_page/omnibox_extension_entry.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_LIST_JS"
-                 file="search_engines_page/search_engines_list.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_LIST_HTML"
-                 file="search_engines_page/search_engines_list.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_PAGE_JS"
-                 file="search_engines_page/search_engines_page.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_PAGE_HTML"
-                 file="search_engines_page/search_engines_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_BROWSER_PROXY_JS"
-                 file="search_engines_page/search_engines_browser_proxy.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SEARCH_ENGINES_BROWSER_PROXY_HTML"
-                 file="search_engines_page/search_engines_browser_proxy.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SEARCH_PAGE_JS"
-                 file="search_page/search_page.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SEARCH_PAGE_HTML"
-                 file="search_page/search_page.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SYNC_CONTROLS_JS"
-                 file="people_page/sync_controls.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SYNC_CONTROLS_HTML"
-                 file="people_page/sync_controls.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SYNC_ENCRYPTION_OPTIONS_JS"
-                 file="people_page/sync_encryption_options.js"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_SYNC_ENCRYPTION_OPTIONS_HTML"
-                 file="people_page/sync_encryption_options.html"
-                 type="chrome_html" />
-       <structure name="IDR_SETTINGS_SYNC_PAGE_JS"
-                 file="people_page/sync_page.js"
-                 type="chrome_html"
-                 preprocess="true" />
-      <structure name="IDR_SETTINGS_SYNC_PAGE_HTML"
-                 file="people_page/sync_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
-      <if expr="not chromeos">
-        <structure name="IDR_SETTINGS_SYSTEM_PAGE_BROWSER_PROXY_HTML"
-                   file="system_page/system_page_browser_proxy.html"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_SYSTEM_PAGE_BROWSER_PROXY"
-                   file="system_page/system_page_browser_proxy.js"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_SYSTEM_PAGE_HTML"
-                   file="system_page/system_page.html"
-                   preprocess="true"
-                   type="chrome_html" />
-        <structure name="IDR_SETTINGS_SYSTEM_PAGE_JS"
-                   file="system_page/system_page.js"
-                   type="chrome_html" />
-      </if>
-      <structure name="IDR_SETTINGS_SETTINGS_HTML"
-                 preprocess="true"
-                 file="settings.html"
-                 type="chrome_html" />
-      <structure name="IDR_SETTINGS_LAZY_LOAD_HTML"
-                 preprocess="true"
-                 file="lazy_load.html"
+      <structure name="IDR_SETTINGS_IMAGES_PERMISSIONS_BANNER_SVG"
+                 file="images/permissions_banner.svg"
+                 compress="false"
                  type="chrome_html" />
-      <structure name="IDR_SETTINGS_ENSURE_LAZY_LOADED_HTML"
-                 file="ensure_lazy_loaded.html"
+      <structure name="IDR_SETTINGS_IMAGES_PERMISSIONS_BANNER_DARK_SVG"
+                 file="images/permissions_banner_dark.svg"
+                 compress="false"
                  type="chrome_html" />
-      <structure name="IDR_SETTINGS_WEBSITE_USAGE_BROWSER_PROXY_HTML"
-                 file="site_settings/website_usage_browser_proxy.html"
+      <structure name="IDR_SETTINGS_IMAGES_SAFE_BROWSING_BANNER_SVG"
+                 file="images/safe_browsing_banner.svg"
+                 compress="false"
                  type="chrome_html" />
-      <structure name="IDR_SETTINGS_WEBSITE_USAGE_BROWSER_PROXY_JS"
-                 file="site_settings/website_usage_browser_proxy.js"
+      <structure name="IDR_SETTINGS_IMAGES_SAFE_BROWSING_BANNER_DARK_SVG"
+                 file="images/safe_browsing_banner_dark.svg"
+                 compress="false"
                  type="chrome_html" />
-      <structure name="IDR_SETTINGS_ZOOM_LEVELS_HTML"
-                 file="site_settings/zoom_levels.html"
+      <structure name="IDR_SETTINGS_IMAGES_SYNC_BANNER_SVG"
+                 file="images/sync_banner.svg"
+                 compress="false"
                  type="chrome_html" />
-      <structure name="IDR_SETTINGS_ZOOM_LEVELS_JS"
-                 file="site_settings/zoom_levels.js"
+      <structure name="IDR_SETTINGS_IMAGES_SYNC_BANNER_DARK_SVG"
+                 file="images/sync_banner_dark.svg"
+                 compress="false"
                  type="chrome_html" />
-      <if expr="chromeos">
-        <structure name="IDR_SETTINGS_PEOPLE_PAGE_ACCOUNT_MANAGER_BROWSER_PROXY_HTML"
-                   file="people_page/account_manager_browser_proxy.html"
-                   type="chrome_html"/>
-        <structure name="IDR_SETTINGS_PEOPLE_PAGE_ACCOUNT_MANAGER_BROWSER_PROXY_JS"
-                   file="people_page/account_manager_browser_proxy.js"
-                   type="chrome_html"/>
-      </if>
     </structures>
   </release>
 </grit>
diff --git a/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp b/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp
index c519226f257..4953d88930c 100644
--- a/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp
+++ b/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp
@@ -1,815 +1,803 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
   <!-- Polymer 3.0 Elements -->
-  <include name="IDR_SETTINGS_A11Y_PAGE_A11Y_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/a11y_page/a11y_page.m.js"
+  <include name="IDR_SETTINGS_A11Y_PAGE_A11Y_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/a11y_page/a11y_page.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <if expr="not is_macosx and not chromeos">
     <include name="IDR_SETTINGS_A11Y_PAGE_CAPTIONS_SUBPAGE_M_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/a11y_page/captions_subpage.m.js"
              use_base_dir="false"
-             type="BINDATA" />
+             compress="false" type="BINDATA" />
   </if>
   <if expr="is_win or is_macosx">
-    <include name="IDR_SETTINGS_A11Y_PAGE_CAPTIONS_BROWSER_PROXY_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/a11y_page/captions_browser_proxy.m.js"
-             use_base_dir="false"
-             type="BINDATA" />
+    <include name="IDR_SETTINGS_A11Y_PAGE_CAPTIONS_BROWSER_PROXY_JS"
+             file="a11y_page/captions_browser_proxy.js"
+             compress="false" type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_ABOUT_PAGE_ABOUT_PAGE_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/about_page/about_page_browser_proxy.m.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_ABOUT_PAGE_ABOUT_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/about_page/about_page.m.js"
+           file="${root_gen_dir}/chrome/browser/resources/settings/about_page/about_page.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.m.js"
-           use_base_dir="false"
+  <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_BROWSER_PROXY_JS"
+           file="appearance_page/appearance_browser_proxy.js"
            preprocess="true"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_FONTS_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_FONTS_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_page.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_APPEARANCE_PAGE_FONTS_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.m.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_APPEARANCE_PAGE_HOME_URL_INPUT_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/home_url_input.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_APPEARANCE_PAGE_HOME_URL_INPUT_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/home_url_input.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_AUTOFILL_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/autofill_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_AUTOFILL_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/autofill_page.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PAYMENTS_LIST_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/payments_list.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PAYMENTS_LIST_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/payments_list.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_CREDIT_CARD_LIST_ENTRY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_CREDIT_CARD_LIST_ENTRY_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_UPI_ID_LIST_ENTRY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/upi_id_list_entry.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_UPI_ID_LIST_ENTRY_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/upi_id_list_entry.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_SHARED_CSS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_shared_css.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_SHARED_CSS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_shared_css.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_CREDIT_CARD_EDIT_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/credit_card_edit_dialog.m.js"
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_CREDIT_CARD_EDIT_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/credit_card_edit_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_AUTOFILL_SECTION_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/autofill_section.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_AUTOFILL_SECTION_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/autofill_section.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_ADDRESS_EDIT_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/address_edit_dialog.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_ADDRESS_EDIT_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/address_edit_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <if expr="chromeos">
-    <include name="IDR_SETTINGS_AUTOFILL_PAGE_BLOCKING_REQUEST_MANAGER_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/blocking_request_manager.m.js"
-             use_base_dir="false"
-             type="BINDATA" />
+    <include name="IDR_SETTINGS_AUTOFILL_PAGE_BLOCKING_REQUEST_MANAGER_JS"
+             file="autofill_page/blocking_request_manager.js"
+             compress="false" type="BINDATA" />
   </if>
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_SHOW_PASSWORD_BEHAVIOR_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/show_password_behavior.m.js"
-           use_base_dir="false"
-           type="BINDATA"
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_SHOW_PASSWORD_BEHAVIOR_JS"
+           file="autofill_page/show_password_behavior.js"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check.m.js"
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check.js"
            use_base_dir="false"
-           type="BINDATA"
+           preprocess="true"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_BEHAVIOR_JS"
+           file="autofill_page/password_check_behavior.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_EDIT_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check_edit_dialog.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_EDIT_DISCLAIMER_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check_edit_disclaimer_dialog.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_LIST_ITEM_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check_list_item.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA"
            preprocess="true"/>
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_BEHAVIOR_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check_behavior.m.js"
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_LIST_ITEM_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_list_item.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_EDIT_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check_edit_dialog.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_MANAGER_PROXY_JS"
+           file="autofill_page/password_manager_proxy.js"
+           compress="false" type="BINDATA" />
+ <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_REMOVE_CONFIRMATION_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_remove_confirmation_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_LIST_ITEM_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check_list_item.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_SECTION_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_section.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_LIST_ITEM_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_list_item.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_MANAGER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_manager_proxy.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
- <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_REMOVE_CONFIRMATION_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_remove_confirmation_dialog.m.js"
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_EDIT_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_edit_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_SECTION_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_section.m.js"
-           use_base_dir="false"
-           type="BINDATA"
-           preprocess="true" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_EDIT_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_edit_dialog.m.js"
-           use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_EXPORT_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.m.js"
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_EXPORT_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PAYMENTS_SECTION_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/payments_section.m.js"
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PAYMENTS_SECTION_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/payments_section.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_BASIC_PAGE_BASIC_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/basic_page/basic_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_BASIC_PAGE_BASIC_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/basic_page/basic_page.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <if expr="is_win">
-    <include name="IDR_SETTINGS_CHROME_CLEANUP_PROXY_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_proxy.m.js"
+    <include name="IDR_SETTINGS_CHROME_CLEANUP_PROXY_JS"
+             file="chrome_cleanup_page/chrome_cleanup_proxy.js"
+             compress="false" type="BINDATA" />
+    <include name="IDR_SETTINGS_CHROME_CLEANUP_PAGE_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_page.js"
              use_base_dir="false"
-             type="BINDATA" />
-    <include name="IDR_SETTINGS_CHROME_CLEANUP_PAGE_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_page.m.js"
-             use_base_dir="false"
-             type="BINDATA"
+             compress="false" type="BINDATA"
              preprocess="true" />
-    <include name="IDR_SETTINGS_CHROME_CLEANUP_ITEMS_TO_REMOVE_LIST_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.m.js"
+    <include name="IDR_SETTINGS_CHROME_CLEANUP_ITEMS_TO_REMOVE_LIST_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.js"
              use_base_dir="false"
-             type="BINDATA" />
+             compress="false" type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_CLEAR_BROWSING_DATA_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_CLEAR_BROWSING_DATA_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.m.js"
+           file="clear_browsing_data_dialog/clear_browsing_data_browser_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_CLEAR_BROWSING_DATA_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_HISTORY_DELETION_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/history_deletion_dialog.m.js"
+  <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_HISTORY_DELETION_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/history_deletion_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_INSTALLED_APP_CHECKBOX_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/installed_app_checkbox.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_INSTALLED_APP_CHECKBOX_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/installed_app_checkbox.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_CONTROLLED_BUTTON_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/controlled_button.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_CONTROLLED_RADIO_BUTTON_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/controlled_radio_button.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_EXTENSION_CONTROLLED_INDICATOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/extension_controlled_indicator.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_PASSWORD_PROMPT_DIALOG_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/password_prompt_dialog.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_boolean_control_behavior.m.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_CONTROLS_SETTINGS_CHECKBOX_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_checkbox.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_CONTROLS_SETTINGS_CHECKBOX_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_checkbox.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_DROPDOWN_MENU_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_dropdown_menu.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_IDLE_LOAD_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_idle_load.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_PREF_CONTROL_BEHAVIOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/pref_control_behavior.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_RADIO_GROUP_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_radio_group.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_SLIDER_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_slider.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_TEXTAREA_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_textarea.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_TOGGLE_BUTTON_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_toggle_button.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <if expr="not chromeos">
-    <include name="IDR_SETTINGS_DEFAULT_BROWSER_BROWSER_PROXY_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/default_browser_page/default_browser_browser_proxy.m.js"
-             use_base_dir="false"
-             type="BINDATA" />
-    <include name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/default_browser_page/default_browser_page.m.js"
+    <include name="IDR_SETTINGS_DEFAULT_BROWSER_BROWSER_PROXY_JS"
+             file="default_browser_page/default_browser_browser_proxy.js"
+             compress="false" type="BINDATA" />
+    <include name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/default_browser_page/default_browser_page.js"
              use_base_dir="false"
-             type="BINDATA" />
+             compress="false" type="BINDATA" />
   </if>
-  <include name="IDR_SETTINGS_DOWNLOADS_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/downloads_page/downloads_browser_proxy.m.js"
-           use_base_dir="false"
-           type="BINDATA"
+  <include name="IDR_SETTINGS_DOWNLOADS_PAGE_DOWNLOADS_BROWSER_PROXY_JS"
+           file="downloads_page/downloads_browser_proxy.js"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_DOWNLOADS_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/downloads_page/downloads_page.m.js"
+  <include name="IDR_SETTINGS_DOWNLOADS_PAGE_DOWNLOADS_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/downloads_page/downloads_page.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_ENSURE_LAZY_LOADED_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/ensure_lazy_loaded.m.js"
+           file="ensure_lazy_loaded.js"
            preprocess="true"
-           use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/extension_control_browser_proxy.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/global_scroll_target_behavior.m.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_HATS_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/hats_browser_proxy.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_I18N_SETUP_M_JS"
-           file="i18n_setup.m.js"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_HATS_BROWSER_PROXY_JS"
+           file="hats_browser_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_I18N_SETUP_JS"
+           file="i18n_setup.js"
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_ICONS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/icons.m.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <if expr="is_win and _google_chrome">
-    <include name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_PAGE_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/incompatible_applications_page/incompatible_applications_page.m.js"
+    <include name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_PAGE_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/incompatible_applications_page/incompatible_applications_page.js"
              use_base_dir="false"
-             type="BINDATA" />
-    <include name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_BROWSER_PROXY_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/incompatible_applications_page/incompatible_applications_browser_proxy.m.js"
+             compress="false" type="BINDATA" />
+    <include name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_BROWSER_PROXY_JS"
+             file="incompatible_applications_page/incompatible_applications_browser_proxy.js"
+             compress="false" type="BINDATA" />
+    <include name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_INCOMPATIBLE_APPLICATION_ITEM_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/incompatible_applications_page/incompatible_application_item.js"
              use_base_dir="false"
-             type="BINDATA" />
-    <include name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_INCOMPATIBLE_APPLICATION_ITEM_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/incompatible_applications_page/incompatible_application_item.m.js"
-             use_base_dir="false"
-             type="BINDATA" />
+             compress="false" type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_LANGUAGES_PAGE_LANGUAGES_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/languages.m.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_LANGUAGES_PAGE_LANGUAGES_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/languages_browser_proxy.m.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_LANGUAGES_PAGE_ADD_LANGUAGES_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/add_languages_dialog.m.js"
+  <include name="IDR_SETTINGS_LANGUAGES_PAGE_ADD_LANGUAGES_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/add_languages_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_LANGUAGES_PAGE_LANGUAGES_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/languages_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_LANGUAGES_PAGE_LANGUAGES_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/languages_page.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <if expr="not is_macosx">
-    <include name="IDR_SETTINGS_LANGUAGES_PAGE_EDIT_DICTIONARY_PAGE_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/edit_dictionary_page.m.js"
+    <include name="IDR_SETTINGS_LANGUAGES_PAGE_EDIT_DICTIONARY_PAGE_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/edit_dictionary_page.js"
              use_base_dir="false"
-             type="BINDATA" />
+             compress="false" type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_LAZY_LOAD_V3_JS"
            file="lazy_load.js"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_LIFETIME_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/lifetime_browser_proxy.m.js"
            use_base_dir="false"
-           type="BINDATA"
-           preprocess="true" />
-  <include name="IDR_SETTINGS_MENU_SETTINGS_MENU_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/settings_menu/settings_menu.m.js"
-           use_base_dir="false"
-           type="BINDATA"
-           preprocess="true" />
-  <include name="IDR_SETTINGS_METRICS_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/metrics_browser_proxy.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/on_startup_browser_proxy.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/on_startup_page.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URL_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_url_dialog.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URL_ENTRY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_url_entry.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URLS_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_urls_page.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URLS_PAGE_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_OPEN_WINDOW_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/open_window_proxy.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PAGE_VISIBILITY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/page_visibility.m.js"
-           use_base_dir="false"
+           compress="false" type="BINDATA"
+           preprocess="true" />
+  <include name="IDR_SETTINGS_MENU_SETTINGS_MENU_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_menu/settings_menu.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA"
+           preprocess="true" />
+  <include name="IDR_SETTINGS_METRICS_BROWSER_PROXY_JS"
+           file="metrics_browser_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_BROWSER_PROXY_JS"
+           file="on_startup_page/on_startup_browser_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/on_startup_page.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URL_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_url_dialog.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URL_ENTRY_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_url_entry.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URLS_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_urls_page.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URLS_PAGE_BROWSER_PROXY_JS"
+           file="on_startup_page/startup_urls_page_browser_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_OPEN_WINDOW_PROXY_JS"
+           file="open_window_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PAGE_VISIBILITY_JS"
+           file="page_visibility.js"
            preprocess="true"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <if expr="not chromeos">
-    <include name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_DIALOG_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/people_page/import_data_dialog.m.js"
+    <include name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_DIALOG_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/people_page/import_data_dialog.js"
              use_base_dir="false"
-             type="BINDATA" />
-    <include name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_BROWSER_PROXY_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/people_page/import_data_browser_proxy.m.js"
+             compress="false" type="BINDATA" />
+    <include name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_BROWSER_PROXY_JS"
+             file="people_page/import_data_browser_proxy.js"
+             compress="false" type="BINDATA" />
+    <include name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/people_page/manage_profile.js"
              use_base_dir="false"
-             type="BINDATA" />
-    <include name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/people_page/manage_profile.m.js"
-             use_base_dir="false"
-             type="BINDATA" />
-    <include name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_BROWSER_PROXY_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/people_page/manage_profile_browser_proxy.m.js"
-             use_base_dir="false"
-             type="BINDATA" />
+             compress="false" type="BINDATA" />
+    <include name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_BROWSER_PROXY_JS"
+             file="people_page/manage_profile_browser_proxy.js"
+             compress="false" type="BINDATA" />
   </if>
   <if expr="chromeos">
     <include name="IDR_SETTINGS_PEOPLE_PAGE_ACCOUNT_MANAGER_BROWSER_PROXY_M_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/people_page/account_manager_browser_proxy.m.js"
              use_base_dir="false"
-             type="BINDATA" />
+             compress="false" type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_ACCOUNT_CONTROL_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_account_control.m.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_browser_proxy.m.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_ENCRYPTION_OPTIONS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_encryption_options.m.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PEOPLE_PAGE_PEOPLE_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/people_page/people_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PEOPLE_PAGE_PEOPLE_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/people_page/people_page.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_PROFILE_INFO_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/profile_info_browser_proxy.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SIGNOUT_DIALOG_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/signout_dialog.m.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_CONTROLS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_controls.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_PAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_page.m.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PLURAL_STRING_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/plural_string_proxy.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PLURAL_STRING_PROXY_JS"
+           file="plural_string_proxy.js"
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PREFS_PREFS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PREFS_PREFS_BEHAVIOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs_behavior.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PREFS_PREFS_TYPES_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs_types.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PREFS_PREF_UTIL_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/pref_util.m.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRINTING_PAGE_CLOUD_PRINTERS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/cloud_printers.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRINTING_PAGE_CLOUD_PRINTERS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/cloud_printers.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/printing_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/printing_page.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_COLLAPSE_RADIO_BUTTON_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/collapse_radio_button.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_COLLAPSE_RADIO_BUTTON_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/collapse_radio_button.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_COOKIES_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/cookies_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_COOKIES_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/cookies_page.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_DO_NOT_TRACK_TOGGLE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/do_not_track_toggle.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_DO_NOT_TRACK_TOGGLE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/do_not_track_toggle.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_PRIVACY_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/privacy_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_PRIVACY_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/privacy_page.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_PASSWORDS_LEAK_DETECTION_TOGGLE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/passwords_leak_detection_toggle.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_PASSWORDS_LEAK_DETECTION_TOGGLE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/passwords_leak_detection_toggle.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_PERSONALIZATION_OPTIONS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/personalization_options.m.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.m.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SAFE_BROWSING_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/safe_browsing_browser_proxy.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SAFE_BROWSING_BROWSER_PROXY_JS"
+           file="privacy_page/safe_browsing_browser_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURE_DNS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/secure_dns.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURE_DNS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/secure_dns.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURE_DNS_INPUT_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/secure_dns_input.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURE_DNS_INPUT_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/secure_dns_input.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_page.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_DISABLE_SAFEBROWSING_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_BIO_ENROLL_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_bio_enroll_dialog.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_DISABLE_SAFEBROWSING_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_browser_proxy.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_BIO_ENROLL_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_bio_enroll_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_credential_management_dialog.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_BROWSER_PROXY_JS"
+           file="privacy_page/security_keys_browser_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_credential_management_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_PIN_FIELD_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_pin_field.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_PIN_FIELD_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_pin_field.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_RESET_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_reset_dialog.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_RESET_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_reset_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_SET_PIN_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_set_pin_dialog.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_SET_PIN_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_set_pin_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_SUBPAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_subpage.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_SUBPAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_subpage.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_RESET_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/reset_page/reset_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_RESET_PAGE_RESET_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/reset_page/reset_page.js"
            use_base_dir="false"
            preprocess="true"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_RESET_PROFILE_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/reset_page/reset_profile_dialog.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_RESET_PROFILE_BANNER_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/reset_page/reset_profile_banner.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_RESET_PAGE_RESET_PROFILE_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/reset_page/reset_profile_dialog.js"
            use_base_dir="false"
-           type="BINDATA"/>
-  <include name="IDR_SETTINGS_RESET_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/reset_page/reset_browser_proxy.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_RESET_PAGE_RESET_PROFILE_BANNER_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/reset_page/reset_profile_banner.js"
            use_base_dir="false"
+           compress="false" type="BINDATA"/>
+  <include name="IDR_SETTINGS_RESET_PAGE_RESET_BROWSER_PROXY_JS"
+           file="reset_page/reset_browser_proxy.js"
            preprocess="true"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_ROUTE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/route.m.js"
-           use_base_dir="false"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_ROUTE_JS"
+           file="route.js"
            preprocess="true"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_ROUTER_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/router.m.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_browser_proxy.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_BROWSER_PROXY_JS"
+           file="safety_check_page/safety_check_browser_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_CHILD_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_child.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_EXTENSIONS_ELEMENT_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_extensions_element.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_page.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_PASSWORDS_ELEMENT_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_passwords_element.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_SAFE_BROWSING_ELEMENT_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_safe_browsing_element.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_UPDATES_ELEMENT_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_updates_element.js"
+           use_base_dir="false"
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_ENGINES_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.m.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_OMNIBOX_EXTENSION_ENTRY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/omnibox_extension_entry.m.js"
+  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_OMNIBOX_EXTENSION_ENTRY_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/omnibox_extension_entry.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_CSS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engine_entry_css.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_CSS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engine_entry_css.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engine_entry.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engine_entry.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_LIST_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_list.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_LIST_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_list.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_page.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SEARCH_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/search_page/search_page.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SEARCH_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/search_page/search_page.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_SETTINGS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_settings.m.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SETTINGS_MAIN_SETTINGS_MAIN_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/settings_main/settings_main.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SETTINGS_MAIN_SETTINGS_MAIN_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_main/settings_main.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_MAIN_PAGE_BEHAVIOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/main_page_behavior.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_SETTINGS_ANIMATED_PAGES_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/settings_animated_pages.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_SETTINGS_SECTION_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/settings_section.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_SETTINGS_SUBPAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/settings_subpage.m.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SETTINGS_UI_SETTINGS_UI_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/settings_ui/settings_ui.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SETTINGS_UI_SETTINGS_UI_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_ui/settings_ui.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_SETTINGS_ROUTES_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/settings_routes.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
+  <include name="IDR_SETTINGS_SETTINGS_ROUTES_JS"
+           file="settings_routes.js"
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_CSS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page_css.m.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_SHARED_CSS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_shared_css.m.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SETTINGS_VARS_CSS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_vars_css.m.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SETTINGS_V3_HTML"
            file="settings_v3.html"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_V3_JS"
            file="settings.js"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_SITE_FAVICON_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_favicon.m.js"
+  <include name="IDR_SETTINGS_SITE_FAVICON_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_favicon.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_ADD_SITE_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/add_site_dialog.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_ADD_SITE_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/add_site_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_ALL_SITES_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/all_sites.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_ALL_SITES_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/all_sites.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_ALL_SITES_ICONS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/all_sites_icons.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_ALL_SITES_ICONS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/all_sites_icons.js"
            use_base_dir="false"
-           type="BINDATA" />
+           compress="false" type="BINDATA" />
   <if expr="chromeos">
-    <include name="IDR_SETTINGS_SITE_SETTINGS_ANDROID_INFO_BROWSER_PROXY_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/android_info_browser_proxy.m.js"
-             use_base_dir="false"
-             type="BINDATA" />
+    <include name="IDR_SETTINGS_SITE_SETTINGS_ANDROID_INFO_BROWSER_PROXY_JS"
+             file="site_settings/android_info_browser_proxy.js"
+             compress="false" type="BINDATA" />
   </if>
-  <include name="IDR_SETTINGS_SITE_SETTINGS_CATEGORY_DEFAULT_SETTING_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/category_default_setting.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_CATEGORY_SETTING_EXCEPTIONS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/category_setting_exceptions.m.js"
-           use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_CHOOSER_EXCEPTION_LIST_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/chooser_exception_list.m.js"
+  <include name="IDR_SETTINGS_SITE_SETTINGS_CATEGORY_DEFAULT_SETTING_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/category_default_setting.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_CHOOSER_EXCEPTION_LIST_ENTRY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/chooser_exception_list_entry.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_CATEGORY_SETTING_EXCEPTIONS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/category_setting_exceptions.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_CLEAR_STORAGE_DIALOG_CSS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/clear_storage_dialog_css.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_CHOOSER_EXCEPTION_LIST_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/chooser_exception_list.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_CONSTANTS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/constants.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_CHOOSER_EXCEPTION_LIST_ENTRY_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/chooser_exception_list_entry.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_COOKIE_INFO_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/cookie_info.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_CLEAR_STORAGE_DIALOG_CSS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/clear_storage_dialog_css.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_EDIT_EXCEPTION_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/edit_exception_dialog.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_CONSTANTS_JS"
+           file="site_settings/constants.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_COOKIE_INFO_JS"
+           file="site_settings/cookie_info.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_EDIT_EXCEPTION_DIALOG_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/edit_exception_dialog.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_LOCAL_DATA_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/local_data_browser_proxy.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_LOCAL_DATA_BROWSER_PROXY_JS"
+           file="site_settings/local_data_browser_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_MEDIA_PICKER_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/media_picker.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_MEDIA_PICKER_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/media_picker.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_PDF_DOCUMENTS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/pdf_documents.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_PDF_DOCUMENTS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/pdf_documents.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_PROTOCOL_HANDLERS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/protocol_handlers.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_PROTOCOL_HANDLERS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/protocol_handlers.m.js"
-           use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data.m.js"
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_DETAILS_SUBPAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data_details_subpage.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_DETAILS_SUBPAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data_details_subpage.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_ENTRY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data_entry.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_ENTRY_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data_entry.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DETAILS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_details.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DETAILS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_details.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DETAILS_PERMISSION_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_details_permission.m.js"
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DETAILS_PERMISSION_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_details_permission.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_ENTRY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_entry.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_ENTRY_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_entry.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_LIST_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_list.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_LIST_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_list.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_LIST_ENTRY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_list_entry.m.js"
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_LIST_ENTRY_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_list_entry.js"
            use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_SETTINGS_BEHAVIOR_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_settings_behavior.m.js"
-           use_base_dir="false"
-           type="BINDATA"
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_SETTINGS_BEHAVIOR_JS"
+           file="site_settings/site_settings_behavior.js"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.m.js"
-           use_base_dir="false"
-           type="BINDATA"
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_JS"
+           file="site_settings/site_settings_prefs_browser_proxy.js"
+           compress="false" type="BINDATA"
            preprocess="true" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_WEBSITE_USAGE_BROWSER_PROXY_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/website_usage_browser_proxy.m.js"
+  <include name="IDR_SETTINGS_SITE_SETTINGS_WEBSITE_USAGE_BROWSER_PROXY_JS"
+           file="site_settings/website_usage_browser_proxy.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/zoom_levels.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/zoom_levels.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_PAGE_RECENT_SITE_PERMISSIONS_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings_page/recent_site_permissions.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_PAGE_RECENT_SITE_PERMISSIONS_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings_page/recent_site_permissions.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_PAGE_SITE_SETTINGS_LIST_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings_page/site_settings_list.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_PAGE_SITE_SETTINGS_LIST_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings_page/site_settings_list.m.js"
+           compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_PAGE_SITE_SETTINGS_PAGE_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings_page/site_settings_page.js"
            use_base_dir="false"
-           type="BINDATA" />
-  <include name="IDR_SETTINGS_SITE_SETTINGS_PAGE_SITE_SETTINGS_PAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings_page/site_settings_page.m.js"
-           use_base_dir="false"
-           type="BINDATA"
+           compress="false" type="BINDATA"
            preprocess="true" />
   <if expr="not chromeos">
-    <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_BROWSER_PROXY_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/printing_browser_proxy.m.js"
-             use_base_dir="false"
-             type="BINDATA" />
-    <include name="IDR_SETTINGS_SYSTEM_PAGE_BROWSER_PROXY_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/system_page/system_page_browser_proxy.m.js"
-             use_base_dir="false"
-             type="BINDATA" />
-    <include name="IDR_SETTINGS_SYSTEM_PAGE_M_JS"
-             file="${root_gen_dir}/chrome/browser/resources/settings/system_page/system_page.m.js"
+    <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_BROWSER_PROXY_JS"
+             file="printing_page/printing_browser_proxy.js"
+             compress="false" type="BINDATA" />
+    <include name="IDR_SETTINGS_SYSTEM_PAGE_BROWSER_PROXY_JS"
+             file="system_page/system_page_browser_proxy.js"
+             compress="false" type="BINDATA" />
+    <include name="IDR_SETTINGS_SYSTEM_PAGE_JS"
+             file="${root_gen_dir}/chrome/browser/resources/settings/system_page/system_page.js"
              use_base_dir="false"
-             type="BINDATA"
+             compress="false" type="BINDATA"
              preprocess="true" />
   </if>
 </grit-part>
diff --git a/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd b/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd
index 5c4b44a2c1b..51e23355bdf 100644
--- a/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd
+++ b/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd
@@ -12,30 +12,6 @@
   </outputs>
   <release seq="1">
     <includes>
-      <include name="IDR_SETTINGS_VULCANIZED_HTML"
-               file="${root_gen_dir}\chrome\browser\resources\settings\vulcanized.html"
-               use_base_dir="false"
-               preprocess="true"
-               type="BINDATA"
-               compress="gzip" />
-      <include name="IDR_SETTINGS_CRISPER_JS"
-               file="${root_gen_dir}\chrome\browser\resources\settings\crisper.js"
-               use_base_dir="false"
-               preprocess="true"
-               type="BINDATA"
-               compress="gzip" />
-      <include name="IDR_SETTINGS_LAZY_LOAD_VULCANIZED_HTML"
-               file="${root_gen_dir}\chrome\browser\resources\settings\lazy_load.vulcanized.html"
-               use_base_dir="false"
-               preprocess="true"
-               type="BINDATA"
-               compress="gzip" />
-      <include name="IDR_SETTINGS_LAZY_LOAD_CRISPER_JS"
-               file="${root_gen_dir}\chrome\browser\resources\settings\lazy_load.crisper.js"
-               use_base_dir="false"
-               preprocess="true"
-               type="BINDATA"
-               compress="gzip" />
       <include name="IDR_SETTINGS_IMAGES_COOKIES_BANNER_SVG"
                file="images/cookies_banner.svg"
                type="BINDATA"
diff --git a/chromium/chrome/browser/resources/settings/settings_ui/BUILD.gn b/chromium/chrome/browser/resources/settings/settings_ui/BUILD.gn
index 92a83108aa8..5cc7141efdd 100644
--- a/chromium/chrome/browser/resources/settings/settings_ui/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/settings_ui/BUILD.gn
@@ -3,44 +3,24 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [ ":settings_ui" ]
 }
 
 js_library("settings_ui") {
   deps = [
-    "..:global_scroll_target_behavior",
+    "..:global_scroll_target_behavior.m",
     "..:page_visibility",
     "..:route",
-    "..:router",
-    "../prefs",
-    "../settings_main:settings_main",
-    "//ui/webui/resources/cr_elements:cr_container_shadow_behavior",
-    "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer",
-    "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar",
-    "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar_search_field",
-    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior",
-    "//ui/webui/resources/js:find_shortcut_behavior",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [ ":settings_ui.m" ]
-}
-
-js_library("settings_ui.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/settings_ui/settings_ui.m.js" ]
-  deps = [
-    "..:global_scroll_target_behavior.m",
-    "..:page_visibility.m",
-    "..:route.m",
     "..:router.m",
+    "../basic_page:basic_page",
     "../prefs:prefs.m",
-    "../settings_main:settings_main.m",
+    "../settings_main:settings_main",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_container_shadow_behavior.m",
     "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer.m",
@@ -52,29 +32,8 @@ js_library("settings_ui.m") {
     "//ui/webui/resources/js:find_shortcut_behavior.m",
     "//ui/webui/resources/js:util.m",
   ]
-  extra_deps = [ ":settings_ui_module" ]
-}
-
-group("polymer3_elements") {
-  public_deps = [ ":settings_ui_module" ]
 }
 
-polymer_modulizer("settings_ui") {
-  js_file = "settings_ui.js"
-  html_file = "settings_ui.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/global_scroll_target_behavior.html|setGlobalScrollTarget,resetGlobalScrollTargetForTesting",
-                   "chrome/browser/resources/settings/page_visibility.html|PageVisibility,pageVisibility",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
-                   "ui/webui/resources/html/assert.html|assert",
-                   "ui/webui/resources/html/cr.html|isChromeOS",
-                   "ui/webui/resources/html/util.html|listenOnce",
-                   "ui/webui/resources/cr_elements/cr_container_shadow_behavior.html|CrContainerShadowBehavior",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites + [
-                         "settings.setGlobalScrollTarget|setGlobalScrollTarget",
-                         "settings.resetGlobalScrollTargetForTesting|resetGlobalScrollTargetForTesting",
-                       ]
+html_to_js("web_components") {
+  js_files = [ "settings_ui.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/site_settings/BUILD.gn b/chromium/chrome/browser/resources/settings/site_settings/BUILD.gn
index e72d5093127..6099176e819 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/site_settings/BUILD.gn
@@ -3,22 +3,26 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":add_site_dialog",
     ":all_sites",
+    ":android_info_browser_proxy",
     ":category_default_setting",
     ":category_setting_exceptions",
     ":chooser_exception_list",
     ":chooser_exception_list_entry",
     ":constants",
     ":cookie_info",
+    ":edit_exception_dialog",
     ":local_data_browser_proxy",
     ":media_picker",
+    ":pdf_documents",
     ":protocol_handlers",
     ":site_data",
     ":site_data_details_subpage",
@@ -39,457 +43,140 @@ js_library("add_site_dialog") {
   deps = [
     ":constants",
     ":site_settings_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
 }
 
 js_library("all_sites") {
   deps = [
     ":constants",
-    ":site_settings_behavior",
-    "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("android_info_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
-js_library("category_default_setting") {
-  deps = [
-    ":constants",
-    ":site_settings_behavior",
-    "..:route",
-    "../settings_page:settings_animated_pages",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("category_setting_exceptions") {
-  deps = [
-    ":constants",
-    "../settings_page:settings_animated_pages",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("chooser_exception_list") {
-  deps = [
-    ":chooser_exception_list_entry",
-    ":constants",
-    ":site_settings_behavior",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:list_property_update_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("chooser_exception_list_entry") {
-  deps = [
-    ":constants",
-    ":site_list_entry",
-    ":site_settings_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("constants") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-}
-
-js_library("local_data_browser_proxy") {
-  deps = [
-    ":constants",
-    ":cookie_info",
-    "//ui/webui/resources/js:cr",
-  ]
-  externs_list = [
-    "$externs_path/chrome_send.js",
-    "$externs_path/settings_private.js",
-  ]
-}
-
-js_library("media_picker") {
-  deps = [
-    ":site_settings_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("cookie_info") {
-  deps = [ "//ui/webui/resources/js:load_time_data" ]
-}
-
-js_library("protocol_handlers") {
-  deps = [
-    ":site_settings_behavior",
-
-    # Must be included on all platforms to satisfy closure compiler.
-    ":android_info_browser_proxy",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("site_data") {
-  deps = [
-    ":cookie_info",
-    ":local_data_browser_proxy",
-    ":site_data_entry",
-    ":site_settings_behavior",
-    "..:global_scroll_target_behavior",
-    "..:route",
-    "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:list_property_update_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}
-
-js_library("site_data_details_subpage") {
-  deps = [
-    ":local_data_browser_proxy",
-    "..:route",
-    "..:router",
-    "//third_party/polymer/v1_0/components-chromium/iron-list:iron-list-extracted",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("site_data_entry") {
-  deps = [
-    ":cookie_info",
-    ":local_data_browser_proxy",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:icon",
-    "//ui/webui/resources/js/cr/ui:focus_row_behavior",
-  ]
-}
-
-js_library("site_details") {
-  deps = [
-    ":constants",
-    ":site_details_permission",
-    ":site_settings_behavior",
-    ":website_usage_browser_proxy",
-    "..:router",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("site_details_permission") {
-  deps = [
-    ":constants",
-    ":site_settings_behavior",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("site_entry") {
-  deps = [
-    ":constants",
     ":local_data_browser_proxy",
     ":site_settings_behavior",
     ":site_settings_prefs_browser_proxy",
-    "..:route",
-    "..:router",
-    "//third_party/polymer/v1_0/components-chromium/iron-collapse:iron-collapse-extracted",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
-    "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-}
-
-js_library("site_list") {
-  deps = [
-    ":android_info_browser_proxy",
-    ":constants",
-    ":site_list_entry",
-    ":site_settings_behavior",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:list_property_update_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("site_list_entry") {
-  deps = [
-    ":constants",
-    ":site_settings_behavior",
-    "..:router",
-    "//ui/webui/resources/cr_elements/policy:cr_policy_pref_indicator",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js/cr/ui:focus_row_behavior",
-  ]
-}
-
-js_library("site_settings_behavior") {
-  deps = [
-    ":constants",
-    ":site_settings_prefs_browser_proxy",
-    "..:router",
-    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior",
-    "//ui/webui/resources/cr_elements/policy:cr_policy_pref_behavior",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:icon",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_library("site_settings_prefs_browser_proxy") {
-  deps = [
-    ":constants",
-    "//ui/webui/resources/js:cr",
-  ]
-  externs_list = [
-    "$externs_path/chrome_send.js",
-    "$externs_path/settings_private.js",
-  ]
-}
-
-js_library("website_usage_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
-js_library("zoom_levels") {
-  deps = [
-    ":site_settings_behavior",
-    "//ui/webui/resources/js:list_property_update_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":add_site_dialog.m",
-    ":all_sites.m",
-    ":android_info_browser_proxy.m",
-    ":category_default_setting.m",
-    ":category_setting_exceptions.m",
-    ":chooser_exception_list.m",
-    ":chooser_exception_list_entry.m",
-    ":constants.m",
-    ":cookie_info.m",
-    ":edit_exception_dialog.m",
-    ":local_data_browser_proxy.m",
-    ":media_picker.m",
-    ":pdf_documents.m",
-    ":protocol_handlers.m",
-    ":site_data.m",
-    ":site_data_details_subpage.m",
-    ":site_data_entry.m",
-    ":site_details.m",
-    ":site_details_permission.m",
-    ":site_entry.m",
-    ":site_list.m",
-    ":site_list_entry.m",
-    ":site_settings_behavior.m",
-    ":site_settings_prefs_browser_proxy.m",
-    ":website_usage_browser_proxy.m",
-    ":zoom_levels.m",
-  ]
-}
-
-js_library("add_site_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/add_site_dialog.m.js" ]
-  deps = [
-    ":constants.m",
-    ":site_settings_behavior.m",
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
-    "//ui/webui/resources/js:assert.m",
-    "//ui/webui/resources/js:web_ui_listener_behavior.m",
-  ]
-  extra_deps = [ ":add_site_dialog_module" ]
-}
-
-js_library("all_sites.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/all_sites.m.js" ]
-  deps = [
-    ":constants.m",
-    ":local_data_browser_proxy.m",
-    ":site_settings_behavior.m",
-    ":site_settings_prefs_browser_proxy.m",
     "..:global_scroll_target_behavior.m",
     "..:router.m",
+    "..:settings_routes",
+    "//third_party/polymer/v3_0/components-chromium/iron-list",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
   externs_list = [ "$externs_path/settings_private.js" ]
-  extra_deps = [ ":all_sites_module" ]
 }
 
-js_library("android_info_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/android_info_browser_proxy.m.js" ]
+js_library("android_info_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("category_default_setting.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/category_default_setting.m.js" ]
+js_library("category_default_setting") {
   deps = [
-    ":constants.m",
-    ":site_settings_behavior.m",
-    "..:route.m",
+    ":constants",
+    ":site_settings_behavior",
+    "..:route",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
   externs_list = [ "$externs_path/settings_private.js" ]
-  extra_deps = [ ":category_default_setting_module" ]
 }
 
-js_library("category_setting_exceptions.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/category_setting_exceptions.m.js" ]
+js_library("category_setting_exceptions") {
   deps = [
-    ":constants.m",
-    ":site_settings_behavior.m",
+    ":constants",
+    ":site_settings_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
   externs_list = [ "$externs_path/settings_private.js" ]
-  extra_deps = [ ":category_setting_exceptions_module" ]
 }
 
-js_library("chooser_exception_list.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/chooser_exception_list.m.js" ]
+js_library("chooser_exception_list") {
   deps = [
-    ":chooser_exception_list_entry.m",
-    ":site_settings_behavior.m",
-    ":site_settings_prefs_browser_proxy.m",
+    ":chooser_exception_list_entry",
+    ":site_settings_behavior",
+    ":site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:list_property_update_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
   externs_list = [ "$externs_path/settings_private.js" ]
-  extra_deps = [ ":chooser_exception_list_module" ]
 }
 
-js_library("chooser_exception_list_entry.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/chooser_exception_list_entry.m.js" ]
+js_library("chooser_exception_list_entry") {
   deps = [
-    ":site_list_entry.m",
-    ":site_settings_behavior.m",
-    ":site_settings_prefs_browser_proxy.m",
+    ":site_list_entry",
+    ":site_settings_behavior",
+    ":site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   externs_list = [ "$externs_path/settings_private.js" ]
-  extra_deps = [ ":chooser_exception_list_entry_module" ]
 }
 
-js_library("constants.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/constants.m.js" ]
-  extra_deps = [ ":modulize" ]
+js_library("constants") {
 }
 
-js_library("cookie_info.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/cookie_info.m.js" ]
+js_library("cookie_info") {
   deps = [ "//ui/webui/resources/js:load_time_data.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("edit_exception_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/edit_exception_dialog.m.js" ]
+js_library("edit_exception_dialog") {
   deps = [
-    ":constants.m",
-    ":site_settings_prefs_browser_proxy.m",
+    ":constants",
+    ":site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
   ]
-  extra_deps = [ ":edit_exception_dialog_module" ]
 }
 
-js_library("local_data_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/local_data_browser_proxy.m.js" ]
+js_library("local_data_browser_proxy") {
   deps = [
-    ":cookie_info.m",
+    ":cookie_info",
     "//ui/webui/resources/js:cr.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("media_picker.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/media_picker.m.js" ]
+js_library("media_picker") {
   deps = [
-    ":site_settings_behavior.m",
-    ":site_settings_prefs_browser_proxy.m",
+    ":site_settings_behavior",
+    ":site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":media_picker_module" ]
 }
 
-js_library("pdf_documents.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/pdf_documents.m.js" ]
+js_library("pdf_documents") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  extra_deps = [ ":pdf_documents_module" ]
 }
 
-js_library("protocol_handlers.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/protocol_handlers.m.js" ]
+js_library("protocol_handlers") {
   deps = [
-    ":site_settings_behavior.m",
+    ":site_settings_behavior",
 
     # Must be included on all platforms to satisfy closure compiler.
-    ":android_info_browser_proxy.m",
+    ":android_info_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":protocol_handlers_module" ]
 }
 
-js_library("site_data.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_data.m.js" ]
+js_library("site_data") {
   deps = [
-    ":cookie_info.m",
-    ":local_data_browser_proxy.m",
-    ":site_data_entry.m",
-    ":site_settings_behavior.m",
+    ":local_data_browser_proxy",
+    ":site_settings_behavior",
     "..:global_scroll_target_behavior.m",
-    "..:route.m",
+    "..:route",
+    "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
     "//ui/webui/resources/js:assert.m",
@@ -499,42 +186,35 @@ js_library("site_data.m") {
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  extra_deps = [ ":site_data_module" ]
 }
 
-js_library("site_data_details_subpage.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_data_details_subpage.m.js" ]
+js_library("site_data_details_subpage") {
   deps = [
-    ":local_data_browser_proxy.m",
-    "..:route.m",
+    ":local_data_browser_proxy",
+    "..:route",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":site_data_details_subpage_module" ]
 }
 
-js_library("site_data_entry.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_data_entry.m.js" ]
+js_library("site_data_entry") {
   deps = [
-    ":cookie_info.m",
-    ":local_data_browser_proxy.m",
+    ":local_data_browser_proxy",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:icon.m",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
-  extra_deps = [ ":site_data_entry_module" ]
 }
 
-js_library("site_details.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_details.m.js" ]
+js_library("site_details") {
   deps = [
-    ":constants.m",
-    ":site_details_permission.m",
-    ":site_settings_behavior.m",
-    ":website_usage_browser_proxy.m",
+    ":constants",
+    ":site_details_permission",
+    ":site_settings_behavior",
+    ":website_usage_browser_proxy",
     "..:router.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -542,31 +222,27 @@ js_library("site_details.m") {
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
   externs_list = [ "$externs_path/settings_private.js" ]
-  extra_deps = [ ":site_details_module" ]
 }
 
-js_library("site_details_permission.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_details_permission.m.js" ]
+js_library("site_details_permission") {
   deps = [
-    ":constants.m",
-    ":site_settings_behavior.m",
+    ":constants",
+    ":site_settings_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":site_details_permission_module" ]
 }
 
-js_library("site_entry.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_entry.m.js" ]
+js_library("site_entry") {
   deps = [
-    ":constants.m",
-    ":local_data_browser_proxy.m",
-    ":site_settings_behavior.m",
-    ":site_settings_prefs_browser_proxy.m",
-    "..:route.m",
+    ":constants",
+    ":local_data_browser_proxy",
+    ":site_settings_behavior",
+    ":site_settings_prefs_browser_proxy",
+    "..:route",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/iron-collapse:iron-collapse",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -575,17 +251,17 @@ js_library("site_entry.m") {
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
-  extra_deps = [ ":site_entry_module" ]
 }
 
-js_library("site_list.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_list.m.js" ]
+js_library("site_list") {
   deps = [
-    ":android_info_browser_proxy.m",
-    ":constants.m",
-    ":site_list_entry.m",
-    ":site_settings_behavior.m",
-    ":site_settings_prefs_browser_proxy.m",
+    ":add_site_dialog",
+    ":android_info_browser_proxy",
+    ":constants",
+    ":edit_exception_dialog",
+    ":site_list_entry",
+    ":site_settings_behavior",
+    ":site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/paper-tooltip:paper-tooltip",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
@@ -595,322 +271,75 @@ js_library("site_list.m") {
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
   externs_list = [ "$externs_path/settings_private.js" ]
-  extra_deps = [ ":site_list_module" ]
 }
 
-js_library("site_list_entry.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_list_entry.m.js" ]
+js_library("site_list_entry") {
   deps = [
-    ":constants.m",
-    ":site_settings_behavior.m",
-    "..:route.m",
+    ":constants",
+    ":site_settings_behavior",
+    "..:route",
     "..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_elements/policy:cr_policy_pref_indicator",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_pref_indicator.m",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
-  extra_deps = [ ":site_list_entry_module" ]
 }
 
-js_library("site_settings_behavior.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_settings_behavior.m.js" ]
+js_library("site_settings_behavior") {
   deps = [
-    ":constants.m",
-    ":site_settings_prefs_browser_proxy.m",
+    ":constants",
+    ":site_settings_prefs_browser_proxy",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:icon.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("site_settings_prefs_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.m.js" ]
+js_library("site_settings_prefs_browser_proxy") {
   deps = [
-    ":constants.m",
+    ":constants",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
     "//ui/webui/resources/js:cr.m",
   ]
-  extra_deps = [ ":modulize" ]
+  externs_list = [ "$externs_path/settings_private.js" ]
 }
 
-js_library("website_usage_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/website_usage_browser_proxy.m.js" ]
+js_library("website_usage_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("zoom_levels.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/zoom_levels.m.js" ]
+js_library("zoom_levels") {
   deps = [
-    ":site_settings_behavior.m",
-    ":site_settings_prefs_browser_proxy.m",
+    ":site_settings_behavior",
+    ":site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:list_property_update_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":zoom_levels_module" ]
-}
-
-group("polymer3_elements") {
-  public_deps = [
-    ":add_site_dialog_module",
-    ":all_sites_icons_module",
-    ":all_sites_module",
-    ":category_default_setting_module",
-    ":category_setting_exceptions_module",
-    ":chooser_exception_list_entry_module",
-    ":chooser_exception_list_module",
-    ":clear_storage_dialog_css_module",
-    ":edit_exception_dialog_module",
-    ":media_picker_module",
-    ":modulize",
-    ":pdf_documents_module",
-    ":protocol_handlers_module",
-    ":site_data_details_subpage_module",
-    ":site_data_entry_module",
-    ":site_data_module",
-    ":site_details_module",
-    ":site_details_permission_module",
-    ":site_entry_module",
-    ":site_list_entry_module",
-    ":site_list_module",
-    ":zoom_levels_module",
-  ]
-}
-
-polymer_modulizer("add_site_dialog") {
-  js_file = "add_site_dialog.js"
-  html_file = "add_site_dialog.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSetting,ContentSettingsTypes,SITE_EXCEPTION_WILDCARD",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("all_sites") {
-  js_file = "all_sites.js"
-  html_file = "all_sites.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/global_scroll_target_behavior.html|GlobalScrollTargetBehavior,GlobalScrollTargetBehaviorImpl",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
-                   "chrome/browser/resources/settings/site_settings/constants.html|ALL_SITES_DIALOG,AllSitesAction2,ContentSetting,ContentSettingsTypes,SortMethod",
-                   "chrome/browser/resources/settings/site_settings/local_data_browser_proxy.html|LocalDataBrowserProxy,LocalDataBrowserProxyImpl",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|SiteGroup",
-                   "ui/webui/resources/html/polymer.html|afterNextRender,html,Polymer",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("all_sites_icons") {
-  js_file = "all_sites_icons.m.js"
-  html_file = "all_sites_icons.html"
-  html_type = "iron-iconset"
-}
-
-polymer_modulizer("category_default_setting") {
-  js_file = "category_default_setting.js"
-  html_file = "category_default_setting.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSetting,ContentSettingsTypes",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|ContentSettingProvider,DefaultContentSetting",
-                   "ui/webui/resources/html/assert.html|assert,assertNotReached",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("category_setting_exceptions") {
-  js_file = "category_setting_exceptions.js"
-  html_file = "category_setting_exceptions.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/site_settings/constants.html|ContentSetting,ContentSettingsTypes,SiteSettingSource" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("chooser_exception_list") {
-  js_file = "chooser_exception_list.js"
-  html_file = "chooser_exception_list.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/site_settings/constants.html|ChooserType,ContentSettingsTypes",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|ChooserException,RawChooserException",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("chooser_exception_list_entry") {
-  js_file = "chooser_exception_list_entry.js"
-  html_file = "chooser_exception_list_entry.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|ChooserException" ]
-}
-
-polymer_modulizer("clear_storage_dialog_css") {
-  js_file = "clear_storage_dialog_css.m.js"
-  html_file = "clear_storage_dialog_css.html"
-  html_type = "style-module"
-}
-
-polymer_modulizer("edit_exception_dialog") {
-  js_file = "edit_exception_dialog.js"
-  html_file = "edit_exception_dialog.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/site_settings/constants.html|SITE_EXCEPTION_WILDCARD",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|SiteException,SiteSettingsPrefsBrowserProxy,SiteSettingsPrefsBrowserProxyImpl",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("media_picker") {
-  js_file = "media_picker.js"
-  html_file = "media_picker.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|MediaPickerEntry" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("pdf_documents") {
-  js_file = "pdf_documents.js"
-  html_file = "pdf_documents.html"
-  html_type = "dom-module"
-}
-
-polymer_modulizer("protocol_handlers") {
-  js_file = "protocol_handlers.js"
-  html_file = "protocol_handlers.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/site_settings/android_info_browser_proxy.html|AndroidInfoBrowserProxyImpl,AndroidAppsInfo" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("site_data") {
-  js_file = "site_data.js"
-  html_file = "site_data.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/global_scroll_target_behavior.html|GlobalScrollTargetBehavior,GlobalScrollTargetBehaviorImpl",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
-                   "chrome/browser/resources/settings/site_settings/local_data_browser_proxy.html|LocalDataBrowserProxy,LocalDataBrowserProxyImpl",
-                   "chrome/browser/resources/settings/site_settings/site_data_entry.html|CookieDataSummaryItem",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("site_data_details_subpage") {
-  js_file = "site_data_details_subpage.js"
-  html_file = "site_data_details_subpage.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
-                   "chrome/browser/resources/settings/site_settings/cookie_info.html|CookieDataForDisplay,CookieDetails,getCookieData",
-                   "chrome/browser/resources/settings/site_settings/local_data_browser_proxy.html|CookieList,LocalDataBrowserProxy,LocalDataBrowserProxyImpl",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("site_data_entry") {
-  js_file = "site_data_entry.js"
-  html_file = "site_data_entry.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/site_settings/local_data_browser_proxy.html|LocalDataBrowserProxy,LocalDataBrowserProxyImpl" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("site_details") {
-  js_file = "site_details.js"
-  html_file = "site_details.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
-                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSetting,ContentSettingsTypes",
-                   "chrome/browser/resources/settings/site_settings/website_usage_browser_proxy.html|WebsiteUsageBrowserProxy,WebsiteUsageBrowserProxyImpl",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("site_details_permission") {
-  js_file = "site_details_permission.js"
-  html_file = "site_details_permission.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSetting,ContentSettingsTypes,SiteSettingSource",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|RawSiteException",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("site_entry") {
-  js_file = "site_entry.js"
-  html_file = "site_entry.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/site_settings/constants.html|AllSitesAction2,SortMethod",
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Router",
-                   "chrome/browser/resources/settings/site_settings/local_data_browser_proxy.html|LocalDataBrowserProxy,LocalDataBrowserProxyImpl",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|OriginInfo,SiteGroup",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("site_list") {
-  js_file = "site_list.js"
-  html_file = "site_list.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/site_settings/android_info_browser_proxy.html|AndroidInfoBrowserProxyImpl,AndroidSmsInfo",
-                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSetting,ContentSettingsTypes,INVALID_CATEGORY_SUBTYPE",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|RawSiteException,SiteException,SiteSettingsPrefsBrowserProxyImpl",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("site_list_entry") {
-  js_file = "site_list_entry.js"
-  html_file = "site_list_entry.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Router",
-                   "chrome/browser/resources/settings/site_settings/constants.html|ChooserType,ContentSettingsTypes,SITE_EXCEPTION_WILDCARD",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|SiteException",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("zoom_levels") {
-  js_file = "zoom_levels.js"
-  html_file = "zoom_levels.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|ZoomLevelEntry" ]
-  namespace_rewrites = settings_namespace_rewrites
 }
 
-js_modulizer("modulize") {
-  input_files = [
-    "constants.js",
-    "cookie_info.js",
-    "android_info_browser_proxy.js",
-    "local_data_browser_proxy.js",
-    "site_settings_behavior.js",
-    "site_settings_prefs_browser_proxy.js",
-    "website_usage_browser_proxy.js",
+html_to_js("web_components") {
+  js_files = [
+    "add_site_dialog.js",
+    "all_sites.js",
+    "all_sites_icons.js",
+    "category_default_setting.js",
+    "category_setting_exceptions.js",
+    "chooser_exception_list.js",
+    "chooser_exception_list_entry.js",
+    "clear_storage_dialog_css.js",
+    "edit_exception_dialog.js",
+    "media_picker.js",
+    "pdf_documents.js",
+    "protocol_handlers.js",
+    "site_data.js",
+    "site_data_details_subpage.js",
+    "site_data_entry.js",
+    "site_details.js",
+    "site_details_permission.js",
+    "site_entry.js",
+    "site_list.js",
+    "site_list_entry.js",
+    "zoom_levels.js",
   ]
-  namespace_rewrites = settings_namespace_rewrites
 }
diff --git a/chromium/chrome/browser/resources/settings/site_settings_page/BUILD.gn b/chromium/chrome/browser/resources/settings/site_settings_page/BUILD.gn
index 2cb8a6e32bf..37b50fcd15c 100644
--- a/chromium/chrome/browser/resources/settings/site_settings_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/site_settings_page/BUILD.gn
@@ -3,10 +3,12 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":recent_site_permissions",
     ":site_settings_list",
@@ -17,146 +19,50 @@ js_type_check("closure_compile") {
 js_library("recent_site_permissions") {
   deps = [
     "..:route",
-    "..:router",
-    "../people_page:sync_browser_proxy",
-    "../prefs:prefs_behavior",
-    "../site_settings:site_settings_behavior",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-  ]
-}
-
-js_library("site_settings_page") {
-  deps = [
-    ":recent_site_permissions",
-    ":site_settings_list",
-    "..:route",
-    "..:router",
-    "../site_settings:constants",
-    "../site_settings:site_settings_prefs_browser_proxy",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}
-
-js_library("site_settings_list") {
-  deps = [
-    "..:router",
-    "../site_settings:constants",
-    "../site_settings:site_settings_prefs_browser_proxy",
-    "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":recent_site_permissions.m",
-    ":site_settings_list.m",
-    ":site_settings_page.m",
-  ]
-}
-
-js_library("recent_site_permissions.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings_page/recent_site_permissions.m.js" ]
-  deps = [
-    "..:route.m",
     "..:router.m",
     "../people_page:sync_browser_proxy.m",
     "../prefs:prefs_behavior.m",
-    "../site_settings:constants.m",
-    "../site_settings:site_settings_behavior.m",
+    "../site_settings:constants",
+    "../site_settings:site_settings_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":recent_site_permissions_module" ]
 }
 
-js_library("site_settings_list.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings_page/site_settings_list.m.js" ]
+js_library("site_settings_list") {
   deps = [
     "..:router.m",
-    "../site_settings:constants.m",
-    "../site_settings:site_settings_prefs_browser_proxy.m",
+    "../site_settings:constants",
+    "../site_settings:site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  extra_deps = [ ":site_settings_list_module" ]
 }
 
-js_library("site_settings_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings_page/site_settings_page.m.js" ]
+js_library("site_settings_page") {
   deps = [
-    ":recent_site_permissions.m",
-    ":site_settings_list.m",
-    "..:route.m",
+    ":recent_site_permissions",
+    ":site_settings_list",
+    "..:route",
     "..:router.m",
-    "../site_settings:constants.m",
-    "../site_settings:site_settings_prefs_browser_proxy.m",
+    "../site_settings:constants",
+    "../site_settings:site_settings_prefs_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  extra_deps = [ ":site_settings_page_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":recent_site_permissions_module",
-    ":site_settings_list_module",
-    ":site_settings_page_module",
+html_to_js("web_components") {
+  js_files = [
+    "recent_site_permissions.js",
+    "site_settings_list.js",
+    "site_settings_page.js",
   ]
 }
-
-polymer_modulizer("recent_site_permissions") {
-  js_file = "recent_site_permissions.js"
-  html_file = "recent_site_permissions.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
-                   "chrome/browser/resources/settings/site_settings/constants.html|AllSitesAction,ContentSetting,SiteSettingSource",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|RawSiteException,RecentSitePermissions",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("site_settings_list") {
-  js_file = "site_settings_list.js"
-  html_file = "site_settings_list.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/router.html|Route,Router",
-                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSetting,ContentSettingsTypes",
-                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|SiteSettingsPrefsBrowserProxy,SiteSettingsPrefsBrowserProxyImpl",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("site_settings_page") {
-  js_file = "site_settings_page.js"
-  html_file = "site_settings_page.html"
-  html_type = "dom-module"
-  auto_imports = settings_auto_imports + [
-                   "chrome/browser/resources/settings/route.html|routes",
-                   "chrome/browser/resources/settings/router.html|Route,Router",
-                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSettingsTypes",
-                   "chrome/browser/resources/settings/site_settings_page/site_settings_list.html|CategoryListItem",
-                   "ui/webui/resources/html/assert.html|assert",
-                 ]
-  namespace_rewrites = settings_namespace_rewrites
-}
diff --git a/chromium/chrome/browser/resources/settings/system_page/BUILD.gn b/chromium/chrome/browser/resources/settings/system_page/BUILD.gn
index 63950561901..276b5491ea9 100644
--- a/chromium/chrome/browser/resources/settings/system_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/system_page/BUILD.gn
@@ -3,80 +3,34 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../settings.gni")
 
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  closure_flags = settings_closure_flags
   deps = [
     ":system_page",
     ":system_page_browser_proxy",
   ]
 }
 
-js_library("system_page_browser_proxy") {
-  deps = [
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:load_time_data",
-  ]
-  externs_list = [ "$externs_path/chrome_send.js" ]
-}
-
 js_library("system_page") {
   deps = [
     ":system_page_browser_proxy",
-    "..:lifetime_browser_proxy",
-  ]
-  externs_list = [ "$externs_path/settings_private.js" ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":system_page.m",
-    ":system_page_browser_proxy.m",
-  ]
-}
-
-js_library("system_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/system_page/system_page.m.js" ]
-  deps = [
-    ":system_page_browser_proxy.m",
     "..:lifetime_browser_proxy.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   externs_list = [ "$externs_path/settings_private.js" ]
-  extra_deps = [ ":system_page_module" ]
 }
 
-js_library("system_page_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/system_page/system_page_browser_proxy.m.js" ]
+js_library("system_page_browser_proxy") {
   deps = [
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":modulize" ]
-}
-
-group("polymer3_elements") {
-  public_deps = [
-    ":modulize",
-    ":system_page_module",
-  ]
-}
-
-polymer_modulizer("system_page") {
-  js_file = "system_page.js"
-  html_file = "system_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = [
-    "chrome/browser/resources/settings/lifetime_browser_proxy.html|LifetimeBrowserProxyImpl",
-    "chrome/browser/resources/settings/system_page/system_page_browser_proxy.html|SystemPageBrowserProxyImpl",
-  ]
 }
 
-js_modulizer("modulize") {
-  input_files = [ "system_page_browser_proxy.js" ]
-  namespace_rewrites = settings_namespace_rewrites
+html_to_js("web_components") {
+  js_files = [ "system_page.js" ]
 }