BASELINE: Update Chromium to 92.0.4515.166

Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364

25 files changed, 438 insertions, 645 deletions

diff --git a/chromium/chrome/browser/resources/settings/BUILD.gn b/chromium/chrome/browser/resources/settings/BUILD.gn
index cdf4406a57c..9ec6334caf6 100644
--- a/chromium/chrome/browser/resources/settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/BUILD.gn
@@ -62,6 +62,8 @@ generate_grd("build_grd") {
     "images/permissions_banner.svg",
     "images/privacy_sandbox_banner_dark.svg",
     "images/privacy_sandbox_banner.svg",
+    "images/privacy_sandbox_floc_banner_dark.svg",
+    "images/privacy_sandbox_floc_banner.svg",
     "images/safe_browsing_banner_dark.svg",
     "images/safe_browsing_banner.svg",
     "images/sync_banner_dark.svg",
@@ -528,7 +530,7 @@ js_library("search_settings") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:promise_resolver.m",
-    "//ui/webui/resources/js:search_highlight_utils.m",
+    "//ui/webui/resources/js:search_highlight_utils",
     "//ui/webui/resources/js:util.m",
   ]
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
index 5aacc77816e..ebf7db6a778 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
@@ -146,6 +146,8 @@ generate_grd("build_grd") {
     "images/notification_access_error.svg",
     "images/notification_access_finished.svg",
     "images/notification_access_setup.svg",
+    "images/keyboard_shortcut.svg",
+    "images/switch_access_setup_guide_choose_two_switches.svg",
     "../../nearby_share/shared/nearby_share_pulse_animation.json",
   ]
   input_files_base_dir = rebase_path(".", "//")
@@ -202,7 +204,17 @@ preprocess_if_expr("preprocess_v3") {
     "about_page/about_page_browser_proxy.js",
     "chromeos/ensure_lazy_loaded.m.js",
     "chromeos/lazy_load.js",
+    "chromeos/google_assistant_page/google_assistant_browser_proxy.js",
+    "chromeos/guest_os/guest_os_browser_proxy.js",
+    "chromeos/os_printing_page/cups_printer_dialog_util.js",
+    "chromeos/os_printing_page/cups_printer_types.js",
+    "chromeos/os_printing_page/cups_printers_browser_proxy.js",
+    "chromeos/os_printing_page/cups_printers_entry_list_behavior.js",
+    "chromeos/os_printing_page/cups_printers_entry_manager.js",
+    "chromeos/os_reset_page/os_reset_browser_proxy.js",
     "chromeos/os_settings.js",
+    "chromeos/personalization_page/change_picture_browser_proxy.js",
+    "chromeos/personalization_page/wallpaper_browser_proxy.js",
     "controls/pref_control_behavior.js",
     "controls/settings_boolean_control_behavior.js",
     "extension_control_browser_proxy.js",
@@ -246,17 +258,17 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/ambient_mode_page/constants.m.js",
     "chromeos/ambient_mode_page/topic_source_item.m.js",
     "chromeos/ambient_mode_page/topic_source_list.m.js",
-    "chromeos/bluetooth_page/bluetooth_device_list_item.m.js",
-    "chromeos/bluetooth_page/bluetooth_page.m.js",
-    "chromeos/bluetooth_page/bluetooth_subpage.m.js",
+    "chromeos/bluetooth_page/bluetooth_device_list_item.js",
+    "chromeos/bluetooth_page/bluetooth_page.js",
+    "chromeos/bluetooth_page/bluetooth_subpage.js",
     "chromeos/crostini_page/crostini_arc_adb.m.js",
     "chromeos/crostini_page/crostini_arc_adb_confirmation_dialog.m.js",
     "chromeos/crostini_page/crostini_browser_proxy.m.js",
+    "chromeos/crostini_page/crostini_confirmation_dialog.m.js",
     "chromeos/crostini_page/crostini_disk_resize_confirmation_dialog.m.js",
     "chromeos/crostini_page/crostini_disk_resize_dialog.m.js",
     "chromeos/crostini_page/crostini_export_import.m.js",
     "chromeos/crostini_page/crostini_import_confirmation_dialog.m.js",
-    "chromeos/crostini_page/crostini_mic_sharing_dialog.m.js",
     "chromeos/crostini_page/crostini_page.m.js",
     "chromeos/crostini_page/crostini_port_forwarding.m.js",
     "chromeos/crostini_page/crostini_port_forwarding_add_port_dialog.m.js",
@@ -282,15 +294,12 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/device_page/storage_external.m.js",
     "chromeos/device_page/storage_external_entry.m.js",
     "chromeos/device_page/stylus.m.js",
-    "chromeos/google_assistant_page/google_assistant_browser_proxy.m.js",
-    "chromeos/google_assistant_page/google_assistant_page.m.js",
-    "chromeos/guest_os/guest_os_browser_proxy.m.js",
-    "chromeos/guest_os/guest_os_shared_paths.m.js",
-    "chromeos/guest_os/guest_os_shared_usb_devices.m.js",
+    "chromeos/google_assistant_page/google_assistant_page.js",
+    "chromeos/guest_os/guest_os_shared_paths.js",
+    "chromeos/guest_os/guest_os_shared_usb_devices.js",
     "chromeos/internet_page/esim_install_error_dialog.m.js",
     "chromeos/internet_page/esim_remove_profile_dialog.m.js",
     "chromeos/internet_page/esim_rename_dialog.m.js",
-    "chromeos/internet_page/cellular_banner.m.js",
     "chromeos/internet_page/cellular_networks_list.m.js",
     "chromeos/internet_page/cellular_setup_dialog.m.js",
     "chromeos/internet_page/cellular_setup_settings_delegate.m.js",
@@ -302,6 +311,7 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/internet_page/internet_page_browser_proxy.m.js",
     "chromeos/internet_page/internet_shared_css.m.js",
     "chromeos/internet_page/internet_subpage.m.js",
+    "chromeos/internet_page/network_always_on_vpn.m.js",
     "chromeos/internet_page/network_proxy_section.m.js",
     "chromeos/internet_page/network_summary.m.js",
     "chromeos/internet_page/network_summary_item.m.js",
@@ -310,7 +320,8 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/kerberos_page/kerberos_accounts_browser_proxy.m.js",
     "chromeos/kerberos_page/kerberos_add_account_dialog.m.js",
     "chromeos/kerberos_page/kerberos_page.m.js",
-    "chromeos/localized_link/localized_link.m.js",
+    "chromeos/localized_link/localized_link.js",
+    "chromeos/keyboard_shortcut_banner/keyboard_shortcut_banner.js",
     "chromeos/metrics_recorder.m.js",
     "chromeos/multidevice_page/multidevice_browser_proxy.m.js",
     "chromeos/multidevice_page/multidevice_constants.m.js",
@@ -385,8 +396,8 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/os_apps_page/app_management_page/uninstall_button.m.js",
     "chromeos/os_apps_page/app_management_page/util.m.js",
     "chromeos/os_apps_page/os_apps_page.m.js",
-    "chromeos/os_files_page/os_files_page.m.js",
-    "chromeos/os_files_page/smb_shares_page.m.js",
+    "chromeos/os_files_page/os_files_page.js",
+    "chromeos/os_files_page/smb_shares_page.js",
     "chromeos/os_icons.m.js",
     "chromeos/os_languages_page/add_input_methods_dialog.m.js",
     "chromeos/os_languages_page/add_spellcheck_languages_dialog.js",
@@ -395,10 +406,8 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/os_languages_page/input_method_util.m.js",
     "chromeos/os_languages_page/input_page.m.js",
     "chromeos/os_languages_page/languages_metrics_proxy.m.js",
-    "chromeos/os_languages_page/manage_input_methods_page.m.js",
     "chromeos/os_languages_page/os_add_languages_dialog.m.js",
     "chromeos/os_languages_page/os_edit_dictionary_page.m.js",
-    "chromeos/os_languages_page/os_languages_page.m.js",
     "chromeos/os_languages_page/os_languages_page_v2.m.js",
     "chromeos/os_languages_page/os_languages_section.m.js",
     "chromeos/os_languages_page/shared_style.m.js",
@@ -420,33 +429,30 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/os_people_page/user_list.m.js",
     "chromeos/os_people_page/users_add_user_dialog.m.js",
     "chromeos/os_people_page/users_page.m.js",
-    "chromeos/os_printing_page/cups_add_print_server_dialog.m.js",
-    "chromeos/os_printing_page/cups_add_printer_dialog.m.js",
-    "chromeos/os_printing_page/cups_add_printer_manually_dialog.m.js",
-    "chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.m.js",
-    "chromeos/os_printing_page/cups_edit_printer_dialog.m.js",
-    "chromeos/os_printing_page/cups_nearby_printers.m.js",
-    "chromeos/os_printing_page/cups_printer_dialog_error.m.js",
-    "chromeos/os_printing_page/cups_printer_dialog_util.m.js",
-    "chromeos/os_printing_page/cups_printer_shared_css.m.js",
-    "chromeos/os_printing_page/cups_printer_types.m.js",
-    "chromeos/os_printing_page/cups_printers.m.js",
-    "chromeos/os_printing_page/cups_printers_browser_proxy.m.js",
-    "chromeos/os_printing_page/cups_printers_entry.m.js",
-    "chromeos/os_printing_page/cups_printers_entry_list_behavior.m.js",
-    "chromeos/os_printing_page/cups_printers_entry_manager.m.js",
-    "chromeos/os_printing_page/cups_saved_printers.m.js",
-    "chromeos/os_printing_page/cups_settings_add_printer_dialog.m.js",
-    "chromeos/os_printing_page/os_printing_page.m.js",
+    "chromeos/os_printing_page/cups_add_print_server_dialog.js",
+    "chromeos/os_printing_page/cups_add_printer_dialog.js",
+    "chromeos/os_printing_page/cups_add_printer_manually_dialog.js",
+    "chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.js",
+    "chromeos/os_printing_page/cups_edit_printer_dialog.js",
+    "chromeos/os_printing_page/cups_nearby_printers.js",
+    "chromeos/os_printing_page/cups_printer_dialog_error.js",
+    "chromeos/os_printing_page/cups_printer_shared_css.js",
+    "chromeos/os_printing_page/cups_printers.js",
+    "chromeos/os_printing_page/cups_printers_entry.js",
+    "chromeos/os_printing_page/cups_saved_printers.js",
+    "chromeos/os_printing_page/cups_settings_add_printer_dialog.js",
+    "chromeos/os_printing_page/os_printing_page.js",
     "chromeos/os_privacy_page/os_privacy_page.m.js",
     "chromeos/os_privacy_page/peripheral_data_access_browser_proxy.m.js",
     "chromeos/os_privacy_page/peripheral_data_access_protection_dialog.m.js",
-    "chromeos/os_reset_page/os_powerwash_dialog.m.js",
-    "chromeos/os_reset_page/os_reset_browser_proxy.m.js",
-    "chromeos/os_reset_page/os_reset_page.m.js",
+    "chromeos/os_reset_page/os_powerwash_dialog.js",
+    "chromeos/os_reset_page/os_powerwash_dialog_esim_item.js",
+    "chromeos/os_reset_page/os_reset_page.js",
     "chromeos/os_route.m.js",
     "chromeos/os_search_page/os_search_page.m.js",
     "chromeos/os_search_page/os_search_selection_dialog.m.js",
+    "chromeos/os_search_page/search_subpage.m.js",
+    "chromeos/os_search_page/search_engine.m.js",
     "chromeos/os_settings_icons_css.m.js",
     "chromeos/os_settings_menu/os_settings_menu.m.js",
     "chromeos/os_settings_main/os_settings_main.m.js",
@@ -461,9 +467,7 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/parental_controls_page/parental_controls_browser_proxy.m.js",
     "chromeos/parental_controls_page/parental_controls_page.m.js",
     "chromeos/personalization_page/change_picture.m.js",
-    "chromeos/personalization_page/change_picture_browser_proxy.m.js",
     "chromeos/personalization_page/personalization_page.m.js",
-    "chromeos/personalization_page/wallpaper_browser_proxy.m.js",
     "chromeos/pref_to_setting_metric_converter.m.js",
     "chromeos/route_origin_behavior.m.js",
     "chromeos/search_handler.m.js",
@@ -504,6 +508,7 @@ group("closure_compile_module") {
     "guest_os:closure_compile_module",
     "internet_page:closure_compile_module",
     "kerberos_page:closure_compile_module",
+    "keyboard_shortcut_banner:closure_compile_module",
     "localized_link:closure_compile_module",
     "multidevice_page:closure_compile_module",
     "nearby_share_page:closure_compile_module",
@@ -647,15 +652,16 @@ group("polymer3_elements") {
   public_deps = [
     # Sub-folder targets
     "ambient_mode_page:polymer3_elements",
-    "bluetooth_page:polymer3_elements",
+    "bluetooth_page:web_components",
     "crostini_page:polymer3_elements",
     "date_time_page:polymer3_elements",
     "device_page:polymer3_elements",
-    "google_assistant_page:polymer3_elements",
-    "guest_os:polymer3_elements",
+    "google_assistant_page:web_components",
+    "guest_os:web_components",
     "internet_page:polymer3_elements",
     "kerberos_page:polymer3_elements",
-    "localized_link:polymer3_elements",
+    "keyboard_shortcut_banner:web_components",
+    "localized_link:web_components",
     "multidevice_page:polymer3_elements",
     "nearby_share_page:polymer3_elements",
     "on_startup_page:polymer3_elements",
@@ -664,12 +670,12 @@ group("polymer3_elements") {
     "os_apps_page:polymer3_elements",
     "os_apps_page/app_management_page:polymer3_elements",
     "os_apps_page/app_management_page/plugin_vm_page:polymer3_elements",
-    "os_files_page:polymer3_elements",
+    "os_files_page:web_components",
     "os_languages_page:polymer3_elements",
     "os_people_page:polymer3_elements",
-    "os_printing_page:polymer3_elements",
+    "os_printing_page:web_components",
     "os_privacy_page:polymer3_elements",
-    "os_reset_page:polymer3_elements",
+    "os_reset_page:web_components",
     "os_search_page:polymer3_elements",
     "os_settings_main:polymer3_elements",
     "os_settings_menu:polymer3_elements",
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 5e31e0470dc..35387b4f6a8 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
@@ -3,21 +3,20 @@
 # 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("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
-    ":bluetooth_device_list_item.m",
-    ":bluetooth_page.m",
-    ":bluetooth_subpage.m",
+    ":bluetooth_device_list_item",
+    ":bluetooth_page",
+    ":bluetooth_subpage",
   ]
 }
 
-js_library("bluetooth_device_list_item.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_device_list_item.m.js" ]
+js_library("bluetooth_device_list_item") {
   deps = [
     "//services/device/public/mojom:mojom_js_library_for_compile",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
@@ -25,13 +24,11 @@ js_library("bluetooth_device_list_item.m") {
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
   externs_list = [ "$externs_path/bluetooth.js" ]
-  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" ]
+js_library("bluetooth_page") {
   deps = [
-    ":bluetooth_subpage.m",
+    ":bluetooth_subpage",
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
@@ -46,11 +43,9 @@ js_library("bluetooth_page.m") {
     "$externs_path/bluetooth.js",
     "$externs_path/bluetooth_private.js",
   ]
-  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" ]
+js_library("bluetooth_subpage") {
   deps = [
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
@@ -68,40 +63,12 @@ js_library("bluetooth_subpage.m") {
     "$externs_path/bluetooth.js",
     "$externs_path/bluetooth_private.js",
   ]
-  extra_deps = [ ":bluetooth_subpage_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":bluetooth_device_list_item_module",
-    ":bluetooth_page_module",
-    ":bluetooth_subpage_module",
+html_to_js("web_components") {
+  js_files = [
+    "bluetooth_device_list_item.js",
+    "bluetooth_page.js",
+    "bluetooth_subpage.js",
   ]
 }
-
-polymer_modulizer("bluetooth_device_list_item") {
-  js_file = "bluetooth_device_list_item.js"
-  html_file = "bluetooth_device_list_item.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("bluetooth_page") {
-  js_file = "bluetooth_page.js"
-  html_file = "bluetooth_page.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("bluetooth_subpage") {
-  js_file = "bluetooth_subpage.js"
-  html_file = "bluetooth_subpage.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
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 ce5047372ed..2a08ab82479 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
@@ -14,11 +14,11 @@ js_type_check("closure_compile_module") {
     ":crostini_arc_adb.m",
     ":crostini_arc_adb_confirmation_dialog.m",
     ":crostini_browser_proxy.m",
+    ":crostini_confirmation_dialog.m",
     ":crostini_disk_resize_confirmation_dialog.m",
     ":crostini_disk_resize_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",
@@ -34,7 +34,7 @@ js_library("crostini_arc_adb.m") {
     "..:metrics_recorder.m",
     "..:os_route.m",
     "../..:router",
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
@@ -68,6 +68,16 @@ js_library("crostini_browser_proxy.m") {
   extra_deps = [ ":modulize" ]
 }
 
+js_library("crostini_confirmation_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_confirmation_dialog.m.js" ]
+  deps = [
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
+  extra_deps = [ ":crostini_confirmation_dialog_module" ]
+}
+
 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 = [
@@ -122,18 +132,6 @@ js_library("crostini_import_confirmation_dialog.m") {
   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 = [
-    ":crostini_browser_proxy.m",
-    "../../prefs:prefs_behavior",
-    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
-    "//ui/webui/resources/js:i18n_behavior.m",
-  ]
-  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 = [
@@ -146,9 +144,9 @@ js_library("crostini_page.m") {
     "..:os_route.m",
     "../..:router",
     "../../prefs:prefs_behavior",
-    "../guest_os:guest_os_shared_paths.m",
-    "../guest_os:guest_os_shared_usb_devices.m",
-    "../localized_link:localized_link.m",
+    "../guest_os:guest_os_shared_paths",
+    "../guest_os:guest_os_shared_usb_devices",
+    "../localized_link:localized_link",
     "//chrome/browser/resources/settings/settings_page:settings_animated_pages",
     "//chrome/browser/resources/settings/settings_page:settings_subpage",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
@@ -199,9 +197,9 @@ js_library("crostini_subpage.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/crostini_page/crostini_subpage.m.js" ]
   deps = [
     ":crostini_browser_proxy.m",
+    ":crostini_confirmation_dialog.m",
     ":crostini_disk_resize_confirmation_dialog.m",
     ":crostini_disk_resize_dialog.m",
-    ":crostini_mic_sharing_dialog.m",
     ":crostini_port_forwarding.m",
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
@@ -223,11 +221,11 @@ group("polymer3_elements") {
   public_deps = [
     ":crostini_arc_adb_confirmation_dialog_module",
     ":crostini_arc_adb_module",
+    ":crostini_confirmation_dialog_module",
     ":crostini_disk_resize_confirmation_dialog_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",
@@ -254,6 +252,15 @@ polymer_modulizer("crostini_arc_adb_confirmation_dialog") {
   namespace_rewrites = os_settings_namespace_rewrites
 }
 
+polymer_modulizer("crostini_confirmation_dialog") {
+  js_file = "crostini_confirmation_dialog.js"
+  html_file = "crostini_confirmation_dialog.html"
+  html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  migrated_imports = os_settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+}
+
 polymer_modulizer("crostini_disk_resize_dialog") {
   js_file = "crostini_disk_resize_dialog.js"
   html_file = "crostini_disk_resize_dialog.html"
@@ -290,15 +297,6 @@ polymer_modulizer("crostini_import_confirmation_dialog") {
   namespace_rewrites = os_settings_namespace_rewrites
 }
 
-polymer_modulizer("crostini_mic_sharing_dialog") {
-  js_file = "crostini_mic_sharing_dialog.js"
-  html_file = "crostini_mic_sharing_dialog.html"
-  html_type = "dom-module"
-  auto_imports = os_settings_auto_imports
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-}
-
 polymer_modulizer("crostini_page") {
   js_file = "crostini_page.js"
   html_file = "crostini_page.html"
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 d3b9d81c225..ecf4db5d839 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
@@ -141,7 +141,7 @@ js_library("pointers.m") {
     "..:os_route.m",
     "../..:router",
     "../../controls:settings_toggle_button",
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
   ]
   extra_deps = [ ":pointers_module" ]
 }
@@ -168,7 +168,7 @@ js_library("storage.m") {
     "..:os_route.m",
     "..:route_origin_behavior.m",
     "../..:router",
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
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 6f8a007dd5b..5cbfd7affb9 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
@@ -4,31 +4,25 @@
 
 import("//chrome/browser/resources/settings/chromeos/os_settings.gni")
 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("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
-    ":google_assistant_browser_proxy.m",
-    ":google_assistant_page.m",
+    ":google_assistant_browser_proxy",
+    ":google_assistant_page",
   ]
 }
 
-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_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr.m" ]
 }
 
-js_library("google_assistant_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/google_assistant_page/google_assistant_page.m.js" ]
+js_library("google_assistant_page") {
   deps = [
-    ":google_assistant_browser_proxy.m",
+    ":google_assistant_browser_proxy",
     "//chrome/browser/resources/settings:router",
     "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
     "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
@@ -46,26 +40,8 @@ js_library("google_assistant_page.m") {
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":google_assistant_page_module" ]
-}
-
-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"
-  auto_imports = os_settings_auto_imports
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
 }
 
-js_modulizer("modulize") {
-  input_files = [ "google_assistant_browser_proxy.js" ]
-  namespace_rewrites = os_settings_namespace_rewrites
+html_to_js("web_components") {
+  js_files = [ "google_assistant_page.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/guest_os/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/guest_os/BUILD.gn
index 3c255b35a41..f46fb721ce3 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/guest_os/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/guest_os/BUILD.gn
@@ -3,80 +3,49 @@
 # 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("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
-    ":guest_os_browser_proxy.m",
-    ":guest_os_shared_paths.m",
-    ":guest_os_shared_usb_devices.m",
+    ":guest_os_browser_proxy",
+    ":guest_os_shared_paths",
+    ":guest_os_shared_usb_devices",
   ]
 }
 
-js_library("guest_os_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/guest_os/guest_os_browser_proxy.m.js" ]
+js_library("guest_os_browser_proxy") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:cr.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("guest_os_shared_usb_devices.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/guest_os/guest_os_shared_usb_devices.m.js" ]
+js_library("guest_os_shared_usb_devices") {
   deps = [
-    ":guest_os_browser_proxy.m",
+    ":guest_os_browser_proxy",
     "..:metrics_recorder.m",
     "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":guest_os_shared_usb_devices_module" ]
 }
 
-js_library("guest_os_shared_paths.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/guest_os/guest_os_shared_paths.m.js" ]
+js_library("guest_os_shared_paths") {
   deps = [
-    ":guest_os_browser_proxy.m",
+    ":guest_os_browser_proxy",
     "..:metrics_recorder.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  extra_deps = [ ":guest_os_shared_paths_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":guest_os_shared_paths_module",
-    ":guest_os_shared_usb_devices_module",
-    ":modulize",
+html_to_js("web_components") {
+  js_files = [
+    "guest_os_shared_usb_devices.js",
+    "guest_os_shared_paths.js",
   ]
 }
-
-polymer_modulizer("guest_os_shared_paths") {
-  js_file = "guest_os_shared_paths.js"
-  html_file = "guest_os_shared_paths.html"
-  html_type = "dom-module"
-  auto_imports = os_settings_auto_imports
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-}
-
-polymer_modulizer("guest_os_shared_usb_devices") {
-  js_file = "guest_os_shared_usb_devices.js"
-  html_file = "guest_os_shared_usb_devices.html"
-  html_type = "dom-module"
-  auto_imports = os_settings_auto_imports
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-}
-
-js_modulizer("modulize") {
-  input_files = [ "guest_os_browser_proxy.js" ]
-  namespace_rewrites = os_settings_namespace_rewrites
-}
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 d30eb2c5c96..f77bc2e8cc5 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
@@ -12,7 +12,6 @@ js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
-    ":cellular_banner.m",
     ":cellular_networks_list.m",
     ":cellular_setup_dialog.m",
     ":cellular_setup_settings_delegate.m",
@@ -27,6 +26,7 @@ js_type_check("closure_compile_module") {
     ":internet_page_browser_proxy.m",
     ":internet_shared_css.m",
     ":internet_subpage.m",
+    ":network_always_on_vpn.m",
     ":network_proxy_section.m",
     ":network_summary.m",
     ":network_summary_item.m",
@@ -34,18 +34,6 @@ js_type_check("closure_compile_module") {
   ]
 }
 
-js_library("cellular_banner.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/cellular_banner.m.js" ]
-  deps = [
-    "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout",
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
-    "//ui/webui/resources/js:assert.m",
-    "//ui/webui/resources/js:i18n_behavior.m",
-  ]
-  extra_deps = [ ":cellular_banner_module" ]
-}
-
 js_library("cellular_setup_dialog.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/cellular_setup_dialog.m.js" ]
   deps = [
@@ -67,6 +55,7 @@ js_library("internet_config.m") {
     "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/network:network_config.m",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -79,7 +68,9 @@ js_library("internet_detail_menu.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_menu.m.js" ]
   deps = [
     "//chrome/browser/resources/settings:router",
+    "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/cellular_setup:esim_manager_listener_behavior.m",
     "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider.m",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
@@ -176,6 +167,7 @@ js_library("internet_page.m") {
     "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/cellular_setup:cellular_types.m",
+    "//ui/webui/resources/cr_components/chromeos/cellular_setup:esim_manager_utils.m",
     "//ui/webui/resources/cr_components/chromeos/network:cellular_utils.m",
     "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider.m",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
@@ -215,12 +207,13 @@ js_library("internet_subpage.m") {
   deps = [
     ":cellular_networks_list.m",
     ":internet_page_browser_proxy.m",
+    ":network_always_on_vpn.m",
     "//chrome/browser/resources/settings:router",
     "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
     "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
     "//chrome/browser/resources/settings/chromeos:os_route.m",
     "//chrome/browser/resources/settings/chromeos:route_origin_behavior.m",
-    "//chrome/browser/resources/settings/chromeos/localized_link:localized_link.m",
+    "//chrome/browser/resources/settings/chromeos/localized_link:localized_link",
     "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes",
     "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -238,6 +231,18 @@ js_library("internet_subpage.m") {
   extra_deps = [ ":internet_subpage_module" ]
 }
 
+js_library("network_always_on_vpn.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/network_always_on_vpn.m.js" ]
+  deps = [
+    ":internet_shared_css.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":network_always_on_vpn_module" ]
+}
+
 js_library("network_proxy_section.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.m.js" ]
   deps = [
@@ -313,7 +318,7 @@ js_library("cellular_networks_list.m") {
     ":esim_install_error_dialog.m",
     "../multidevice_page:multidevice_browser_proxy.m",
     "../multidevice_page:multidevice_constants.m",
-    "//chrome/browser/resources/settings/chromeos/localized_link:localized_link.m",
+    "//chrome/browser/resources/settings/chromeos/localized_link:localized_link",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/cellular_setup:cellular_types.m",
     "//ui/webui/resources/cr_components/chromeos/cellular_setup:esim_manager_listener_behavior.m",
@@ -367,7 +372,6 @@ js_library("esim_remove_profile_dialog.m") {
 
 group("polymer3_elements") {
   public_deps = [
-    ":cellular_banner_module",
     ":cellular_networks_list_module",
     ":cellular_setup_dialog_module",
     ":esim_install_error_dialog_module",
@@ -381,6 +385,7 @@ group("polymer3_elements") {
     ":internet_shared_css_module",
     ":internet_subpage_module",
     ":modulize",
+    ":network_always_on_vpn_module",
     ":network_proxy_section_module",
     ":network_summary_item_module",
     ":network_summary_module",
@@ -388,15 +393,6 @@ group("polymer3_elements") {
   ]
 }
 
-polymer_modulizer("cellular_banner") {
-  js_file = "cellular_banner.js"
-  html_file = "cellular_banner.html"
-  html_type = "dom-module"
-  auto_imports = os_settings_auto_imports
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-}
-
 polymer_modulizer("internet_config") {
   js_file = "internet_config.js"
   html_file = "internet_config.html"
@@ -458,6 +454,15 @@ polymer_modulizer("internet_subpage") {
   namespace_rewrites = os_settings_namespace_rewrites
 }
 
+polymer_modulizer("network_always_on_vpn") {
+  js_file = "network_always_on_vpn.js"
+  html_file = "network_always_on_vpn.html"
+  html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  migrated_imports = os_settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+}
+
 polymer_modulizer("network_proxy_section") {
   js_file = "network_proxy_section.js"
   html_file = "network_proxy_section.html"
diff --git a/chromium/chrome/browser/resources/settings/chromeos/keyboard_shortcut_banner/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/keyboard_shortcut_banner/BUILD.gn
new file mode 100644
index 00000000000..c90b1ea7c9a
--- /dev/null
+++ b/chromium/chrome/browser/resources/settings/chromeos/keyboard_shortcut_banner/BUILD.gn
@@ -0,0 +1,24 @@
+# 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")
+import("//tools/polymer/html_to_js.gni")
+import("../os_settings.gni")
+
+js_type_check("closure_compile_module") {
+  closure_flags = os_settings_closure_flags
+  is_polymer3 = true
+  deps = [ ":keyboard_shortcut_banner" ]
+}
+
+js_library("keyboard_shortcut_banner") {
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+  ]
+}
+
+html_to_js("web_components") {
+  js_files = [ "keyboard_shortcut_banner.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 ab8cb38b928..b157d2f4aca 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/localized_link/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/localized_link/BUILD.gn
@@ -3,36 +3,22 @@
 # 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("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
-  deps = [ ":localized_link.m" ]
+  deps = [ ":localized_link" ]
 }
 
-js_library("localized_link.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/localized_link/localized_link.m.js" ]
+js_library("localized_link") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
   ]
-  extra_deps = [ ":localized_link_module" ]
 }
 
-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"
-  namespace_rewrites = os_settings_namespace_rewrites
-  migrated_imports = os_settings_migrated_imports
-  auto_imports =
-      os_settings_auto_imports +
-      [ "ui/webui/resources/html/assert.html|assert,assertNotReached" ]
+html_to_js("web_components") {
+  js_files = [ "localized_link.js" ]
 }
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 add0f2010bc..b15cc1afb23 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
@@ -62,7 +62,7 @@ js_library("multidevice_feature_item.m") {
     "..:os_route.m",
     "..:route_origin_behavior.m",
     "../..:router",
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
   ]
@@ -92,7 +92,7 @@ js_library("multidevice_page.m") {
     "../..:router",
     "../../controls:password_prompt_dialog",
     "../../prefs:prefs_behavior",
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
     "//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",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/nearby_share_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/nearby_share_page/BUILD.gn
index 9c526816696..5cb3ab14182 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/nearby_share_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/nearby_share_page/BUILD.gn
@@ -85,7 +85,7 @@ js_library("nearby_share_device_name_dialog.m") {
 js_library("nearby_share_high_visibility_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_high_visibility_page.m.js" ]
   deps = [
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
     "//chrome/browser/resources/nearby_share/shared:nearby_page_template.m",
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
     "//ui/webui/resources/cr_elements/cr_lottie:cr_lottie.m",
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 610e4b68b5b..42feede2533 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
@@ -48,7 +48,7 @@ js_library("os_apps_page.m") {
     "../../:router",
     "../../prefs:prefs_behavior",
     "../../settings_page:settings_animated_pages",
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
     "./app_management_page:constants.m",
     "./app_management_page:store_client.m",
     "//ui/webui/resources/js:cr.m",
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 ac2deececa2..01218627943 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
@@ -3,60 +3,37 @@
 # 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("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
-    ":os_files_page.m",
-    ":smb_shares_page.m",
+    ":os_files_page",
+    ":smb_shares_page",
   ]
 }
 
-js_library("os_files_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.m.js" ]
+js_library("os_files_page") {
   deps = [
     "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:router",
   ]
-  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" ]
+js_library("smb_shares_page") {
   deps = [
     "..:os_route.m",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  extra_deps = [ ":smb_shares_page_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":os_files_page_module",
-    ":smb_shares_page_module",
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+html_to_js("web_components") {
+  js_files = [
+    "os_files_page.js",
+    "smb_shares_page.js",
   ]
 }
-
-polymer_modulizer("os_files_page") {
-  js_file = "os_files_page.js"
-  html_file = "os_files_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = os_settings_namespace_rewrites
-  migrated_imports = os_settings_migrated_imports
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("smb_shares_page") {
-  js_file = "smb_shares_page.js"
-  html_file = "smb_shares_page.html"
-  html_type = "dom-module"
-  namespace_rewrites = os_settings_namespace_rewrites
-  migrated_imports = os_settings_migrated_imports
-  auto_imports = os_settings_auto_imports
-}
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 19681d78a16..370c59230f1 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
@@ -18,10 +18,8 @@ js_type_check("closure_compile_module") {
     ":input_method_util.m",
     ":input_page.m",
     ":languages_metrics_proxy.m",
-    ":manage_input_methods_page.m",
     ":os_add_languages_dialog.m",
     ":os_edit_dictionary_page.m",
-    ":os_languages_page.m",
     ":os_languages_page_v2.m",
     ":os_languages_section.m",
     ":smart_inputs_page.m",
@@ -42,8 +40,10 @@ js_library("add_spellcheck_languages_dialog") {
     "//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_scrollable_behavior.m",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field",
   ]
 }
 
@@ -87,6 +87,7 @@ js_library("input_page.m") {
     "..:os_route.m",
     "../..:i18n_setup",
     "../..:router",
+    "../keyboard_shortcut_banner:keyboard_shortcut_banner",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
@@ -102,12 +103,6 @@ js_library("languages_metrics_proxy.m") {
   externs_list = [ "$externs_path/metrics_private.js" ]
 }
 
-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 = [ "//ui/webui/resources/js:cr.m" ]
-  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 = [
@@ -134,29 +129,6 @@ js_library("os_edit_dictionary_page.m") {
   extra_deps = [ ":os_edit_dictionary_page_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 = [
-    ":input_method_util.m",
-    ":languages_metrics_proxy.m",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
-    "../..:i18n_setup",
-    "../..:lifetime_browser_proxy",
-    "../..:router",
-    "../localized_link:localized_link.m",
-    "//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/cr_elements/cr_expand_button:cr_expand_button.m",
-    "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render.m",
-    "//ui/webui/resources/js:assert.m",
-    "//ui/webui/resources/js:cr.m",
-    "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
-  ]
-  extra_deps = [ ":os_languages_page_module" ]
-}
-
 js_library("os_languages_page_v2.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page_v2.m.js" ]
   deps = [
@@ -167,11 +139,12 @@ js_library("os_languages_page_v2.m") {
     "..:os_route.m",
     "../..:i18n_setup",
     "../..:router",
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
     "//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/cr_elements/cr_expand_button:cr_expand_button.m",
     "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render.m",
+    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
@@ -183,8 +156,8 @@ js_library("os_languages_section.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.m.js" ]
   deps = [
     ":input_method_options_page.m",
-    ":manage_input_methods_page.m",
-    ":os_languages_page.m",
+    ":input_page.m",
+    ":os_languages_page_v2.m",
     "..:os_route.m",
     "../..:router",
     "../../languages_page:languages",
@@ -192,6 +165,7 @@ js_library("os_languages_section.m") {
     "../../settings_page:settings_subpage",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
@@ -217,11 +191,9 @@ group("polymer3_elements") {
     ":change_device_language_dialog_module",
     ":input_method_options_page_module",
     ":input_page_module",
-    ":manage_input_methods_page_module",
     ":modulize",
     ":os_add_languages_dialog_module",
     ":os_edit_dictionary_page_module",
-    ":os_languages_page_module",
     ":os_languages_page_v2_module",
     ":os_languages_section_module",
     ":shared_style_module",
@@ -254,15 +226,6 @@ polymer_modulizer("change_device_language_dialog") {
   auto_imports = os_settings_auto_imports
 }
 
-polymer_modulizer("manage_input_methods_page") {
-  js_file = "manage_input_methods_page.js"
-  html_file = "manage_input_methods_page.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
 polymer_modulizer("os_add_languages_dialog") {
   js_file = "os_add_languages_dialog.js"
   html_file = "os_add_languages_dialog.html"
@@ -281,15 +244,6 @@ polymer_modulizer("os_edit_dictionary_page") {
   auto_imports = os_settings_auto_imports
 }
 
-polymer_modulizer("os_languages_page") {
-  js_file = "os_languages_page.js"
-  html_file = "os_languages_page.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
 polymer_modulizer("os_languages_page_v2") {
   js_file = "os_languages_page_v2.js"
   html_file = "os_languages_page_v2.html"
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 02d006c3737..9f517e32b41 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
@@ -36,7 +36,7 @@ js_library("account_manager.m") {
     "..:os_route.m",
     "../..:router",
     "../../people_page:account_manager_browser_proxy",
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
     "//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:cr.m",
@@ -136,7 +136,7 @@ js_library("os_people_page.m") {
     "../..:router",
     "../../settings_page:settings_animated_pages",
     "../kerberos_page:kerberos_accounts.m",
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
     "../parental_controls_page:parental_controls_page.m",
     "//chrome/browser/resources/settings/people_page:profile_info_browser_proxy",
     "//chrome/browser/resources/settings/people_page:signout_dialog",
@@ -173,7 +173,7 @@ js_library("os_sync_controls.m") {
     "..:metrics_recorder.m",
     "..:os_route.m",
     "../../:router",
-    "../localized_link:localized_link.m",
+    "../localized_link:localized_link",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
     "//ui/webui/resources/js:assert.m",
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 64da7e4bddf..af19b7c6b03 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
@@ -3,123 +3,99 @@
 # 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("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
-    ":cups_add_print_server_dialog.m",
-    ":cups_add_printer_dialog.m",
-    ":cups_add_printer_manually_dialog.m",
-    ":cups_add_printer_manufacturer_model_dialog.m",
-    ":cups_edit_printer_dialog.m",
-    ":cups_nearby_printers.m",
-    ":cups_printer_dialog_error.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",
-    ":cups_settings_add_printer_dialog.m",
-    ":os_printing_page.m",
+    ":cups_add_print_server_dialog",
+    ":cups_add_printer_dialog",
+    ":cups_add_printer_manually_dialog",
+    ":cups_add_printer_manufacturer_model_dialog",
+    ":cups_edit_printer_dialog",
+    ":cups_nearby_printers",
+    ":cups_printer_dialog_error",
+    ":cups_printer_dialog_util",
+    ":cups_printer_shared_css",
+    ":cups_printer_types",
+    ":cups_printers",
+    ":cups_printers_browser_proxy",
+    ":cups_printers_entry",
+    ":cups_printers_entry_list_behavior",
+    ":cups_printers_entry_manager",
+    ":cups_saved_printers",
+    ":cups_settings_add_printer_dialog",
+    ":os_printing_page",
   ]
 }
 
-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" ]
+js_library("cups_settings_add_printer_dialog") {
   deps = [
-    ":cups_printers_browser_proxy.m",
+    ":cups_printers_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  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" ]
+js_library("cups_add_print_server_dialog") {
   deps = [
-    ":cups_printer_dialog_util.m",
-    ":cups_printers_browser_proxy.m",
+    ":cups_printer_dialog_util",
+    ":cups_printers_browser_proxy",
   ]
-  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" ]
+js_library("cups_add_printer_manufacturer_model_dialog") {
   deps = [
-    ":cups_printers_browser_proxy.m",
+    ":cups_printers_browser_proxy",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  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" ]
+js_library("cups_add_printer_manually_dialog") {
   deps = [
-    ":cups_printers_browser_proxy.m",
+    ":cups_printers_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  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" ]
+js_library("cups_add_printer_dialog") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  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" ]
-  extra_deps = [ ":cups_printer_dialog_error_module" ]
+js_library("cups_printer_dialog_error") {
 }
 
-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 = [ ":cups_printer_dialog_util.m" ]
-  extra_deps = [ ":cups_edit_printer_dialog_module" ]
+js_library("cups_edit_printer_dialog") {
+  deps = [ ":cups_printer_dialog_util" ]
 }
 
-js_library("cups_nearby_printers.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_nearby_printers.m.js" ]
-  deps = [ ":cups_printer_dialog_util.m" ]
-  extra_deps = [ ":cups_nearby_printers_module" ]
+js_library("cups_nearby_printers") {
+  deps = [ ":cups_printer_dialog_util" ]
 }
 
-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" ]
+js_library("cups_printer_dialog_util") {
   deps = [
-    ":cups_printer_types.m",
+    ":cups_printer_types",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
-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" ]
-  extra_deps = [ ":cups_printer_shared_css_module" ]
+js_library("cups_printer_shared_css") {
 }
 
-js_library("cups_printer_types.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_types.m.js" ]
-  deps = [ ":cups_printers_browser_proxy.m" ]
-  extra_deps = [ ":modulize" ]
+js_library("cups_printer_types") {
+  deps = [ ":cups_printers_browser_proxy" ]
 }
 
-js_library("cups_printers.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers.m.js" ]
+js_library("cups_printers") {
   deps = [
-    ":cups_printer_types.m",
-    ":cups_printers_browser_proxy.m",
-    ":cups_settings_add_printer_dialog.m",
+    ":cups_printer_types",
+    ":cups_printers_browser_proxy",
+    ":cups_settings_add_printer_dialog",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:router",
@@ -130,57 +106,45 @@ js_library("cups_printers.m") {
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  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" ]
+js_library("cups_printers_browser_proxy") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:cr.m",
   ]
-  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" ]
+js_library("cups_printers_entry") {
   deps = [
-    ":cups_printer_types.m",
+    ":cups_printer_types",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
-  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" ]
+js_library("cups_printers_entry_list_behavior") {
   deps = [
-    ":cups_printer_types.m",
-    ":cups_printers_entry_manager.m",
+    ":cups_printer_types",
+    ":cups_printers_entry_manager",
   ]
-  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" ]
-  extra_deps = [ ":modulize" ]
+js_library("cups_printers_entry_manager") {
 }
 
-js_library("cups_saved_printers.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/cups_saved_printers.m.js" ]
+js_library("cups_saved_printers") {
   deps = [
-    ":cups_printer_types.m",
-    ":cups_printers_browser_proxy.m",
+    ":cups_printer_types",
+    ":cups_printers_browser_proxy",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
     "//ui/webui/resources/js:list_property_update_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  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" ]
+js_library("os_printing_page") {
   deps = [
-    ":cups_printers_browser_proxy.m",
+    ":cups_printers_browser_proxy",
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
@@ -188,152 +152,22 @@ js_library("os_printing_page.m") {
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
   ]
-  extra_deps = [ ":os_printing_page_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":cups_add_print_server_dialog_module",
-    ":cups_add_printer_dialog_module",
-    ":cups_add_printer_manually_dialog_module",
-    ":cups_add_printer_manufacturer_model_dialog_module",
-    ":cups_edit_printer_dialog_module",
-    ":cups_nearby_printers_module",
-    ":cups_printer_dialog_error_module",
-    ":cups_printer_shared_css_module",
-    ":cups_printers_entry_module",
-    ":cups_printers_module",
-    ":cups_saved_printers_module",
-    ":cups_settings_add_printer_dialog_module",
-    ":modulize",
-    ":os_printing_page_module",
+html_to_js("web_components") {
+  js_files = [
+    "cups_settings_add_printer_dialog.js",
+    "cups_add_print_server_dialog.js",
+    "cups_add_printer_manufacturer_model_dialog.js",
+    "cups_add_printer_manually_dialog.js",
+    "cups_add_printer_dialog.js",
+    "cups_printer_dialog_error.js",
+    "cups_edit_printer_dialog.js",
+    "cups_nearby_printers.js",
+    "cups_printers.js",
+    "cups_printers_entry.js",
+    "cups_saved_printers.js",
+    "os_printing_page.js",
+    "cups_printer_shared_css.js",
   ]
 }
-
-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"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-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"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-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"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-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"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("cups_add_printer_dialog") {
-  js_file = "cups_add_printer_dialog.js"
-  html_file = "cups_add_printer_dialog.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("cups_printer_dialog_error") {
-  js_file = "cups_printer_dialog_error.js"
-  html_file = "cups_printer_dialog_error.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("cups_edit_printer_dialog") {
-  js_file = "cups_edit_printer_dialog.js"
-  html_file = "cups_edit_printer_dialog.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("cups_nearby_printers") {
-  js_file = "cups_nearby_printers.js"
-  html_file = "cups_nearby_printers.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-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"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("cups_printers") {
-  js_file = "cups_printers.js"
-  html_file = "cups_printers.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("cups_printers_entry") {
-  js_file = "cups_printers_entry.js"
-  html_file = "cups_printers_entry.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("cups_saved_printers") {
-  js_file = "cups_saved_printers.js"
-  html_file = "cups_saved_printers.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("os_printing_page") {
-  js_file = "os_printing_page.js"
-  html_file = "os_printing_page.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-js_modulizer("modulize") {
-  input_files = [
-    "cups_printers_browser_proxy.js",
-    "cups_printers_entry_list_behavior.js",
-    "cups_printer_types.js",
-    "cups_printers_entry_manager.js",
-    "cups_printer_dialog_util.js",
-  ]
-  namespace_rewrites = os_settings_namespace_rewrites
-}
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 6903b003c2c..a6770f33473 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
@@ -3,82 +3,65 @@
 # 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("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
-    ":os_powerwash_dialog.m",
-    ":os_reset_browser_proxy.m",
-    ":os_reset_page.m",
+    ":os_powerwash_dialog",
+    ":os_powerwash_dialog_esim_item",
+    ":os_reset_browser_proxy",
+    ":os_reset_page",
   ]
 }
 
-js_library("os_powerwash_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_reset_page/os_powerwash_dialog.m.js" ]
+js_library("os_powerwash_dialog") {
   deps = [
-    ":os_reset_browser_proxy.m",
+    ":os_powerwash_dialog_esim_item",
+    ":os_reset_browser_proxy",
     "..:metrics_recorder.m",
+    "..:os_route.m",
     "../..:lifetime_browser_proxy",
-    "../localized_link:localized_link.m",
+    "../..:router",
+    "../localized_link:localized_link",
+    "//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_components/chromeos/network:onc_mojo.m",
+  ]
+}
+
+js_library("os_powerwash_dialog_esim_item") {
+  deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  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" ]
+js_library("os_reset_browser_proxy") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:cr.m",
   ]
-  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" ]
+js_library("os_reset_page") {
   deps = [
     "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/cellular_setup:esim_manager_utils.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  extra_deps = [ ":os_reset_page_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":modulize",
-    ":os_powerwash_dialog_module",
-    ":os_reset_page_module",
+html_to_js("web_components") {
+  js_files = [
+    "os_powerwash_dialog.js",
+    "os_powerwash_dialog_esim_item.js",
+    "os_reset_page.js",
   ]
 }
-
-polymer_modulizer("os_powerwash_dialog") {
-  js_file = "os_powerwash_dialog.js"
-  html_file = "os_powerwash_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = os_settings_namespace_rewrites
-  migrated_imports = os_settings_migrated_imports
-  auto_imports = os_settings_auto_imports
-}
-
-polymer_modulizer("os_reset_page") {
-  js_file = "os_reset_page.js"
-  html_file = "os_reset_page.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports +
-                 [ "ui/webui/resources/html/assert.html|assert" ]
-}
-
-js_modulizer("modulize") {
-  input_files = [ "os_reset_browser_proxy.js" ]
-  namespace_rewrites = os_settings_namespace_rewrites
-}
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 2e44bd6f19c..5f2ff6f3893 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
@@ -13,6 +13,8 @@ js_type_check("closure_compile_module") {
   deps = [
     ":os_search_page.m",
     ":os_search_selection_dialog.m",
+    ":search_engine.m",
+    ":search_subpage.m",
   ]
 }
 
@@ -22,7 +24,7 @@ js_library("os_search_page.m") {
     "//chrome/browser/resources/settings:router",
     "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
     "//chrome/browser/resources/settings/chromeos:os_route.m",
-    "//chrome/browser/resources/settings/chromeos/google_assistant_page:google_assistant_page.m",
+    "//chrome/browser/resources/settings/chromeos/google_assistant_page:google_assistant_page",
     "//chrome/browser/resources/settings/controls:extension_controlled_indicator",
     "//chrome/browser/resources/settings/search_engines_page:search_engines_browser_proxy",
     "//chrome/browser/resources/settings/settings_page:settings_animated_pages",
@@ -53,10 +55,46 @@ js_library("os_search_selection_dialog.m") {
   extra_deps = [ ":os_search_selection_dialog_module" ]
 }
 
+js_library("search_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_search_page/search_subpage.m.js" ]
+  deps = [
+    "//chrome/browser/resources/settings:router",
+    "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
+    "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/settings_page:settings_subpage",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
+  ]
+  extra_deps = [ ":search_subpage_module" ]
+}
+
+js_library("search_engine.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_search_page/search_engine.m.js" ]
+  deps = [
+    "//chrome/browser/resources/settings:router",
+    "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
+    "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/settings_page:settings_subpage",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
+  ]
+  extra_deps = [ ":search_engine_module" ]
+}
+
 group("polymer3_elements") {
   public_deps = [
     ":os_search_page_module",
     ":os_search_selection_dialog_module",
+    ":search_engine_module",
+    ":search_subpage_module",
   ]
 }
 
@@ -77,3 +115,21 @@ polymer_modulizer("os_search_selection_dialog") {
   namespace_rewrites = os_settings_namespace_rewrites
   migrated_imports = os_settings_migrated_imports
 }
+
+polymer_modulizer("search_subpage") {
+  js_file = "search_subpage.js"
+  html_file = "search_subpage.html"
+  html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  migrated_imports = os_settings_migrated_imports
+}
+
+polymer_modulizer("search_engine") {
+  js_file = "search_engine.js"
+  html_file = "search_engine.html"
+  html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  migrated_imports = os_settings_migrated_imports
+}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
index 5c5f43530ab..79a3a158f8e 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
@@ -154,7 +154,6 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                    "app_management.actions.addApp|addApp",
                                    "app_management.actions.changeApp|changeApp",
                                    "app_management.actions.removeApp|removeApp",
-                                   "app_management.actions.updateArcSupported|updateArcSupported",
                                    "app_management.actions.updateSelectedAppId|updateSelectedAppId",
                                    "app_management.AppManagementStoreClient|AppManagementStoreClient",
                                    "app_management.AppState|AppState",
@@ -258,6 +257,8 @@ os_settings_auto_imports = settings_auto_imports +
                              "chrome/browser/resources/settings/chromeos/os_settings_page/main_page_behavior.html|MainPageBehavior",
                              "chrome/browser/resources/settings/chromeos/search_handler.html|getSearchHandler, setSearchHandlerForTesting",
                              "ui/webui/resources/cr_components/chromeos/network/network_listener_behavior.html|NetworkListenerBehavior",
+                             "ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html|CrToolbarElement",
+                             "ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_search_field.html|CrToolbarSearchFieldElement",
                              "ui/webui/resources/cr_elements/cr_slider/cr_slider.html|SliderTick",
                              "ui/webui/resources/html/assert.html|assert,assertNotReached",
                              "ui/webui/resources/html/cr.html|sendWithPromise,removeWebUIListener,addWebUIListener,WebUIListener",
@@ -289,7 +290,41 @@ os_settings_migrated_imports = [
   "chrome/browser/resources/settings/a11y_page/captions_subpage.html",
   "chrome/browser/resources/settings/about_page/about_page_browser_proxy.html",
   "chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.html",
+  "chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_device_list_item.html",
+  "chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_page.html",
+  "chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_subpage.html",
+  "chrome/browser/resources/settings/chromeos/google_assistant_page/google_assistant_page.html",
+  "chrome/browser/resources/settings/chromeos/guest_os/guest_os_shared_paths.html",
+  "chrome/browser/resources/settings/chromeos/guest_os/guest_os_shared_usb_devices.html",
+  "chrome/browser/resources/settings/chromeos/localized_link/localized_link.html",
+  "chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.html",
+  "chrome/browser/resources/settings/chromeos/os_files_page/smb_shares_page.html",
   "chrome/browser/resources/settings/chromeos/os_languages_page/add_spellcheck_languages_dialog.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_print_server_dialog.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_dialog.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_manually_dialog.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_manufacturer_model_dialog.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_edit_printer_dialog.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_nearby_printers.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_dialog_error.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_dialog_util.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_shared_css.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_types.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_browser_proxy.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry_list_behavior.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry_manager.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_saved_printers.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/cups_settings_add_printer_dialog.html",
+  "chrome/browser/resources/settings/chromeos/os_printing_page/os_printing_page.html",
+  "chrome/browser/resources/settings/chromeos/os_reset_page/os_powerwash_dialog.html",
+  "chrome/browser/resources/settings/chromeos/os_reset_page/os_powerwash_dialog_esim_item.html",
+  "chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_browser_proxy.html",
+  "chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_page.html",
+  "chrome/browser/resources/settings/chromeos/personalization_page/change_picture_browser_proxy.html",
+  "chrome/browser/resources/settings/chromeos/personalization_page/wallpaper_browser_proxy.html",
+  "chrome/browser/resources/settings/chromeos/keyboard_shortcut_banner/keyboard_shortcut_banner.html",
   "chrome/browser/resources/settings/controls/controlled_button.html",
   "chrome/browser/resources/settings/controls/controlled_radio_button.html",
   "chrome/browser/resources/settings/controls/extension_controlled_indicator.html",
@@ -332,6 +367,7 @@ os_settings_migrated_imports = [
   "chrome/browser/resources/settings/settings_page_css.html",
   "chrome/browser/resources/settings/settings_shared_css.html",
   "chrome/browser/resources/settings/settings_vars_css.html",
+  "ui/webui/resources/cr_components/managed_footnote/managed_footnote.html",
   "ui/webui/resources/cr_elements/cr_drawer/cr_drawer.html",
   "ui/webui/resources/cr_elements/cr_link_row/cr_link_row.html",
   "ui/webui/resources/cr_elements/cr_page_host_style_css.html",
@@ -341,4 +377,5 @@ os_settings_migrated_imports = [
   "ui/webui/resources/cr_elements/cr_view_manager/cr_view_manager.html",
   "ui/webui/resources/cr_elements/find_shortcut_behavior.html",
   "ui/webui/resources/html/plural_string_proxy.html",
+  "ui/webui/resources/html/search_highlight_utils.html",
 ]
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 fd02dd04d2d..a83397a0a13 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
@@ -27,7 +27,7 @@ js_library("os_settings_page.m") {
     "../..:router",
     "../..:search_settings",
     "../../settings_page:settings_section",
-    "../bluetooth_page:bluetooth_page.m",
+    "../bluetooth_page:bluetooth_page",
     "../crostini_page:crostini_page.m",
     "../device_page:device_page.m",
     "../kerberos_page:kerberos_page.m",
@@ -38,7 +38,7 @@ js_library("os_settings_page.m") {
     "../os_apps_page:android_apps_browser_proxy.m",
     "../os_apps_page:os_apps_page.m",
     "../os_people_page:os_people_page.m",
-    "../os_printing_page:os_printing_page.m",
+    "../os_printing_page:os_printing_page",
     "../os_privacy_page:os_privacy_page.m",
     "../os_search_page:os_search_page.m",
     "../personalization_page:personalization_page.m",
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 01f6e29059d..8c6463d85eb 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
@@ -12,16 +11,16 @@ js_type_check("closure_compile_module") {
   is_polymer3 = true
   deps = [
     ":change_picture.m",
-    ":change_picture_browser_proxy.m",
+    ":change_picture_browser_proxy",
     ":personalization_page.m",
-    ":wallpaper_browser_proxy.m",
+    ":wallpaper_browser_proxy",
   ]
 }
 
 js_library("change_picture.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/change_picture.m.js" ]
   deps = [
-    ":change_picture_browser_proxy.m",
+    ":change_picture_browser_proxy",
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
@@ -42,15 +41,14 @@ js_library("change_picture.m") {
   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" ]
-  extra_deps = [ ":modulize" ]
+js_library("change_picture_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr.m" ]
 }
 
 js_library("personalization_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/personalization_page.m.js" ]
   deps = [
-    ":wallpaper_browser_proxy.m",
+    ":wallpaper_browser_proxy",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:router",
@@ -63,16 +61,14 @@ js_library("personalization_page.m") {
   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" ]
+js_library("wallpaper_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr.m" ]
   externs_list = [ "$externs_path/chrome_send.js" ]
-  extra_deps = [ ":modulize" ]
 }
 
 group("polymer3_elements") {
   public_deps = [
     ":change_picture_module",
-    ":modulize",
     ":personalization_page_module",
   ]
 }
@@ -97,11 +93,3 @@ polymer_modulizer("personalization_page") {
   namespace_rewrites = os_settings_namespace_rewrites
   auto_imports = os_settings_auto_imports
 }
-
-js_modulizer("modulize") {
-  input_files = [
-    "change_picture_browser_proxy.js",
-    "wallpaper_browser_proxy.js",
-  ]
-  namespace_rewrites = os_settings_namespace_rewrites
-}
diff --git a/chromium/chrome/browser/resources/settings/people_page/BUILD.gn b/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
index 9e66b15d73d..0b0f7557240 100644
--- a/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
@@ -67,7 +67,7 @@ if (!is_chromeos_ash) {
 
   js_library("manage_profile_browser_proxy") {
     deps = [
-      "//ui/webui/resources/cr_elements/cr_profile_avatar_selector:cr_profile_avatar_selector.m",
+      "//ui/webui/resources/cr_elements/cr_profile_avatar_selector:cr_profile_avatar_selector",
       "//ui/webui/resources/js:cr.m",
     ]
   }
diff --git a/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn b/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn
index c9bc39489e0..5cffe30da0d 100644
--- a/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn
@@ -3,17 +3,42 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/grit/preprocess_if_expr.gni")
 import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 import("../settings.gni")
 
+preprocess_folder = "$root_gen_dir/chrome/browser/resources/settings/preprocessed/privacy_sandbox"
+preprocess_manifest = "preprocessed_manifest.json"
+preprocess_gen_manifest = "preprocessed_gen_manifest.json"
+
 generate_grd("build_grdp") {
   grd_prefix = "privacy_sandbox"
   out_grd = "$target_gen_dir/resources.grdp"
-  deps = [ ":web_components" ]
-  input_files_base_dir = rebase_path(target_gen_dir, root_build_dir)
-  input_files = [ "app.js" ]
+  manifest_files = [
+    "$target_gen_dir/$preprocess_manifest",
+    "$target_gen_dir/$preprocess_gen_manifest",
+  ]
   resource_path_prefix = "privacy_sandbox"
+  deps = [
+    ":preprocess",
+    ":preprocess_gen",
+  ]
+}
+
+preprocess_if_expr("preprocess") {
+  in_folder = "./"
+  out_folder = preprocess_folder
+  out_manifest = "$target_gen_dir/$preprocess_manifest"
+  in_files = [ "privacy_sandbox_browser_proxy.js" ]
+}
+
+preprocess_if_expr("preprocess_gen") {
+  in_folder = target_gen_dir
+  out_folder = preprocess_folder
+  out_manifest = "$target_gen_dir/$preprocess_gen_manifest"
+  in_files = [ "app.js" ]
+  deps = [ ":web_components" ]
 }
 
 js_type_check("closure_compile") {
@@ -24,11 +49,16 @@ js_type_check("closure_compile") {
 
 js_library("app") {
   deps = [
+    ":privacy_sandbox_browser_proxy",
     "..:settings",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
 }
 
+js_library("privacy_sandbox_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+}
+
 html_to_js("web_components") {
   js_files = [ "app.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn b/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
index f1bffe2a7d0..ab04e02d8a4 100644
--- a/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
@@ -20,6 +20,7 @@ js_type_check("closure_compile_module") {
 js_library("main_page_behavior") {
   deps = [
     ":settings_section",
+    "..:route",
     "..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",