BASELINE: Update Chromium to 102.0.5005.57

Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2022-05-17 17:24:03 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2022-06-22 07:51:41 +0000
commit: 774f54339e5db91f785733232d3950366db65d07 (patch)
tree: 068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/chrome/browser/resources/settings
parent: f7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff)
39 files changed, 520 insertions, 1154 deletions
diff --git a/chromium/chrome/browser/resources/settings/BUILD.gn b/chromium/chrome/browser/resources/settings/BUILD.gn
index c7fb0edd520..d2a8621134f 100644
--- a/chromium/chrome/browser/resources/settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/BUILD.gn
@@ -16,6 +16,8 @@ import("//ui/webui/webui_features.gni")
 import("../tools/optimize_webui.gni")
 import("settings.gni")
 
+assert(!is_android, "Android does not use these settings")
+
 preprocess_folder = "preprocessed"
 
 if (optimize_webui) {
@@ -92,6 +94,8 @@ generate_grd("build_grd") {
     "images/privacy_guide/welcome_banner.svg",
     "images/privacy_sandbox_banner_dark.svg",
     "images/privacy_sandbox_banner.svg",
+    "images/privacy_sandbox_banner_v3_dark.svg",
+    "images/privacy_sandbox_banner_v3.svg",
     "images/privacy_sandbox_floc_banner_dark.svg",
     "images/privacy_sandbox_floc_banner.svg",
     "images/safe_browsing_banner_dark.svg",
@@ -267,7 +271,7 @@ ts_library("build_ts") {
     "//tools/typescript/definitions/runtime.d.ts",
     "//tools/typescript/definitions/settings_private.d.ts",
   ]
-  if (is_chromeos_ash || is_chromeos_lacros) {
+  if (is_chromeos) {
     definitions +=
         [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ]
   }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
index 689cefea22d..f92df8c62c5 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
@@ -6,8 +6,8 @@ import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/preprocess_if_expr.gni")
+import("//tools/polymer/html_to_js.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
 import("//ui/webui/webui_features.gni")
 import("../../tools/optimize_webui.gni")
 import("./os_settings.gni")
@@ -49,8 +49,8 @@ if (optimize_webui) {
       "//ui/webui/resources/cr_components/app_management:build_ts",
     ]
     excludes = [
-      "chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom-lite.js",
-      "chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/esim_manager.mojom-lite.js",
+      "chrome://resources/mojo/ash/services/cellular_setup/public/mojom/cellular_setup.mojom-lite.js",
+      "chrome://resources/mojo/ash/services/cellular_setup/public/mojom/esim_manager.mojom-lite.js",
       "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-webui.js",
       "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-lite.js",
       "chrome://resources/mojo/chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-lite.js",
@@ -256,7 +256,17 @@ preprocess_if_expr("preprocess_v3") {
   out_folder = "$target_gen_dir/$preprocess_folder_v3"
   out_manifest = "$target_gen_dir/$preprocess_v3_manifest"
   in_files = [
-    "chromeos/ensure_lazy_loaded.m.js",
+    "chromeos/deep_linking_behavior.js",
+    "chromeos/metrics_recorder.js",
+    "chromeos/os_settings_routes.js",
+    "chromeos/route_origin_behavior.js",
+    "chromeos/search_handler.js",
+    "chromeos/os_route.js",
+    "chromeos/os_page_visibility.js",
+    "chromeos/os_people_page/lock_state_behavior.js",
+    "chromeos/os_people_page/os_sync_browser_proxy.js",
+    "chromeos/pref_to_setting_metric_converter.js",
+    "chromeos/ensure_lazy_loaded.js",
     "chromeos/lazy_load.js",
     "chromeos/crostini_page/crostini_browser_proxy.js",
     "chromeos/date_time_page/date_time_types.js",
@@ -270,6 +280,10 @@ preprocess_if_expr("preprocess_v3") {
     "chromeos/internet_page/cellular_setup_settings_delegate.js",
     "chromeos/internet_page/internet_page_browser_proxy.js",
     "chromeos/kerberos_page/kerberos_accounts_browser_proxy.js",
+    "chromeos/multidevice_page/multidevice_browser_proxy.js",
+    "chromeos/multidevice_page/multidevice_constants.js",
+    "chromeos/multidevice_page/multidevice_feature_behavior.js",
+    "chromeos/multidevice_page/multidevice_metrics_logger.js",
     "chromeos/nearby_share_page/nearby_account_manager_browser_proxy.js",
     "chromeos/nearby_share_page/nearby_share_receive_manager.js",
     "chromeos/nearby_share_page/types.js",
@@ -360,6 +374,7 @@ preprocess_if_expr("copy_browser_settings_tsc") {
     "settings_page/settings_animated_pages.js",
     "settings_page/settings_section.js",
     "settings_page/settings_subpage.js",
+    "site_favicon.js",
   ]
 
   in_files = [
@@ -429,7 +444,6 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/date_time_page/date_time_page.js",
     "chromeos/date_time_page/timezone_selector.js",
     "chromeos/date_time_page/timezone_subpage.js",
-    "chromeos/deep_linking_behavior.m.js",
     "chromeos/device_page/device_page.js",
     "chromeos/device_page/display.js",
     "chromeos/device_page/display_layout.js",
@@ -467,26 +481,22 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/kerberos_page/kerberos_add_account_dialog.js",
     "chromeos/kerberos_page/kerberos_page.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_combined_setup_item.m.js",
-    "chromeos/multidevice_page/multidevice_constants.m.js",
-    "chromeos/multidevice_page/multidevice_feature_behavior.m.js",
-    "chromeos/multidevice_page/multidevice_feature_item.m.js",
-    "chromeos/multidevice_page/multidevice_feature_toggle.m.js",
-    "chromeos/multidevice_page/multidevice_notification_access_setup_dialog.m.js",
-    "chromeos/multidevice_page/multidevice_page.m.js",
-    "chromeos/multidevice_page/multidevice_permissions_setup_dialog.m.js",
-    "chromeos/multidevice_page/multidevice_radio_button.m.js",
-    "chromeos/multidevice_page/multidevice_screen_lock_subpage.m.js",
-    "chromeos/multidevice_page/multidevice_smartlock_subpage.m.js",
-    "chromeos/multidevice_page/multidevice_subpage.m.js",
-    "chromeos/multidevice_page/multidevice_tether_item.m.js",
-    "chromeos/multidevice_page/multidevice_task_continuation_disabled_link.m.js",
-    "chromeos/multidevice_page/multidevice_task_continuation_item.m.js",
-    "chromeos/multidevice_page/multidevice_wifi_sync_disabled_link.m.js",
-    "chromeos/multidevice_page/multidevice_wifi_sync_item.m.js",
-    "chromeos/multidevice_page/multidevice_smartlock_item.m.js",
+    "chromeos/multidevice_page/multidevice_combined_setup_item.js",
+    "chromeos/multidevice_page/multidevice_feature_item.js",
+    "chromeos/multidevice_page/multidevice_feature_toggle.js",
+    "chromeos/multidevice_page/multidevice_notification_access_setup_dialog.js",
+    "chromeos/multidevice_page/multidevice_page.js",
+    "chromeos/multidevice_page/multidevice_permissions_setup_dialog.js",
+    "chromeos/multidevice_page/multidevice_radio_button.js",
+    "chromeos/multidevice_page/multidevice_screen_lock_subpage.js",
+    "chromeos/multidevice_page/multidevice_smartlock_subpage.js",
+    "chromeos/multidevice_page/multidevice_subpage.js",
+    "chromeos/multidevice_page/multidevice_tether_item.js",
+    "chromeos/multidevice_page/multidevice_task_continuation_disabled_link.js",
+    "chromeos/multidevice_page/multidevice_task_continuation_item.js",
+    "chromeos/multidevice_page/multidevice_wifi_sync_disabled_link.js",
+    "chromeos/multidevice_page/multidevice_wifi_sync_item.js",
+    "chromeos/multidevice_page/multidevice_smartlock_item.js",
     "chromeos/nearby_share_page/nearby_share_confirm_page.js",
     "chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.js",
     "chromeos/nearby_share_page/nearby_share_data_usage_dialog.js",
@@ -542,7 +552,7 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/os_apps_page/os_apps_page.js",
     "chromeos/os_files_page/os_files_page.js",
     "chromeos/os_files_page/smb_shares_page.js",
-    "chromeos/os_icons.m.js",
+    "chromeos/os_icons.js",
     "chromeos/os_languages_page/add_input_methods_dialog.js",
     "chromeos/os_languages_page/add_spellcheck_languages_dialog.js",
     "chromeos/os_languages_page/change_device_language_dialog.js",
@@ -556,13 +566,10 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/os_languages_page/shared_style.js",
     "chromeos/os_languages_page/shared_vars.js",
     "chromeos/os_languages_page/smart_inputs_page.js",
-    "chromeos/os_page_visibility.m.js",
     "chromeos/os_people_page/account_manager.js",
     "chromeos/os_people_page/fingerprint_list.js",
     "chromeos/os_people_page/lock_screen.js",
     "chromeos/os_people_page/lock_screen_password_prompt_dialog.js",
-    "chromeos/os_people_page/lock_state_behavior.m.js",
-    "chromeos/os_people_page/os_sync_browser_proxy.m.js",
     "chromeos/os_people_page/os_people_page.js",
     "chromeos/os_people_page/os_sync_controls.js",
     "chromeos/os_people_page/pin_autosubmit_dialog.js",
@@ -591,18 +598,16 @@ preprocess_if_expr("preprocess_gen_v3") {
     "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.js",
     "chromeos/os_search_page/os_search_selection_dialog.js",
     "chromeos/os_search_page/search_subpage.js",
     "chromeos/os_search_page/search_engine.js",
-    "chromeos/os_settings_icons_css.m.js",
+    "chromeos/os_settings_icons_css.js",
     "chromeos/os_settings_menu/os_settings_menu.js",
     "chromeos/os_settings_main/os_settings_main.js",
     "chromeos/os_settings_page/settings_idle_load.js",
     "chromeos/os_settings_page/os_settings_page.js",
     "chromeos/os_settings_ui/os_settings_ui.js",
-    "chromeos/os_settings_routes.m.js",
     "chromeos/os_settings_search_box/os_search_result_row.js",
     "chromeos/os_settings_search_box/os_settings_search_box.js",
     "chromeos/os_toolbar/os_toolbar.js",
@@ -610,9 +615,6 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/personalization_page/change_picture.js",
     "chromeos/personalization_page/dark_mode_subpage.js",
     "chromeos/personalization_page/personalization_page.js",
-    "chromeos/pref_to_setting_metric_converter.m.js",
-    "chromeos/route_origin_behavior.m.js",
-    "chromeos/search_handler.m.js",
     "chromeos/settings_scheduler_slider/settings_scheduler_slider.js",
   ]
 }
@@ -664,18 +666,18 @@ js_type_check("closure_compile_local_module") {
   deps = [
     ":global_scroll_target_behavior",
     ":lazy_load",
-    ":metrics_recorder.m",
-    ":os_icons.m",
-    ":os_page_visibility.m",
-    ":os_route.m",
+    ":metrics_recorder",
+    ":os_icons",
+    ":os_page_visibility",
+    ":os_route",
     ":os_settings",
-    ":os_settings_icons_css.m",
-    ":os_settings_routes.m",
-    ":pref_to_setting_metric_converter.m",
+    ":os_settings_icons_css",
+    ":os_settings_routes",
+    ":pref_to_setting_metric_converter",
     ":prefs_behavior",
     ":route_observer_behavior",
-    ":route_origin_behavior.m",
-    ":search_handler.m",
+    ":route_origin_behavior",
+    ":search_handler",
   ]
 }
 
@@ -685,8 +687,7 @@ js_library("os_settings") {
 js_library("lazy_load") {
 }
 
-js_library("deep_linking_behavior.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/deep_linking_behavior.m.js" ]
+js_library("deep_linking_behavior") {
   deps = [
     "..:router",
     "..:setting_id_param_util",
@@ -694,7 +695,6 @@ js_library("deep_linking_behavior.m") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
 js_library("global_scroll_target_behavior") {
@@ -705,54 +705,38 @@ js_library("global_scroll_target_behavior") {
   ]
 }
 
-js_library("metrics_recorder.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/metrics_recorder.m.js" ]
+js_library("metrics_recorder") {
   deps = [ "//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js_library_for_compile" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("os_icons.m") {
-  sources = [
-    "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_icons.m.js",
-  ]
+js_library("os_icons") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  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" ]
+js_library("os_page_visibility") {
   deps = [ "//ui/webui/resources/js:load_time_data.m" ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("os_route.m") {
-  sources = [
-    "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_route.m.js",
-  ]
+js_library("os_route") {
   deps = [
-    ":os_settings_routes.m",
+    ":os_settings_routes",
     "..:router",
     "//chrome/browser/ui/webui/settings/chromeos/constants:mojom_js_library_for_compile",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("os_settings_icons_css.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_icons_css.m.js" ]
-  extra_deps = [ ":os_settings_icons_css_module" ]
+js_library("os_settings_icons_css") {
 }
 
-js_library("os_settings_routes.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_routes.m.js" ]
+js_library("os_settings_routes") {
   deps = [
     "..:router",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
 js_library("prefs_behavior") {
@@ -760,10 +744,8 @@ js_library("prefs_behavior") {
   externs_list = [ "$externs_path/settings_private.js" ]
 }
 
-js_library("pref_to_setting_metric_converter.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/pref_to_setting_metric_converter.m.js" ]
+js_library("pref_to_setting_metric_converter") {
   deps = [ "//chrome/browser/ui/webui/settings/chromeos/constants:mojom_js_library_for_compile" ]
-  extra_deps = [ ":modulize" ]
 }
 
 js_library("route_observer_behavior") {
@@ -773,28 +755,31 @@ js_library("route_observer_behavior") {
   ]
 }
 
-js_library("route_origin_behavior.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/route_origin_behavior.m.js" ]
+js_library("route_origin_behavior") {
   deps = [
-    ":os_route.m",
+    ":os_route",
     "//ui/webui/resources/js:cr.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("search_handler.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/search_handler.m.js" ]
+js_library("search_handler") {
   deps = [
     "//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js_library_for_compile",
     "//ui/webui/resources/js:cr.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
-import("//tools/polymer/polymer.gni")
+html_to_js("web_components") {
+  js_files = [
+    "os_icons.js",
+    "os_settings_icons_css.js",
+  ]
+}
 
 group("polymer3_elements") {
   public_deps = [
+    ":web_components",
+
     # Sub-folder targets
     "ambient_mode_page:web_components",
     "bluetooth_page:web_components",
@@ -806,7 +791,7 @@ group("polymer3_elements") {
     "internet_page:web_components",
     "kerberos_page:web_components",
     "keyboard_shortcut_banner:web_components",
-    "multidevice_page:polymer3_elements",
+    "multidevice_page:web_components",
     "nearby_share_page:web_components",
     "os_a11y_page:web_components",
     "os_about_page:web_components",
@@ -818,7 +803,6 @@ group("polymer3_elements") {
     "os_bluetooth_page:web_components",
     "os_files_page:web_components",
     "os_languages_page:web_components",
-    "os_people_page:polymer3_elements",
     "os_people_page:web_components",
     "os_printing_page:web_components",
     "os_privacy_page:web_components",
@@ -834,43 +818,8 @@ group("polymer3_elements") {
     "personalization_page:web_components",
     "settings_scheduler_slider:web_components",
 
-    # Local targets
-    ":modulize",
-    ":os_icons_module",
-    ":os_settings_icons_css_module",
-
     # Shared with browser settings
     "..:css_wrapper_files",
     "..:html_wrapper_files",
   ]
 }
-
-polymer_modulizer("os_icons") {
-  js_file = "os_icons.m.js"
-  html_file = "os_icons.html"
-  html_type = "iron-iconset"
-  auto_imports = os_settings_auto_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-}
-
-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"
-  auto_imports = os_settings_auto_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-}
-
-js_modulizer("modulize") {
-  input_files = [
-    "deep_linking_behavior.js",
-    "metrics_recorder.js",
-    "os_settings_routes.js",
-    "route_origin_behavior.js",
-    "search_handler.js",
-    "os_route.js",
-    "os_page_visibility.js",
-    "pref_to_setting_metric_converter.js",
-  ]
-  namespace_rewrites = os_settings_namespace_rewrites
-}
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 9ae0102f59c..404145219a5 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
@@ -34,8 +34,8 @@ js_library("ambient_mode_page") {
   deps = [
     ":ambient_mode_browser_proxy",
     ":constants",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
@@ -49,7 +49,7 @@ js_library("ambient_mode_photos_page") {
   deps = [
     ":ambient_mode_browser_proxy",
     ":constants",
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -93,7 +93,7 @@ js_library("album_list") {
   deps = [
     ":constants",
     "..:global_scroll_target_behavior",
-    "..:os_route.m",
+    "..:os_route",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
 }
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 5dee806fc42..fb4916e5acd 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
@@ -21,19 +21,21 @@ js_library("bluetooth_device_list_item") {
   deps = [
     ":bluetooth_page_browser_proxy",
     "//services/device/public/mojom:mojom_js_library_for_compile",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
-  externs_list = [ "$externs_path/bluetooth.js" ]
+  externs_list = [
+    "$externs_path/bluetooth.js",
+    "//ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu_externs.js",
+  ]
 }
 
 js_library("bluetooth_page") {
   deps = [
     ":bluetooth_subpage",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
@@ -49,9 +51,9 @@ js_library("bluetooth_page") {
 
 js_library("bluetooth_subpage") {
   deps = [
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//services/device/public/mojom:mojom_js_library_for_compile",
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 250c8d08d98..0e863b1622c 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
@@ -30,12 +30,11 @@ js_type_check("closure_compile_module") {
 js_library("crostini_arc_adb") {
   deps = [
     ":crostini_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
-    "//ui/webui/resources/cr_components/chromeos/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",
@@ -49,7 +48,7 @@ js_library("crostini_arc_adb") {
 js_library("crostini_arc_adb_confirmation_dialog") {
   deps = [
     ":crostini_browser_proxy",
-    "..:metrics_recorder.m",
+    "..:metrics_recorder",
     "//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,10 +78,11 @@ js_library("crostini_disk_resize_dialog") {
     "//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_dialog:cr_dialog.m",
-    "//ui/webui/resources/cr_elements/cr_slider:cr_slider",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+  externs_list =
+      [ "//ui/webui/resources/cr_elements/cr_slider/cr_slider_externs.js" ]
 }
 
 js_library("crostini_disk_resize_confirmation_dialog") {
@@ -90,7 +90,6 @@ js_library("crostini_disk_resize_confirmation_dialog") {
     ":crostini_browser_proxy",
     "//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_slider:cr_slider",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
@@ -100,8 +99,8 @@ js_library("crostini_export_import") {
   deps = [
     ":crostini_browser_proxy",
     ":crostini_import_confirmation_dialog",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
@@ -115,7 +114,6 @@ js_library("crostini_import_confirmation_dialog") {
     ":crostini_browser_proxy",
     "//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_slider:cr_slider",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
 }
@@ -128,14 +126,13 @@ js_library("crostini_page") {
     ":crostini_extra_containers",
     ":crostini_port_forwarding",
     ":crostini_subpage",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
     "../guest_os:guest_os_shared_paths",
     "../guest_os:guest_os_shared_usb_devices",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
@@ -148,23 +145,26 @@ js_library("crostini_port_forwarding") {
   deps = [
     ":crostini_browser_proxy",
     ":crostini_port_forwarding_add_port_dialog",
-    "..:metrics_recorder.m",
+    "..:metrics_recorder",
     "..:prefs_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
     "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render.m",
-    "//ui/webui/resources/cr_elements/cr_toast:cr_toast",
     "//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 = [
+    "//ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu_externs.js",
+    "//ui/webui/resources/cr_elements/cr_toast/cr_toast_externs.js",
+  ]
 }
 
 js_library("crostini_port_forwarding_add_port_dialog") {
   deps = [
     ":crostini_browser_proxy",
-    "..:metrics_recorder.m",
+    "..:metrics_recorder",
     "//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_input:cr_input.m",
@@ -178,23 +178,25 @@ js_library("crostini_extra_containers") {
   deps = [
     ":crostini_browser_proxy",
     ":crostini_extra_containers_create_dialog",
-    "..:metrics_recorder.m",
+    "..:metrics_recorder",
     "..:prefs_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
     "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render.m",
-    "//ui/webui/resources/cr_elements/cr_toast:cr_toast",
     "//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 = [
+    "//ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu_externs.js",
+  ]
 }
 
 js_library("crostini_extra_containers_create_dialog") {
   deps = [
     ":crostini_browser_proxy",
-    "..:metrics_recorder.m",
+    "..:metrics_recorder",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -209,15 +211,14 @@ js_library("crostini_subpage") {
     ":crostini_disk_resize_dialog",
     ":crostini_extra_containers",
     ":crostini_port_forwarding",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:prefs_behavior",
     "..:route_observer_behavior",
-    "..:route_origin_behavior.m",
+    "..:route_origin_behavior",
     "../..:router",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
-    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row",
     "//ui/webui/resources/js:i18n_behavior.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/date_time_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/date_time_page/BUILD.gn
index c6eb6187536..3c0c2d21938 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
@@ -20,8 +20,8 @@ js_type_check("closure_compile_module") {
 
 js_library("date_time_page") {
   deps = [
-    "..:deep_linking_behavior.m",
-    "..:os_settings_routes.m",
+    "..:deep_linking_behavior",
+    "..:os_settings_routes",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
@@ -61,8 +61,8 @@ js_library("timezone_subpage") {
   deps = [
     ":date_time_types",
     ":timezone_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:os_settings_routes.m",
+    "..:deep_linking_behavior",
+    "..:os_settings_routes",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
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 e2f44f377f3..5353c5e3816 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
@@ -31,7 +31,7 @@ js_type_check("closure_compile_module") {
 js_library("device_page") {
   deps = [
     ":device_page_browser_proxy",
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -48,19 +48,20 @@ js_library("device_page_browser_proxy") {
 
 js_library("display") {
   deps = [
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "../settings_scheduler_slider:settings_scheduler_slider",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_elements/cr_slider:cr_slider",
     "//ui/webui/resources/js:cr.m",
   ]
-  externs_list = chrome_extension_public_externs + [
-                   "$externs_path/settings_private.js",
-                   "$externs_path/system_display.js",
-                   "../settings_controls_types.js",
-                 ]
+  externs_list =
+      chrome_extension_public_externs + [
+        "$externs_path/settings_private.js",
+        "$externs_path/system_display.js",
+        "//ui/webui/resources/cr_elements/cr_slider/cr_slider_externs.js",
+        "../settings_controls_types.js",
+      ]
 }
 
 js_library("display_layout") {
@@ -87,8 +88,8 @@ js_library("drag_behavior") {
 js_library("keyboard") {
   deps = [
     ":device_page_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:i18n_setup",
     "../..:router",
@@ -112,20 +113,22 @@ js_library("layout_behavior") {
 js_library("pointers") {
   deps = [
     ":device_page_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
   ]
+
+  externs_list =
+      [ "//ui/webui/resources/cr_elements/cr_slider/cr_slider_externs.js" ]
 }
 
 js_library("power") {
   deps = [
     ":device_page_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -136,11 +139,10 @@ js_library("power") {
 js_library("storage") {
   deps = [
     ":device_page_browser_proxy",
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
-    "..:route_origin_behavior.m",
+    "..:route_origin_behavior",
     "../..:router",
-    "//ui/webui/resources/cr_components/chromeos/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",
@@ -166,9 +168,9 @@ js_library("storage_external_entry") {
 js_library("stylus") {
   deps = [
     ":device_page_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.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 c5505c9ca5d..d19fbfba730 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
@@ -24,13 +24,12 @@ js_library("google_assistant_page") {
   deps = [
     ":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",
-    "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/chromeos:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:metrics_recorder",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:prefs_behavior",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row",
     "//ui/webui/resources/cr_elements/policy:cr_policy_pref_indicator.m",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:i18n_behavior.m",
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 f46fb721ce3..700f6a69fb6 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/guest_os/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/guest_os/BUILD.gn
@@ -26,7 +26,7 @@ js_library("guest_os_browser_proxy") {
 js_library("guest_os_shared_usb_devices") {
   deps = [
     ":guest_os_browser_proxy",
-    "..:metrics_recorder.m",
+    "..:metrics_recorder",
     "//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",
@@ -36,7 +36,7 @@ js_library("guest_os_shared_usb_devices") {
 js_library("guest_os_shared_paths") {
   deps = [
     ":guest_os_browser_proxy",
-    "..:metrics_recorder.m",
+    "..:metrics_recorder",
     "//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",
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 cedfb15a70d..88274996736 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
@@ -49,7 +49,7 @@ js_library("internet_config") {
   deps = [
     ":internet_shared_css",
     "//chrome/browser/resources/settings:router",
-    "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
+    "//chrome/browser/resources/settings/chromeos:metrics_recorder",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -65,7 +65,7 @@ js_library("internet_config") {
 js_library("internet_detail_menu") {
   deps = [
     "//chrome/browser/resources/settings:router",
-    "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
+    "//chrome/browser/resources/settings/chromeos:deep_linking_behavior",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/cellular_setup:esim_manager_listener_behavior.m",
@@ -75,6 +75,10 @@ js_library("internet_detail_menu") {
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+
+  externs_list = [
+    "//ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu_externs.js",
+  ]
 }
 
 js_library("internet_detail_page") {
@@ -86,10 +90,10 @@ js_library("internet_detail_page") {
     ":settings_traffic_counters",
     ":tether_connection_dialog",
     "//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:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:metrics_recorder",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
-    "//chrome/browser/resources/settings/chromeos/os_people_page:os_sync_browser_proxy.m",
+    "//chrome/browser/resources/settings/chromeos/os_people_page:os_sync_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/iron-collapse:iron-collapse",
     "//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",
@@ -108,7 +112,7 @@ js_library("internet_detail_page") {
     "//ui/webui/resources/cr_components/chromeos/network:network_property_list_mojo.m",
     "//ui/webui/resources/cr_components/chromeos/network:network_siminfo.m",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
-    "//ui/webui/resources/cr_components/chromeos/network_health:network_health_container.m",
+    "//ui/webui/resources/cr_components/chromeos/network_health:network_health_container",
     "//ui/webui/resources/cr_components/chromeos/traffic_counters:traffic_counters",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button.m",
@@ -125,19 +129,22 @@ js_library("internet_known_networks_page") {
   deps = [
     ":internet_shared_css",
     "//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:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:metrics_recorder",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/network:cr_policy_network_behavior_mojo.m",
     "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider.m",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
-    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row",
     "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+
+  externs_list = [
+    "//ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu_externs.js",
   ]
 }
 
@@ -153,9 +160,9 @@ js_library("internet_page") {
     ":internet_subpage",
     ":network_summary",
     "//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:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:metrics_recorder",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -168,11 +175,12 @@ js_library("internet_page") {
     "//ui/webui/resources/cr_components/chromeos/network:sim_lock_dialogs.m",
     "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button.m",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
-    "//ui/webui/resources/cr_elements/cr_toast:cr_toast",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+  externs_list =
+      [ "//ui/webui/resources/cr_elements/cr_toast/cr_toast_externs.js" ]
 }
 
 js_library("internet_page_browser_proxy") {
@@ -194,22 +202,20 @@ js_library("internet_subpage") {
     ":internet_page_browser_proxy",
     ":network_always_on_vpn",
     "//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:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:metrics_recorder",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
-    "//chrome/browser/resources/settings/chromeos:route_origin_behavior.m",
+    "//chrome/browser/resources/settings/chromeos:route_origin_behavior",
     "//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",
     "//ui/webui/resources/cr_components/chromeos/cellular_setup:cellular_types.m",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/cr_components/chromeos/network:cr_policy_network_behavior_mojo.m",
     "//ui/webui/resources/cr_components/chromeos/network:network_list.m",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
-    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row",
     "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -230,7 +236,7 @@ js_library("network_proxy_section") {
   deps = [
     ":internet_shared_css",
     "//chrome/browser/resources/settings:router",
-    "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:prefs_behavior",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes",
@@ -275,7 +281,7 @@ js_library("network_summary_item") {
 
 js_library("tether_connection_dialog") {
   deps = [
-    "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chromeos/services/network_config/public/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout",
     "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon",
@@ -291,13 +297,12 @@ js_library("tether_connection_dialog") {
 js_library("cellular_networks_list") {
   deps = [
     ":esim_install_error_dialog",
-    "../multidevice_page:multidevice_browser_proxy.m",
-    "../multidevice_page:multidevice_constants.m",
+    "../multidevice_page:multidevice_browser_proxy",
+    "../multidevice_page:multidevice_constants",
     "//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",
     "//ui/webui/resources/cr_components/chromeos/cellular_setup:esim_manager_utils.m",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/cr_components/chromeos/network:cellular_utils.m",
     "//ui/webui/resources/cr_components/chromeos/network:network_list_types.m",
     "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
@@ -305,12 +310,16 @@ js_library("cellular_networks_list") {
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+
+  externs_list = [
+    "//ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu_externs.js",
+  ]
 }
 
 js_library("cellular_roaming_toggle_button") {
   deps = [
     ":internet_shared_css",
-    "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
+    "//chrome/browser/resources/settings/chromeos:metrics_recorder",
     "//chrome/browser/resources/settings/chromeos:prefs_behavior",
     "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -346,7 +355,7 @@ js_library("esim_rename_dialog") {
 js_library("esim_remove_profile_dialog") {
   deps = [
     "//chrome/browser/resources/settings:router",
-    "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//ui/webui/resources/cr_components/chromeos/cellular_setup:esim_manager_utils.m",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/kerberos_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/kerberos_page/BUILD.gn
index 6f7ef8a4809..766f6829d53 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/kerberos_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/kerberos_page/BUILD.gn
@@ -20,19 +20,22 @@ js_type_check("closure_compile_module") {
 js_library("kerberos_accounts") {
   deps = [
     ":kerberos_accounts_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "../os_people_page:account_manager_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:icon",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+
+  externs_list = [
+    "//ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu_externs.js",
+  ]
 }
 
 js_library("kerberos_accounts_browser_proxy") {
@@ -45,7 +48,7 @@ js_library("kerberos_accounts_browser_proxy") {
 js_library("kerberos_add_account_dialog") {
   deps = [
     ":kerberos_accounts_browser_proxy",
-    "..:metrics_recorder.m",
+    "..:metrics_recorder",
     "//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",
@@ -58,7 +61,7 @@ js_library("kerberos_add_account_dialog") {
 
 js_library("kerberos_page") {
   deps = [
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
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
index 590c06d6a5b..a63dc1b3329 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/keyboard_shortcut_banner/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/keyboard_shortcut_banner/BUILD.gn
@@ -14,11 +14,11 @@ js_type_check("closure_compile_module") {
 
 js_library("keyboard_shortcut_banner") {
   deps = [
-    "//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/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
+  externs_list = [ "//ui/webui/resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer_externs.js" ]
 }
 
 html_to_js("web_components") {
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 fbfb78fe085..8e526995b39 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
@@ -3,8 +3,7 @@
 # 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("../../../nearby_share/shared/nearby_shared.gni")
 import("../os_settings.gni")
 
@@ -12,141 +11,123 @@ js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
-    ":multidevice_browser_proxy.m",
-    ":multidevice_combined_setup_item.m",
-    ":multidevice_constants.m",
-    ":multidevice_feature_behavior.m",
-    ":multidevice_feature_item.m",
-    ":multidevice_feature_toggle.m",
-    ":multidevice_notification_access_setup_dialog.m",
-    ":multidevice_page.m",
-    ":multidevice_permissions_setup_dialog.m",
-    ":multidevice_radio_button.m",
-    ":multidevice_screen_lock_subpage.m",
-    ":multidevice_smartlock_subpage.m",
-    ":multidevice_subpage.m",
-    ":multidevice_task_continuation_disabled_link.m",
-    ":multidevice_task_continuation_item.m",
-    ":multidevice_tether_item.m",
-    ":multidevice_wifi_sync_disabled_link.m",
-    ":multidevice_wifi_sync_item.m",
+    ":multidevice_browser_proxy",
+    ":multidevice_combined_setup_item",
+    ":multidevice_constants",
+    ":multidevice_feature_behavior",
+    ":multidevice_feature_item",
+    ":multidevice_feature_toggle",
+    ":multidevice_metrics_logger",
+    ":multidevice_notification_access_setup_dialog",
+    ":multidevice_page",
+    ":multidevice_permissions_setup_dialog",
+    ":multidevice_radio_button",
+    ":multidevice_screen_lock_subpage",
+    ":multidevice_smartlock_subpage",
+    ":multidevice_subpage",
+    ":multidevice_task_continuation_disabled_link",
+    ":multidevice_task_continuation_item",
+    ":multidevice_tether_item",
+    ":multidevice_wifi_sync_disabled_link",
+    ":multidevice_wifi_sync_item",
   ]
 }
 
-js_library("multidevice_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.m.js" ]
+js_library("multidevice_browser_proxy") {
   deps = [
-    ":multidevice_constants.m",
+    ":multidevice_constants",
     "//ui/webui/resources/js:cr.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("multidevice_constants.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_constants.m.js" ]
+js_library("multidevice_constants") {
   deps = []
-  extra_deps = [ ":modulize" ]
 }
 
-js_library("multidevice_feature_behavior.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_behavior.m.js" ]
+js_library("multidevice_feature_behavior") {
   deps = [
-    ":multidevice_constants.m",
+    ":multidevice_constants",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  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" ]
+js_library("multidevice_feature_item") {
   deps = [
-    ":multidevice_constants.m",
-    ":multidevice_feature_behavior.m",
-    ":multidevice_feature_toggle.m",
-    "..:os_route.m",
-    "..:route_origin_behavior.m",
+    ":multidevice_constants",
+    ":multidevice_feature_behavior",
+    ":multidevice_feature_toggle",
+    ":multidevice_metrics_logger",
+    "..:os_route",
+    "..:route_origin_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/js:assert.m",
   ]
-  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" ]
+js_library("multidevice_feature_toggle") {
   deps = [
-    ":multidevice_constants.m",
-    ":multidevice_feature_behavior.m",
+    ":multidevice_constants",
+    ":multidevice_feature_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  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" ]
+js_library("multidevice_page") {
   deps = [
-    ":multidevice_browser_proxy.m",
-    ":multidevice_constants.m",
-    ":multidevice_feature_behavior.m",
-    ":multidevice_notification_access_setup_dialog.m",
-    ":multidevice_permissions_setup_dialog.m",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    ":multidevice_browser_proxy",
+    ":multidevice_constants",
+    ":multidevice_feature_behavior",
+    ":multidevice_notification_access_setup_dialog",
+    ":multidevice_permissions_setup_dialog",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
-    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":multidevice_page_module" ]
 }
 
-js_library("multidevice_notification_access_setup_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_notification_access_setup_dialog.m.js" ]
+js_library("multidevice_notification_access_setup_dialog") {
   deps = [
-    ":multidevice_constants.m",
+    ":multidevice_constants",
     "//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 = [ ":multidevice_notification_access_setup_dialog_module" ]
 }
 
-js_library("multidevice_permissions_setup_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_permissions_setup_dialog.m.js" ]
+js_library("multidevice_permissions_setup_dialog") {
   deps = [
-    ":multidevice_constants.m",
+    ":multidevice_constants",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":multidevice_permissions_setup_dialog_module" ]
 }
 
-js_library("multidevice_radio_button.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.m.js" ]
+js_library("multidevice_radio_button") {
   deps = [
     "//third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior-extracted",
     "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button_behavior.m",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
   ]
-  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" ]
+js_library("multidevice_smartlock_subpage") {
   deps = [
-    ":multidevice_constants.m",
-    ":multidevice_feature_behavior.m",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
-    "..:os_settings_routes.m",
+    ":multidevice_constants",
+    ":multidevice_feature_behavior",
+    ":multidevice_metrics_logger",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
+    "..:os_settings_routes",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
@@ -154,120 +135,104 @@ js_library("multidevice_smartlock_subpage.m") {
     "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":multidevice_smartlock_subpage_module" ]
   externs_list = [ "$externs_path/quick_unlock_private.js" ]
 }
 
-js_library("multidevice_subpage.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_subpage.m.js" ]
+js_library("multidevice_subpage") {
   deps = [
-    ":multidevice_browser_proxy.m",
-    ":multidevice_combined_setup_item.m",
-    ":multidevice_constants.m",
-    ":multidevice_task_continuation_item.m",
-    ":multidevice_wifi_sync_item.m",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
-    "..:os_settings_routes.m",
+    ":multidevice_browser_proxy",
+    ":multidevice_combined_setup_item",
+    ":multidevice_constants",
+    ":multidevice_task_continuation_item",
+    ":multidevice_wifi_sync_item",
+    "..:deep_linking_behavior",
+    "..:os_route",
+    "..:os_settings_routes",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
   ]
-  extra_deps = [ ":multidevice_subpage_module" ]
 }
 
-js_library("multidevice_combined_setup_item.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_combined_setup_item.m.js" ]
+js_library("multidevice_combined_setup_item") {
   deps = [
-    ":multidevice_constants.m",
-    ":multidevice_feature_behavior.m",
-    ":multidevice_feature_item.m",
+    ":multidevice_constants",
+    ":multidevice_feature_behavior",
+    ":multidevice_feature_item",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":multidevice_combined_setup_item_module" ]
   externs_list = [ "../settings_controls_types.js" ]
 }
 
-js_library("multidevice_tether_item.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_tether_item.m.js" ]
+js_library("multidevice_tether_item") {
   deps = [
-    ":multidevice_feature_behavior.m",
-    "..:os_route.m",
-    "..:os_settings_routes.m",
+    ":multidevice_feature_behavior",
+    "..:os_route",
+    "..:os_settings_routes",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider.m",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
   ]
-  extra_deps = [ ":multidevice_tether_item_module" ]
 }
 
-js_library("multidevice_task_continuation_item.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_task_continuation_item.m.js" ]
+js_library("multidevice_task_continuation_item") {
   deps = [
-    ":multidevice_constants.m",
-    ":multidevice_feature_behavior.m",
-    ":multidevice_feature_item.m",
-    ":multidevice_task_continuation_disabled_link.m",
+    ":multidevice_constants",
+    ":multidevice_feature_behavior",
+    ":multidevice_feature_item",
+    ":multidevice_task_continuation_disabled_link",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":multidevice_task_continuation_item_module" ]
   externs_list = [ "../settings_controls_types.js" ]
 }
 
-js_library("multidevice_wifi_sync_item.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_wifi_sync_item.m.js" ]
+js_library("multidevice_wifi_sync_item") {
   deps = [
-    ":multidevice_feature_behavior.m",
-    ":multidevice_feature_item.m",
-    ":multidevice_wifi_sync_disabled_link.m",
-    "..:os_route.m",
-    "..:route_origin_behavior.m",
+    ":multidevice_feature_behavior",
+    ":multidevice_feature_item",
+    ":multidevice_wifi_sync_disabled_link",
+    "..:os_route",
+    "..:route_origin_behavior",
     "../..:router",
-    "../os_people_page:os_sync_browser_proxy.m",
+    "../os_people_page:os_sync_browser_proxy",
     "//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 = [ ":multidevice_wifi_sync_item_module" ]
   externs_list = [ "../settings_controls_types.js" ]
 }
 
-js_library("multidevice_task_continuation_disabled_link.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_task_continuation_disabled_link.m.js" ]
+js_library("multidevice_task_continuation_disabled_link") {
   deps = [
-    "..:os_route.m",
+    "..:os_route",
     "../..:router",
     "//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 = [ ":multidevice_task_continuation_disabled_link_module" ]
 }
 
-js_library("multidevice_wifi_sync_disabled_link.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_wifi_sync_disabled_link.m.js" ]
+js_library("multidevice_wifi_sync_disabled_link") {
   deps = [
-    ":multidevice_feature_behavior.m",
-    "..:os_route.m",
-    "..:route_origin_behavior.m",
+    ":multidevice_feature_behavior",
+    "..:os_route",
+    "..:route_origin_behavior",
     "../..:router",
     "//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 = [ ":multidevice_wifi_sync_disabled_link_module" ]
 }
 
-js_library("multidevice_screen_lock_subpage.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_screen_lock_subpage.m.js" ]
+js_library("multidevice_screen_lock_subpage") {
   deps = [
     "../os_people_page:lock_screen_password_prompt_dialog",
-    "../os_people_page:lock_state_behavior.m",
+    "../os_people_page:lock_state_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/quick_unlock:lock_screen_constants.m",
     "//ui/webui/resources/js:assert.m",
@@ -275,214 +240,42 @@ js_library("multidevice_screen_lock_subpage.m") {
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  extra_deps = [ ":multidevice_screen_lock_subpage_module" ]
   externs_list = [ "$externs_path/chrome_extensions.js" ]
 }
 
-js_library("multidevice_smartlock_item.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock_item.m.js" ]
+js_library("multidevice_smartlock_item") {
   deps = [
-    ":multidevice_browser_proxy.m",
-    ":multidevice_constants.m",
-    ":multidevice_feature_behavior.m",
-    ":multidevice_feature_item.m",
-    "..:metrics_recorder.m",
+    ":multidevice_browser_proxy",
+    ":multidevice_constants",
+    ":multidevice_feature_behavior",
+    ":multidevice_feature_item",
+    "..:metrics_recorder",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":multidevice_smartlock_item_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":modulize",
-    ":multidevice_combined_setup_item_module",
-    ":multidevice_feature_item_module",
-    ":multidevice_feature_toggle_module",
-    ":multidevice_notification_access_setup_dialog_module",
-    ":multidevice_page_module",
-    ":multidevice_permissions_setup_dialog_module",
-    ":multidevice_radio_button_module",
-    ":multidevice_screen_lock_subpage_module",
-    ":multidevice_smartlock_item_module",
-    ":multidevice_smartlock_subpage_module",
-    ":multidevice_subpage_module",
-    ":multidevice_task_continuation_disabled_link_module",
-    ":multidevice_task_continuation_item_module",
-    ":multidevice_tether_item_module",
-    ":multidevice_wifi_sync_disabled_link_module",
-    ":multidevice_wifi_sync_item_module",
+js_library("multidevice_metrics_logger") {
+  deps = [ "//ui/webui/resources/js:assert.m" ]
+}
+
+html_to_js("web_components") {
+  js_files = [
+    "multidevice_combined_setup_item.js",
+    "multidevice_feature_item.js",
+    "multidevice_feature_toggle.js",
+    "multidevice_notification_access_setup_dialog.js",
+    "multidevice_page.js",
+    "multidevice_permissions_setup_dialog.js",
+    "multidevice_radio_button.js",
+    "multidevice_screen_lock_subpage.js",
+    "multidevice_smartlock_item.js",
+    "multidevice_smartlock_subpage.js",
+    "multidevice_subpage.js",
+    "multidevice_task_continuation_disabled_link.js",
+    "multidevice_task_continuation_item.js",
+    "multidevice_tether_item.js",
+    "multidevice_wifi_sync_disabled_link.js",
+    "multidevice_wifi_sync_item.js",
   ]
 }
-
-nearby_shared_auto_imports_closure_fix = [
-  # TODO(crbug.com/1121865): polymer.py normalizes the relative paths to shared
-  # nearby resources like ../../shared/* against
-  # c/b/r/settings/chromeos/nearby_share_page
-  # generating paths with the prefix c/b/r/settings/shared/*. It uses the
-  # normalized path to look up relative references for auto import. In order to
-  # get the auto import to match, we need to use this path prefix even though it
-  # does not exist on disk there. The actual resources are in
-  # c/b/r/nearby_share/shared and are re-hosted in the chrome://os-settings
-  # webui at the chrome://os-settings/shared/* prefix.
-  "chrome/browser/resources/settings/shared/nearby_contact_manager.html|getContactManager",
-  "chrome/browser/resources/settings/shared/nearby_share_settings.html|getNearbyShareSettings",
-  "chrome/browser/resources/settings/shared/nearby_share_settings_behavior.html|NearbyShareSettingsBehavior,NearbySettings",
-]
-
-polymer_modulizer("multidevice_feature_item") {
-  js_file = "multidevice_feature_item.js"
-  html_file = "multidevice_feature_item.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" ]
-}
-
-polymer_modulizer("multidevice_feature_toggle") {
-  js_file = "multidevice_feature_toggle.js"
-  html_file = "multidevice_feature_toggle.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("multidevice_page") {
-  js_file = "multidevice_page.js"
-  html_file = "multidevice_page.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites =
-      os_settings_namespace_rewrites + nearby_shared_namespace_rewrites
-  auto_imports =
-      os_settings_auto_imports + nearby_shared_auto_imports_closure_fix +
-      [ "ui/webui/resources/html/polymer.html|Polymer,html,beforeNextRender" ]
-}
-
-polymer_modulizer("multidevice_notification_access_setup_dialog") {
-  js_file = "multidevice_notification_access_setup_dialog.js"
-  html_file = "multidevice_notification_access_setup_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("multidevice_permissions_setup_dialog") {
-  js_file = "multidevice_permissions_setup_dialog.js"
-  html_file = "multidevice_permissions_setup_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("multidevice_radio_button") {
-  js_file = "multidevice_radio_button.js"
-  html_file = "multidevice_radio_button.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("multidevice_smartlock_subpage") {
-  js_file = "multidevice_smartlock_subpage.js"
-  html_file = "multidevice_smartlock_subpage.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("multidevice_subpage") {
-  js_file = "multidevice_subpage.js"
-  html_file = "multidevice_subpage.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("multidevice_combined_setup_item") {
-  js_file = "multidevice_combined_setup_item.js"
-  html_file = "multidevice_combined_setup_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("multidevice_tether_item") {
-  js_file = "multidevice_tether_item.js"
-  html_file = "multidevice_tether_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("multidevice_task_continuation_item") {
-  js_file = "multidevice_task_continuation_item.js"
-  html_file = "multidevice_task_continuation_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("multidevice_wifi_sync_item") {
-  js_file = "multidevice_wifi_sync_item.js"
-  html_file = "multidevice_wifi_sync_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("multidevice_task_continuation_disabled_link") {
-  js_file = "multidevice_task_continuation_disabled_link.js"
-  html_file = "multidevice_task_continuation_disabled_link.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("multidevice_wifi_sync_disabled_link") {
-  js_file = "multidevice_wifi_sync_disabled_link.js"
-  html_file = "multidevice_wifi_sync_disabled_link.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("multidevice_screen_lock_subpage") {
-  js_file = "multidevice_screen_lock_subpage.js"
-  html_file = "multidevice_screen_lock_subpage.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("multidevice_smartlock_item") {
-  js_file = "multidevice_smartlock_item.js"
-  html_file = "multidevice_smartlock_item.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 = [
-    "multidevice_browser_proxy.js",
-    "multidevice_feature_behavior.js",
-    "multidevice_constants.js",
-  ]
-  namespace_rewrites = os_settings_namespace_rewrites
-}
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 e0c0c89c9b5..6d7c7dd4267 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
@@ -28,18 +28,18 @@ js_type_check("closure_compile") {
 
 js_library("nearby_share_confirm_page") {
   deps = [
-    "//chrome/browser/resources/nearby_share/shared:nearby_device.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_page_template.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_preview.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_progress.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_device",
+    "//chrome/browser/resources/nearby_share/shared:nearby_page_template",
+    "//chrome/browser/resources/nearby_share/shared:nearby_preview",
+    "//chrome/browser/resources/nearby_share/shared:nearby_progress",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
 }
 
 js_library("nearby_share_contact_visibility_dialog") {
   deps = [
-    "//chrome/browser/resources/nearby_share/shared:nearby_contact_visibility.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_contact_visibility",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
   ]
@@ -59,7 +59,7 @@ js_library("nearby_share_data_usage_dialog") {
 
 js_library("nearby_share_device_name_dialog") {
   deps = [
-    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_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_input:cr_input.m",
@@ -69,9 +69,7 @@ js_library("nearby_share_device_name_dialog") {
 
 js_library("nearby_share_high_visibility_page") {
   deps = [
-    "//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_components/chromeos/localized_link:localized_link",
+    "//chrome/browser/resources/nearby_share/shared:nearby_page_template",
     "//ui/webui/resources/cr_elements/cr_lottie:cr_lottie.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
@@ -82,28 +80,28 @@ js_library("nearby_share_receive_dialog") {
     ":nearby_share_confirm_page",
     ":nearby_share_high_visibility_page",
     ":nearby_share_receive_manager",
-    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_one_page.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_visibility_page.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_one_page",
+    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior",
+    "//chrome/browser/resources/nearby_share/shared:nearby_visibility_page",
     "//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_view_manager:cr_view_manager",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data",
   ]
+
+  externs_list = [ "//ui/webui/resources/cr_elements/cr_view_manager/cr_view_manager_externs.js" ]
 }
 
 js_library("nearby_share_receive_manager") {
   deps = [
     ":nearby_share_confirm_page",
     ":nearby_share_high_visibility_page",
-    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior",
     "//chrome/browser/ui/webui/nearby_share:mojom_js_library_for_compile",
     "//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_view_manager:cr_view_manager",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
 }
@@ -117,16 +115,15 @@ js_library("nearby_share_subpage") {
     ":nearby_share_receive_dialog",
     ":nearby_share_receive_manager",
     ":types",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
-    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_one_page.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_visibility_page.m",
-    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row",
+    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_one_page",
+    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior",
+    "//chrome/browser/resources/nearby_share/shared:nearby_visibility_page",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data",
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 96e9643ddbe..eaa36f993bd 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
@@ -39,21 +39,21 @@ js_library("change_dictation_locale_dialog") {
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
     "//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",
     "//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 = [ "//ui/webui/resources/cr_elements/cr_search_field/cr_search_field_externs.js" ]
 }
 
 js_library("manage_a11y_page") {
   deps = [
     ":manage_a11y_page_browser_proxy",
     "//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:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
-    "//chrome/browser/resources/settings/chromeos:route_origin_behavior.m",
+    "//chrome/browser/resources/settings/chromeos:route_origin_behavior",
     "//chrome/browser/resources/settings/chromeos/device_page:device_page_browser_proxy",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
@@ -70,8 +70,8 @@ js_library("os_a11y_page") {
   deps = [
     ":os_a11y_page_browser_proxy",
     "//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:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
@@ -122,11 +122,12 @@ js_library("switch_access_setup_guide_dialog") {
     "//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_dialog:cr_dialog.m",
-    "//ui/webui/resources/cr_elements/cr_slider:cr_slider",
     "//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 =
+      [ "//ui/webui/resources/cr_elements/cr_slider/cr_slider_externs.js" ]
 }
 
 js_library("switch_access_setup_guide_warning_dialog") {
@@ -143,14 +144,16 @@ js_library("switch_access_subpage") {
     ":switch_access_constants",
     ":switch_access_subpage_browser_proxy",
     "//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:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:prefs_behavior",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//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 =
+      [ "//ui/webui/resources/cr_elements/cr_slider/cr_slider_externs.js" ]
 }
 
 js_library("switch_access_subpage_browser_proxy") {
@@ -162,18 +165,19 @@ js_library("tts_subpage") {
   deps = [
     ":tts_subpage_browser_proxy",
     "//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:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//chrome/browser/resources/settings/chromeos/os_languages_page:languages_browser_proxy",
     "//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_expand_button:cr_expand_button.m",
     "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
-    "//ui/webui/resources/cr_elements/cr_slider:cr_slider",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+  externs_list =
+      [ "//ui/webui/resources/cr_elements/cr_slider/cr_slider_externs.js" ]
 }
 
 js_library("tts_subpage_browser_proxy") {
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 9a694db0f6c..d250f599c3f 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
@@ -6,6 +6,14 @@ import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/polymer/html_to_js.gni")
 import("../os_settings.gni")
 
+polymer_element_files = [
+  "channel_switcher_dialog.js",
+  "detailed_build_info.js",
+  "edit_hostname_dialog.js",
+  "os_about_page.js",
+  "update_warning_dialog.js",
+]
+
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
@@ -40,8 +48,8 @@ js_library("detailed_build_info") {
     ":channel_switcher_dialog",
     ":device_name_util",
     ":edit_hostname_dialog",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -74,8 +82,8 @@ js_library("os_about_page") {
   deps = [
     ":about_page_browser_proxy",
     ":device_name_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:i18n_setup",
     "../..:lifetime_browser_proxy",
@@ -98,11 +106,5 @@ js_library("update_warning_dialog") {
 }
 
 html_to_js("web_components") {
-  js_files = [
-    "channel_switcher_dialog.js",
-    "detailed_build_info.js",
-    "edit_hostname_dialog.js",
-    "os_about_page.js",
-    "update_warning_dialog.js",
-  ]
+  js_files = polymer_element_files
 }
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 a11aea8ce89..61e52af2577 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
@@ -23,8 +23,8 @@ js_library("android_apps_browser_proxy") {
 js_library("android_apps_subpage") {
   deps = [
     ":android_apps_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
@@ -39,15 +39,13 @@ js_library("os_apps_page") {
   deps = [
     ":android_apps_browser_proxy",
     ":android_apps_subpage",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:prefs_behavior",
     "../../:router",
     "./app_management_page:store_client",
     "./app_notifications_page:mojo_interface_provider",
     "//chrome/browser/ui/webui/settings/ash/os_apps_page/mojom:mojom_js_library_for_compile",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
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 7665b464b69..d9c183c7526 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
@@ -61,7 +61,7 @@ js_library("app_detail_view") {
     ":actions",
     ":dom_switch",
     ":store_client",
-    "../..:os_route.m",
+    "../..:os_route",
     "../..:route_observer_behavior",
     "../../..:router",
     "./borealis_page:borealis_detail_view",
@@ -75,6 +75,7 @@ js_library("app_details_item") {
     ":actions",
     ":store_client",
     ":util",
+    "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
   externs_list = [ "./types.js" ]
@@ -153,7 +154,7 @@ js_library("main_view") {
     ":browser_proxy",
     ":store_client",
     ":util",
-    "../..:os_route.m",
+    "../..:os_route",
     "../..:route_observer_behavior",
     "../../..:router",
     "//ui/webui/resources/js:assert.m",
@@ -165,7 +166,7 @@ js_library("pin_to_shelf_item") {
   deps = [
     ":browser_proxy",
     ":util",
-    "../..:metrics_recorder.m",
+    "../..:metrics_recorder",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
   ]
@@ -248,8 +249,7 @@ js_library("supported_links_item") {
     ":supported_links_dialog",
     ":supported_links_overlapping_apps_dialog",
     ":util",
-    "../..:metrics_recorder.m",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
+    "../..:metrics_recorder",
     "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
     "//ui/webui/resources/cr_elements/cr_radio_group:cr_radio_group.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
@@ -258,7 +258,7 @@ js_library("supported_links_item") {
 
 js_library("util") {
   deps = [
-    "../..:os_route.m",
+    "../..:os_route",
     "../../..:router",
   ]
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/borealis_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/borealis_page/BUILD.gn
index 6abe519e415..46636f4cb7e 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/borealis_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/borealis_page/BUILD.gn
@@ -17,7 +17,7 @@ js_library("borealis_detail_view") {
     "../:pin_to_shelf_item",
     "../:store_client",
     "../:util",
-    "../../..:os_route.m",
+    "../../..:os_route",
     "../../../..:router",
   ]
 }
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
index 3a889b1e463..802e5bd2abf 100644
--- 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
@@ -24,7 +24,7 @@ js_library("plugin_vm_detail_view") {
     ":plugin_vm_browser_proxy",
     "../:store_client",
     "../:util",
-    "../../..:os_route.m",
+    "../../..:os_route",
     "../../../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/BUILD.gn
index dc8efb6c7a7..ffb77d7d674 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/BUILD.gn
@@ -28,9 +28,9 @@ js_library("app_notifications_subpage") {
   deps = [
     ":app_notification_row",
     ":mojo_interface_provider",
-    "../..:deep_linking_behavior.m",
-    "../..:metrics_recorder.m",
-    "../..:os_route.m",
+    "../..:deep_linking_behavior",
+    "../..:metrics_recorder",
+    "../..:os_route",
     "../..:route_observer_behavior",
     "../../..:router",
     "//chrome/browser/ui/webui/settings/ash/os_apps_page/mojom:mojom_js_library_for_compile",
@@ -40,7 +40,7 @@ js_library("app_notifications_subpage") {
 
 js_library("app_notification_row") {
   deps = [
-    "../..:metrics_recorder.m",
+    "../..:metrics_recorder",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   externs_list = [ "$externs_path/metrics_private.js" ]
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_bluetooth_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_bluetooth_page/BUILD.gn
index b76098f3d4e..95da59e122c 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_bluetooth_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_bluetooth_page/BUILD.gn
@@ -40,8 +40,8 @@ js_library("os_bluetooth_devices_subpage") {
     ":os_bluetooth_devices_subpage_browser_proxy",
     ":os_paired_bluetooth_list",
     ":settings_fast_pair_toggle",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -50,6 +50,7 @@ js_library("os_bluetooth_devices_subpage") {
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+  externs_list = [ "//ui/webui/resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer_externs.js" ]
 }
 
 js_library("os_bluetooth_devices_subpage_browser_proxy") {
@@ -59,9 +60,9 @@ js_library("os_bluetooth_devices_subpage_browser_proxy") {
 
 js_library("os_bluetooth_summary") {
   deps = [
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
-    "..:route_origin_behavior.m",
+    "..:route_origin_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_utils",
@@ -81,7 +82,7 @@ js_library("os_paired_bluetooth_list") {
 
 js_library("os_paired_bluetooth_list_item") {
   deps = [
-    "..:os_route.m",
+    "..:os_route",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_device_battery_info",
@@ -103,9 +104,9 @@ js_library("os_bluetooth_device_detail_subpage") {
   deps = [
     ":os_bluetooth_change_device_name_dialog",
     ":os_bluetooth_true_wireless_images",
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
-    "..:route_origin_behavior.m",
+    "..:route_origin_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_device_battery_info",
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 7f1a8d5cf34..0f5e34f7fd5 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
@@ -17,8 +17,8 @@ js_type_check("closure_compile_module") {
 
 js_library("os_files_page") {
   deps = [
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
   ]
@@ -26,7 +26,7 @@ js_library("os_files_page") {
 
 js_library("smb_shares_page") {
   deps = [
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
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 1c19a40cc3d..36276da9061 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
@@ -79,7 +79,7 @@ js_library("add_spellcheck_languages_dialog") {
   deps = [
     ":cr_checkbox_with_policy",
     ":languages_types",
-    "..:metrics_recorder.m",
+    "..:metrics_recorder",
     "..:prefs_behavior",
     "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes",
     "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list",
@@ -88,8 +88,8 @@ js_library("add_spellcheck_languages_dialog") {
     "//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",
   ]
+  externs_list = [ "//ui/webui/resources/cr_elements/cr_search_field/cr_search_field_externs.js" ]
 }
 
 js_library("change_device_language_dialog") {
@@ -98,8 +98,8 @@ js_library("change_device_language_dialog") {
     "../..:lifetime_browser_proxy",
     "//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",
   ]
+  externs_list = [ "//ui/webui/resources/cr_elements/cr_search_field/cr_search_field_externs.js" ]
 }
 
 js_library("cr_checkbox_with_policy") {
@@ -114,7 +114,7 @@ js_library("cr_checkbox_with_policy") {
 js_library("input_method_util") {
   deps = [
     ":input_method_settings",
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/js:cr.m",
@@ -139,13 +139,12 @@ js_library("input_page") {
     ":input_method_util",
     ":languages_metrics_proxy",
     ":os_edit_dictionary_page",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:i18n_setup",
     "../..:router",
     "../keyboard_shortcut_banner:keyboard_shortcut_banner",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
@@ -165,15 +164,15 @@ js_library("os_add_languages_dialog") {
     "//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_search_field:cr_search_field",
   ]
+  externs_list = [ "//ui/webui/resources/cr_elements/cr_search_field/cr_search_field_externs.js" ]
 }
 
 js_library("os_edit_dictionary_page") {
   deps = [
     ":languages_browser_proxy",
     "..:global_scroll_target_behavior",
-    "..:os_route.m",
+    "..:os_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_button:cr_button.m",
@@ -185,22 +184,23 @@ js_library("os_languages_page_v2") {
   deps = [
     ":input_method_util",
     ":languages_metrics_proxy",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:i18n_setup",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//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",
   ]
+
+  externs_list = [
+    "//ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu_externs.js",
+  ]
 }
 
 js_library("os_languages_section") {
@@ -209,7 +209,7 @@ js_library("os_languages_section") {
     ":input_page",
     ":languages",
     ":os_languages_page_v2",
-    "..:os_route.m",
+    "..:os_route",
     "../..:router",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:cr.m",
@@ -221,8 +221,8 @@ js_library("os_languages_section") {
 
 js_library("smart_inputs_page") {
   deps = [
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
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 027f0e961ba..d588d0ce2cc 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
@@ -4,8 +4,6 @@
 
 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("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
@@ -18,9 +16,9 @@ js_type_check("closure_compile_module") {
     ":fingerprint_list",
     ":lock_screen",
     ":lock_screen_password_prompt_dialog",
-    ":lock_state_behavior.m",
+    ":lock_state_behavior",
     ":os_people_page",
-    ":os_sync_browser_proxy.m",
+    ":os_sync_browser_proxy",
     ":os_sync_controls",
     ":setup_fingerprint_dialog",
     ":setup_pin_dialog",
@@ -37,19 +35,21 @@ js_library("account_manager_browser_proxy") {
 js_library("account_manager") {
   deps = [
     ":account_manager_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:icon",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+
+  externs_list = [
+    "//ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu_externs.js",
+  ]
 }
 
 js_library("fingerprint_browser_proxy") {
@@ -62,9 +62,9 @@ js_library("fingerprint_browser_proxy") {
 js_library("fingerprint_list") {
   deps = [
     ":fingerprint_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior",
@@ -82,12 +82,12 @@ js_library("lock_screen") {
   deps = [
     ":fingerprint_browser_proxy",
     ":lock_screen_password_prompt_dialog",
-    ":lock_state_behavior.m",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    ":lock_state_behavior",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
-    "../multidevice_page:multidevice_smartlock_item.m",
+    "../multidevice_page:multidevice_smartlock_item",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/quick_unlock:lock_screen_constants.m",
     "//ui/webui/resources/js:assert.m",
@@ -102,14 +102,13 @@ js_library("lock_screen") {
 
 js_library("lock_screen_password_prompt_dialog") {
   deps = [
-    ":lock_state_behavior.m",
+    ":lock_state_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/quick_unlock:lock_screen_constants.m",
   ]
 }
 
-js_library("lock_state_behavior.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/lock_state_behavior.m.js" ]
+js_library("lock_state_behavior") {
   deps = [
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -117,7 +116,6 @@ js_library("lock_state_behavior.m") {
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":modulize" ]
   externs_list = [ "$externs_path/quick_unlock_private.js" ]
   extra_sources = [ "$interfaces_path/quick_unlock_private_interface.js" ]
 }
@@ -126,16 +124,15 @@ js_library("os_people_page") {
   deps = [
     ":account_manager_browser_proxy",
     ":lock_screen",
-    ":lock_state_behavior.m",
+    ":lock_state_behavior",
     ":os_sync_controls",
-    "..:deep_linking_behavior.m",
-    "..:os_page_visibility.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_page_visibility",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "../parental_controls_page:parental_controls_page",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/cr_components/chromeos/quick_unlock:lock_screen_constants.m",
     "//ui/webui/resources/cr_elements/chromeos/cr_picture:png",
     "//ui/webui/resources/js:assert.m",
@@ -149,25 +146,22 @@ js_library("os_people_page") {
       chrome_extension_public_externs + [ "../settings_controls_types.js" ]
 }
 
-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" ]
+js_library("os_sync_browser_proxy") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":modulize" ]
 }
 
 js_library("os_sync_controls") {
   deps = [
-    ":os_sync_browser_proxy.m",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    ":os_sync_browser_proxy",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "../../:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
@@ -178,7 +172,7 @@ js_library("os_sync_controls") {
 js_library("setup_fingerprint_dialog") {
   deps = [
     ":fingerprint_browser_proxy",
-    "..:metrics_recorder.m",
+    "..:metrics_recorder",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_fingerprint:cr_fingerprint_progress_arc.m",
     "//ui/webui/resources/cr_elements/cr_lottie:cr_lottie.m",
@@ -199,7 +193,7 @@ js_library("setup_pin_dialog") {
 
 js_library("user_list") {
   deps = [
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -226,8 +220,8 @@ js_library("users_page") {
   deps = [
     ":user_list",
     ":users_add_user_dialog",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -236,10 +230,6 @@ js_library("users_page") {
   ]
 }
 
-group("polymer3_elements") {
-  public_deps = [ ":modulize" ]
-}
-
 html_to_js("web_components") {
   js_files = [
     "account_manager.js",
@@ -256,11 +246,3 @@ html_to_js("web_components") {
     "users_page.js",
   ]
 }
-
-js_modulizer("modulize") {
-  input_files = [
-    "lock_state_behavior.js",
-    "os_sync_browser_proxy.js",
-  ]
-  namespace_rewrites = os_settings_namespace_rewrites
-}
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 97577d1af99..96a486b6ec4 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
@@ -104,8 +104,8 @@ js_library("cups_printers") {
     ":cups_printer_types",
     ":cups_printers_browser_proxy",
     ":cups_settings_add_printer_dialog",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
@@ -145,18 +145,21 @@ js_library("cups_saved_printers") {
   deps = [
     ":cups_printer_types",
     ":cups_printers_browser_proxy",
-    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/js:list_property_update_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+
+  externs_list = [
+    "//ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu_externs.js",
+  ]
 }
 
 js_library("os_printing_page") {
   deps = [
     ":cups_printers_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
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 b9009130600..ef483f92f1e 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
@@ -21,12 +21,12 @@ js_library("os_privacy_page") {
     ":metrics_consent_browser_proxy",
     ":peripheral_data_access_browser_proxy",
     ":peripheral_data_access_protection_dialog",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "../os_people_page:lock_screen",
-    "../os_people_page:lock_state_behavior.m",
+    "../os_people_page:lock_state_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
   ]
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 76f55b5b82a..0aec5abc5fb 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
@@ -21,13 +21,12 @@ js_library("os_powerwash_dialog") {
   deps = [
     ":os_powerwash_dialog_esim_item",
     ":os_reset_browser_proxy",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:metrics_recorder",
+    "..:os_route",
     "../..:lifetime_browser_proxy",
     "../..:router",
     "//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/localized_link:localized_link",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
   ]
 }
@@ -48,8 +47,8 @@ js_library("os_reset_browser_proxy") {
 
 js_library("os_reset_page") {
   deps = [
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
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 6b57cb7247e..0f7f6bc1e06 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
@@ -20,13 +20,12 @@ js_type_check("closure_compile_module") {
 js_library("os_search_page") {
   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/chromeos:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//chrome/browser/resources/settings/chromeos/google_assistant_page:google_assistant_page",
     "//chrome/browser/resources/settings/chromeos/os_search_page:search_engines_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row",
     "//ui/webui/resources/cr_elements/policy:cr_policy_pref_indicator.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:cr.m",
@@ -51,11 +50,10 @@ js_library("os_search_selection_dialog") {
 js_library("search_subpage") {
   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/chromeos:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//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",
@@ -66,11 +64,10 @@ js_library("search_subpage") {
 js_library("search_engine") {
   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/chromeos:deep_linking_behavior",
+    "//chrome/browser/resources/settings/chromeos:os_route",
     "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//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",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
index 6a377250bbc..7d491976fa0 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
@@ -116,8 +116,8 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                    "settings.MetricsConsentBrowserProxy|MetricsConsentBrowserProxy",
                                    "settings.MetricsConsentState|MetricsConsentState",
                                    "settings.PersonalizationHubBrowserProxy|PersonalizationHubBrowserProxy",
-                                   "settings.PhoneHubNotificationAccessStatus|PhoneHubNotificationAccessStatus",
-                                   "settings.PhoneHubNotificationAccessProhibitedReason|PhoneHubNotificationAccessProhibitedReason",
+                                   "settings.PhoneHubFeatureAccessStatus|PhoneHubFeatureAccessStatus",
+                                   "settings.PhoneHubFeatureAccessProhibitedReason|PhoneHubFeatureAccessProhibitedReason",
                                    "settings.PhoneHubPermissionsSetupMode|PhoneHubPermissionsSetupMode",
                                    "settings.PowerSource|PowerSource",
                                    "settings.PowerManagementSettings|PowerManagementSettings",
@@ -191,110 +191,6 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                    "settings.recordNavigation|recordNavigation",
                                  ]
 
-settings_auto_imports = [
-  "chrome/browser/resources/settings/controls/pref_control_mixin.html|PrefControlMixin",
-  "chrome/browser/resources/settings/controls/settings_boolean_control_mixin.html|SettingsBooleanControlMixin",
-  "chrome/browser/resources/settings/extension_control_browser_proxy.html|ExtensionControlBrowserProxyImpl,ExtensionControlBrowserProxy",
-  "chrome/browser/resources/settings/i18n_setup.html|loadTimeData",
-  "chrome/browser/resources/settings/chromeos/prefs_behavior.html|PrefsBehavior",
-  "chrome/browser/resources/settings/prefs/prefs_types.html|CrSettingsPrefs",
-]
-
-os_settings_auto_imports = settings_auto_imports +
-                           cr_components_chromeos_auto_imports +
-                           cr_elements_chromeos_auto_imports + [
-                             "chrome/browser/resources/settings/chromeos/ambient_mode_page/ambient_mode_browser_proxy.html|AmbientModeBrowserProxy,AmbientModeBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/ambient_mode_page/constants.html|AmbientModeTopicSource,AmbientModeTemperatureUnit,AmbientModeAlbum,AmbientModeSettings,TopicSourceItem",
-                             "chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_page_browser_proxy.html|BluetoothPageBrowserProxy,BluetoothPageBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/crostini_page/crostini_browser_proxy.html|DEFAULT_CROSTINI_VM, DEFAULT_CROSTINI_CONTAINER, CrostiniPortProtocol, CrostiniPortSetting, CrostiniDiskInfo, CrostiniPortActiveSetting, CrostiniBrowserProxy, CrostiniBrowserProxyImpl,PortState,MIN_VALID_PORT_NUMBER, MAX_VALID_PORT_NUMBER",
-                             "chrome/browser/resources/settings/chromeos/internet_page/cellular_setup_settings_delegate.html|CellularSetupSettingsDelegate",
-                             "chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.html|InternetPageBrowserProxy,InternetPageBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/device_page/device_page_browser_proxy.html|BatteryStatus,DevicePageBrowserProxy,DevicePageBrowserProxyImpl,ExternalStorage,IdleBehavior,LidClosedBehavior,NoteAppInfo,NoteAppLockScreenSupport,PowerManagementSettings,PowerSource,getDisplayApi,StorageSpaceState",
-                             "chrome/browser/resources/settings/chromeos/deep_linking_behavior.html|DeepLinkingBehavior",
-                             "chrome/browser/resources/settings/chromeos/google_assistant_page/google_assistant_browser_proxy.html|GoogleAssistantBrowserProxy,GoogleAssistantBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/guest_os/guest_os_browser_proxy.html|GuestOsBrowserProxy, GuestOsBrowserProxyImpl, GuestOsSharedUsbDevice, CROSTINI_TYPE, PLUGIN_VM_TYPE, BOREALIS_TYPE",
-                             "chrome/browser/resources/settings/chromeos/kerberos_page/kerberos_accounts_browser_proxy.html|KerberosAccount,KerberosAccountsBrowserProxyImpl,KerberosAccountsBrowserProxy,KerberosErrorType,KerberosConfigErrorCode,ValidateKerberosConfigResult",
-                             "chrome/browser/resources/settings/chromeos/metrics_recorder.html|recordSettingChange, recordSearch, setUserActionRecorderForTesting,recordPageFocus,recordPageBlur,recordClick,recordNavigation",
-                             "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.html|MultiDeviceBrowserProxy,MultiDeviceBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_constants.html|MultiDeviceSettingsMode,MultiDeviceFeature,MultiDeviceFeatureState,MultiDevicePageContentData,PhoneHubNotificationAccessStatus,PhoneHubNotificationAccessProhibitedReason,PhoneHubPermissionsSetupMode,SmartLockSignInEnabledState",
-                             "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_behavior.html|MultiDeviceFeatureBehavior",
-                             "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.html|MultiDeviceBrowserProxy,MultiDeviceBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_account_manager_browser_proxy.html|NearbyAccountManagerBrowserProxy,NearbyAccountManagerBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_manager.html|setReceiveManagerForTesting,getReceiveManager,observeReceiveManager",
-                             "chrome/browser/resources/settings/chromeos/nearby_share_page/types.html|NearbyShareDataUsage,dataUsageStringToEnum",
-                             "chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page_browser_proxy.html|ManageA11yPageBrowserProxyImpl,ManageA11yPageBrowserProxy",
-                             "chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_constants.html|actionToPref,AUTO_SCAN_SPEED_RANGE_MS,AssignmentContext,SwitchAccessCommand,SwitchAccessDeviceType",
-                             "chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage_browser_proxy.html|SwitchAccessSubpageBrowserProxy,SwitchAccessSubpageBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page_browser_proxy.html|OsA11yPageBrowserProxyImpl,OsA11yPageBrowserProxy",
-                             "chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage_browser_proxy.html|TtsSubpageBrowserProxy,TtsSubpageBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_action_assignment_pane.html|getLabelForAssignment",
-                             "chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage_browser_proxy.html|OsBluetoothDevicesSubpageBrowserProxy, OsBluetoothDevicesSubpageBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.html|generateOptions,getFirstPartyInputMethodEngineId,getOptionLabelName,getOptionMenuItems,getOptionUiType,getOptionUrl,hasOptionsPageInSettings,isNumberValue,OPTION_DEFAULT,OptionType,UiType, isOptionLabelTranslated, getUntranslatedOptionLabelName",
-                             "chrome/browser/resources/settings/chromeos/os_languages_page/languages_metrics_proxy.html|LanguagesMetricsProxy, LanguagesMetricsProxyImpl, LanguagesPageInteraction, InputsShortcutReminderState",
-                             "chrome/browser/resources/settings/chromeos/os_people_page/fingerprint_browser_proxy.html|FingerprintInfo,FingerprintBrowserProxy,FingerprintResultType,FingerprintBrowserProxyImpl,FingerprintAttempt,FingerprintScan",
-                             "chrome/browser/resources/settings/chromeos/os_people_page/lock_state_behavior.html|LockScreenUnlockType,LockStateBehaviorImpl,LockStateBehavior",
-                             "chrome/browser/resources/settings/chromeos/os_people_page/os_sync_browser_proxy.html|OsSyncBrowserProxy,OsSyncBrowserProxyImpl,OsSyncPrefs",
-                             "chrome/browser/resources/settings/chromeos/os_page_visibility.html|OSPageVisibility,osPageVisibility",
-                             "chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_browser_proxy.html|OsResetBrowserProxy,OsResetBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/os_route.html|routes",
-                             "chrome/browser/resources/settings/chromeos/os_settings_routes.html|OsSettingsRoutes",
-                             "chrome/browser/resources/settings/chromeos/personalization_page/change_picture_browser_proxy.html|ChangePictureBrowserProxy,ChangePictureBrowserProxyImpl,DefaultImage",
-                             "chrome/browser/resources/settings/chromeos/personalization_page/personalization_hub_browser_proxy.html|PersonalizationHubBrowserProxy,PersonalizationHubBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/personalization_page/wallpaper_browser_proxy.html|WallpaperBrowserProxy,WallpaperBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_browser_proxy.html|ParentalControlsBrowserProxy,ParentalControlsBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/route_origin_behavior.html|RouteOriginBehaviorImpl,RouteOriginBehavior",
-                             "chrome/browser/resources/settings/chromeos/route_observer_behavior.html|RouteObserverBehavior",
-                             "chrome/browser/resources/settings/controls/settings_dropdown_menu.html|DropdownMenuOptionList",
-                             "chrome/browser/resources/settings/chromeos/global_scroll_target_behavior.html|GlobalScrollTargetBehavior,setGlobalScrollTarget",
-                             "chrome/browser/resources/settings/chromeos/os_languages_page/languages_browser_proxy.html|LanguagesBrowserProxy,LanguagesBrowserProxyImpl",
-                             "chrome/browser/resources/settings/lifetime_browser_proxy.html|LifetimeBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/os_people_page/account_manager_browser_proxy.html|AccountManagerBrowserProxy,AccountManagerBrowserProxyImpl,Account",
-                             "chrome/browser/resources/settings/people_page/profile_info_browser_proxy.html|ProfileInfoBrowserProxyImpl",
-                             "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxyImpl,StatusAction",
-                             "chrome/browser/resources/settings/open_window_proxy.html|OpenWindowProxyImpl",
-                             "chrome/browser/resources/settings/route.html|routes",
-                             "chrome/browser/resources/settings/router.html|Router,Route",
-                             "chrome/browser/resources/settings/chromeos/os_search_page/search_engines_browser_proxy.html|SearchEngine,SearchEnginesBrowserProxy,SearchEnginesBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_browser_proxy.html|CupsPrintersBrowserProxy,CupsPrintersBrowserProxyImpl,CupsPrinterInfo,PrinterSetupResult,CupsPrintersList,PrinterPpdMakeModel,ManufacturersInfo,ModelsInfo,PrintServerResult,PrinterMakeModel",
-                             "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry_list_behavior.html|CupsPrintersEntryListBehavior",
-                             "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry_manager.html|CupsPrintersEntryManager",
-                             "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_dialog_util.html|sortPrinters,matchesSearchTerm,getBaseName,getErrorText,isNetworkProtocol,isNameAndAddressValid,isPPDInfoValid,getPrintServerErrorText",
-                             "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_types.html|PrinterListEntry,PrinterType",
-                             "chrome/browser/resources/settings/chromeos/os_privacy_page/peripheral_data_access_browser_proxy.html|PeripheralDataAccessBrowserProxy,PeripheralDataAccessBrowserProxyImpl",
-                             "chrome/browser/resources/settings/about_page/about_page_browser_proxy.html|AboutPageBrowserProxyImpl,AboutPageUpdateInfo,AboutPageBrowserProxy,browserChannelToI18nId,VersionInfo,ChannelInfo,BrowserChannel,isTargetChannelMoreStable,UpdateStatus,UpdateStatusChangedEvent,RegulatoryInfo,TPMFirmwareUpdateStatusChangedEvent",
-                             "chrome/browser/resources/settings/chromeos/os_about_page/device_name_browser_proxy.html|DeviceNameBrowserProxy,DeviceNameBrowserProxyImpl",
-                             "chrome/browser/resources/settings/chromeos/os_about_page/device_name_util.html|DeviceNameState",
-                             "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_action_menu/cr_action_menu.html|CrActionMenuElement",
-                             "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",
-                             "ui/webui/resources/cr_elements/policy/cr_policy_indicator_behavior.html|CrPolicyIndicatorType",
-                             "ui/webui/resources/html/icon.html|getImage",
-                             "ui/webui/resources/html/list_property_update_behavior.html|ListPropertyUpdateBehavior",
-                             "ui/webui/resources/html/parse_html_subset.html|parseHtmlSubset",
-                             "ui/webui/resources/html/plural_string_proxy.html|PluralStringProxyImpl",
-                             "ui/webui/resources/html/polymer.html|afterNextRender,Polymer,html,flush,Templatizer,TemplateInstanceBase",
-                             "ui/webui/resources/html/util.html|HTMLEscape,listenOnce",
-                             "ui/webui/resources/html/web_ui_listener_behavior.html|WebUIListenerBehavior",
-                             "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/browser_proxy.html|BrowserProxy",
-                             "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/store_client.html|AppManagementStoreClient",
-                             "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/actions.html|updateSelectedAppId",
-                             "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/util.html|getSelectedApp,openMainPage,recordAppManagementUserAction,openAppDetailPage,getAppIcon,getPermission,getPermissionValueBool,createPermission,permissionTypeHandle,toggleOptionalBool,convertOptionalBoolToBool,alphabeticalSort",
-                             "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/store.html|AppManagementStore",
-                             "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_browser_proxy.html|PluginVmBrowserProxyImpl,PluginVmBrowserProxy",
-                             "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/constants.html|Bool,PwaPermissionType,PluginVmPermissionType,ArcPermissionType,BorealisPermissionType,AppType,OptionalBool,PermissionValueType,TriState,InstallSource,AppManagementUserAction,AppManagementEntryPointsHistogramName,AppManagementEntryPoint",
-                             "chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_browser_proxy.html|AndroidAppsBrowserProxyImpl,AndroidAppsInfo",
-                             "chrome/browser/resources/settings/chromeos/device_page/drag_behavior.html|DragBehavior,DragPosition",
-                             "chrome/browser/resources/settings/chromeos/device_page/layout_behavior.html|LayoutBehavior",
-                             "chrome/browser/resources/settings/chromeos/pref_to_setting_metric_converter.html|PrefToSettingMetricConverter",
-                             "third_party/polymer/v1_0/components-chromium/iron-resizable-behavior/iron-resizable-behavior.html|IronResizableBehavior",
-                           ]
-
 # TODO(crbug.com/1121865): browser_resolver_prefix_replacements allows path
 # from ../../shared/* to resolve to ../../../nearby_share/shared/* for closure
 # purposes.
@@ -303,295 +199,3 @@ os_settings_closure_flags = settings_closure_flags + [
                               "js_module_root=./gen/chrome/browser/resources/nearby_share",
                               "browser_resolver_prefix_replacements=\"../../shared/=../../../nearby_share/shared/\"",
                             ]
-
-os_settings_migrated_imports = cr_components_migrated_imports + [
-                                 "chrome/browser/resources/settings/chromeos/ambient_mode_page/album_item.html",
-                                 "chrome/browser/resources/settings/chromeos/ambient_mode_page/album_list.html",
-                                 "chrome/browser/resources/settings/chromeos/ambient_mode_page/ambient_mode_page.html",
-                                 "chrome/browser/resources/settings/chromeos/ambient_mode_page/ambient_mode_photos_page.html",
-                                 "chrome/browser/resources/settings/chromeos/ambient_mode_page/art_album_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/ambient_mode_page/text_with_tooltip.html",
-                                 "chrome/browser/resources/settings/chromeos/ambient_mode_page/topic_source_item.html",
-                                 "chrome/browser/resources/settings/chromeos/ambient_mode_page/topic_source_list.html",
-                                 "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_page_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_arc_adb.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_arc_adb_confirmation_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_arc_adb.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_confirmation_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_confirmation_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_disk_resize_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_export_import.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_extra_containers.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_extra_containers_create_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_import_confirmation_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_page.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_port_forwarding.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_port_forwarding_add_port_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/crostini_page/crostini_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/date_time_page/date_time_page.html",
-                                 "chrome/browser/resources/settings/chromeos/date_time_page/timezone_selector.html",
-                                 "chrome/browser/resources/settings/chromeos/kerberos_page/kerberos_accounts.html",
-                                 "chrome/browser/resources/settings/chromeos/kerberos_page/kerberos_accounts_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/kerberos_page/kerberos_add_account_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/kerberos_page/kerberos_page.html",
-                                 "chrome/browser/resources/settings/chromeos/date_time_page/timezone_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/device_page.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/device_page_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/display.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/display_layout.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/display_overscan_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/drag_behavior.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/keyboard.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/layout_behavior.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/pointers.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/power.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/storage.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/storage_external.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/storage_external_entry.html",
-                                 "chrome/browser/resources/settings/chromeos/device_page/stylus.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/internet_page/esim_install_error_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/esim_remove_profile_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/esim_rename_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/cellular_networks_list.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/cellular_roaming_toggle_button.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/cellular_setup_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/cellular_setup_settings_delegate.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/internet_config.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/internet_detail_menu.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_page.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/internet_page.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/internet_shared_css.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/internet_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/network_always_on_vpn.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/network_summary.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/network_summary_item.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/settings_traffic_counters.html",
-                                 "chrome/browser/resources/settings/chromeos/internet_page/tether_connection_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_confirm_page.html",
-                                 "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_data_usage_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_device_name_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_high_visibility_page.html",
-                                 "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/on_startup_page/on_startup_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/change_dictation_locale_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/externs.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_action_assignment_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_action_assignment_pane.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_constants.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_setup_guide_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_setup_guide_warning_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.html",
-                                 "chrome/browser/resources/settings/chromeos/os_about_page/device_name_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_about_page/device_name_util.html",
-                                 "chrome/browser/resources/settings/chromeos/os_about_page/edit_hostname_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_about_page/update_warning_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/android_apps_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/actions.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/api_listener.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/app_detail_view.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/app_details_item.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/app_item.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/app_management_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/arc_detail_view.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/borealis_page/borealis_detail_view.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/chrome_app_detail_view.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/constants.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/dom_switch.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/icons.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/main_view.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/more_permissions_item.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/permission_item.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/pin_to_shelf_item.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_detail_view.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/pwa_detail_view.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/resize_lock_item.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/shared_style.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/shared_vars.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/store_client.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/store.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/supported_links_overlapping_apps_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/supported_links_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/supported_links_item.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/toggle_row.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/util.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/app_notifications_page/app_notifications_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/os_apps_page/os_apps_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_devices_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_device_detail_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_change_device_name_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_summary.html",
-                                 "chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_pairing_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_paired_bluetooth_list.html",
-                                 "chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_paired_bluetooth_list_item.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_languages_page/cr_checkbox_with_policy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/languages_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/languages.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/languages_types.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/add_input_methods_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/change_device_language_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/input_method_options_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/languages_metrics_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/os_add_languages_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/os_edit_dictionary_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page_v2.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_section.html",
-                                 "chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/account_manager.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/fingerprint_list.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/lock_screen_password_prompt_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/os_sync_controls.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/pin_autosubmit_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/setup_fingerprint_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/setup_pin_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/user_list.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/users_add_user_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/users_page.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_enterprise_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_privacy_page/os_privacy_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_privacy_page/peripheral_data_access_brower_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_privacy_page/peripheral_data_access_protection_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_privacy_page/smart_privacy_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/os_search_page/os_search_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_search_page/os_search_selection_dialog.html",
-                                 "chrome/browser/resources/settings/chromeos/os_search_page/search_engine.html",
-                                 "chrome/browser/resources/settings/chromeos/os_search_page/search_engines_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_search_page/search_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/os_settings_menu/os_settings_menu.html",
-                                 "chrome/browser/resources/settings/chromeos/os_settings_main/os_settings_main.html",
-                                 "chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_page.html",
-                                 "chrome/browser/resources/settings/chromeos/os_settings_page/settings_idle_load.html",
-                                 "chrome/browser/resources/settings/chromeos/os_settings_search_box/os_settings_search_box.html",
-                                 "chrome/browser/resources/settings/chromeos/os_settings_search_box/os_search_result_row.html",
-                                 "chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.html",
-                                 "chrome/browser/resources/settings/chromeos/os_toolbar/os_toolbar.html",
-                                 "chrome/browser/resources/settings/chromeos/personalization_page/change_picture_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/personalization_page/personalization_hub_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/personalization_page/wallpaper_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/personalization_page/change_picture.html",
-                                 "chrome/browser/resources/settings/chromeos/personalization_page/personalization_page.html",
-                                 "chrome/browser/resources/settings/chromeos/personalization_page/dark_mode_subpage.html",
-                                 "chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_page.html",
-                                 "chrome/browser/resources/settings/chromeos/route_observer_behavior.html",
-                                 "chrome/browser/resources/settings/chromeos/settings_scheduler_slider/settings_scheduler_slider.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",
-                                 "chrome/browser/resources/settings/controls/password_prompt_dialog.html",
-                                 "chrome/browser/resources/settings/controls/pref_control_mixin.html",
-                                 "chrome/browser/resources/settings/controls/settings_boolean_control_mixin.html",
-                                 "chrome/browser/resources/settings/controls/settings_dropdown_menu.html",
-                                 "chrome/browser/resources/settings/controls/settings_radio_group.html",
-                                 "chrome/browser/resources/settings/controls/settings_slider.html",
-                                 "chrome/browser/resources/settings/controls/settings_textarea.html",
-                                 "chrome/browser/resources/settings/controls/settings_toggle_button.html",
-                                 "chrome/browser/resources/settings/ensure_lazy_loaded.html",
-                                 "chrome/browser/resources/settings/extension_control_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/global_scroll_target_behavior.html",
-                                 "chrome/browser/resources/settings/i18n_setup.html",
-                                 "chrome/browser/resources/settings/icons.html",
-                                 "chrome/browser/resources/settings/lifetime_browser_proxy.html",
-                                 "chrome/browser/resources/settings/chromeos/os_people_page/account_manager_browser_proxy.html",
-                                 "chrome/browser/resources/settings/people_page/profile_info_browser_proxy.html",
-                                 "chrome/browser/resources/settings/people_page/signout_dialog.html",
-                                 "chrome/browser/resources/settings/people_page/sync_browser_proxy.html",
-                                 "chrome/browser/resources/settings/people_page/sync_controls.html",
-                                 "chrome/browser/resources/settings/people_page/sync_page.html",
-                                 "chrome/browser/resources/settings/chromeos/prefs_behavior.html",
-                                 "chrome/browser/resources/settings/prefs/prefs.html",
-                                 "chrome/browser/resources/settings/prefs/prefs_types.html",
-                                 "chrome/browser/resources/settings/prefs/pref_util.html",
-                                 "chrome/browser/resources/settings/privacy_page/personalization_options.html",
-                                 "chrome/browser/resources/settings/privacy_page/secure_dns.html",
-                                 "chrome/browser/resources/settings/privacy_page/secure_dns_input.html",
-                                 "chrome/browser/resources/settings/open_window_proxy.html",
-                                 "chrome/browser/resources/settings/router.html",
-                                 "chrome/browser/resources/settings/setting_id_param_util.html",
-                                 "chrome/browser/resources/settings/settings_main/settings_main.html",
-                                 "chrome/browser/resources/settings/settings_menu/settings_menu.html",
-                                 "chrome/browser/resources/settings/settings_page/settings_animated_pages.html",
-                                 "chrome/browser/resources/settings/settings_page/settings_section.html",
-                                 "chrome/browser/resources/settings/settings_page/settings_subpage.html",
-                                 "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/chromeos/localized_link/localized_link.html",
-                                 "ui/webui/resources/cr_components/managed_footnote/managed_footnote.html",
-                                 "ui/webui/resources/cr_elements/chromeos/cr_picture/cr_camera.html",
-                                 "ui/webui/resources/cr_elements/chromeos/cr_picture/cr_picture_list.html",
-                                 "ui/webui/resources/cr_elements/chromeos/cr_picture/cr_picture_pane.html",
-                                 "ui/webui/resources/cr_elements/chromeos/cr_picture/cr_picture_types.html",
-                                 "ui/webui/resources/cr_elements/chromeos/cr_picture/icons.html",
-                                 "ui/webui/resources/cr_elements/chromeos/cr_picture/png.html",
-                                 "ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu.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",
-                                 "ui/webui/resources/cr_elements/cr_search_field/cr_search_field.html",
-                                 "ui/webui/resources/cr_elements/cr_slider/cr_slider.html",
-                                 "ui/webui/resources/cr_elements/cr_tabs/cr_tabs.html",
-                                 "ui/webui/resources/cr_elements/cr_toast/cr_toast.html",
-                                 "ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_search_field.html",
-                                 "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/icon.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_main/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_settings_main/BUILD.gn
index b8afff577e9..245e660fb49 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
@@ -14,8 +14,8 @@ js_type_check("closure_compile_module") {
 
 js_library("os_settings_main") {
   deps = [
-    "..:os_page_visibility.m",
-    "..:os_route.m",
+    "..:os_page_visibility",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "../os_settings_page:os_settings_page",
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 044249aa86c..2d794653f24 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
@@ -14,7 +14,7 @@ js_type_check("closure_compile_module") {
 
 js_library("os_settings_menu") {
   deps = [
-    "..:os_route.m",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/iron-collapse:iron-collapse",
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 ef1930a267c..e19229a2d65 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
@@ -20,15 +20,15 @@ js_library("os_settings_page") {
   deps = [
     ":main_page_behavior",
     ":settings_idle_load",
-    "..:os_page_visibility.m",
-    "..:os_route.m",
+    "..:os_page_visibility",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "../bluetooth_page:bluetooth_page",
     "../crostini_page:crostini_page",
     "../device_page:device_page",
     "../kerberos_page:kerberos_page",
-    "../multidevice_page:multidevice_page.m",
+    "../multidevice_page:multidevice_page",
     "../os_a11y_page:os_a11y_page",
     "../os_apps_page:android_apps_browser_proxy",
     "../os_apps_page:os_apps_page",
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 76eac8e5b1f..66cba59d0f9 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
@@ -17,38 +17,42 @@ js_type_check("closure_compile_module") {
 
 js_library("os_search_result_row") {
   deps = [
-    "..:os_icons.m",
-    "..:os_route.m",
+    "..:os_icons",
+    "..:os_route",
     "..:route_observer_behavior",
-    "..:search_handler.m",
+    "..:search_handler",
     "../..:open_window_proxy",
     "../..:router",
-    "//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/cr/ui:focus_row_behavior.m",
   ]
-  externs_list = [ "$externs_path/metrics_private.js" ]
+  externs_list = [
+    "$externs_path/metrics_private.js",
+    "//ui/webui/resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer_externs.js",
+  ]
 }
 
 js_library("os_settings_search_box") {
   deps = [
     ":os_search_result_row",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
-    "..:search_handler.m",
+    "..:search_handler",
     "../..:router",
-    "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
     "//third_party/polymer/v3_0/components-chromium/iron-dropdown:iron-dropdown",
     "//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_toolbar:cr_toolbar_search_field",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
-  externs_list = [ "$externs_path/metrics_private.js" ]
+  externs_list = [
+    "$externs_path/metrics_private.js",
+    "//ui/webui/resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer_externs.js",
+    "//ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_search_field_externs.js",
+  ]
 }
 
 html_to_js("web_components") {
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 62e0ae7de41..87b2bca14c3 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
@@ -14,22 +14,24 @@ js_type_check("closure_compile_module") {
 
 js_library("os_settings_ui") {
   deps = [
-    "..:metrics_recorder.m",
-    "..:os_page_visibility.m",
-    "..:os_route.m",
-    "..:pref_to_setting_metric_converter.m",
+    "..:metrics_recorder",
+    "..:os_page_visibility",
+    "..:os_route",
+    "..:pref_to_setting_metric_converter",
     "../..:router",
     "../os_settings_main:os_settings_main",
     "../os_toolbar:os_toolbar",
     "//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:find_shortcut_behavior",
-    "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:util.m",
   ]
-  externs_list = [ "../settings_controls_types.js" ]
+  externs_list = [
+    "../settings_controls_types.js",
+    "//ui/webui/resources/cr_elements/cr_drawer/cr_drawer_externs.js",
+  ]
 }
 
 html_to_js("web_components") {
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 fa63d797223..c6dd67c462d 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_toolbar/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_toolbar/BUILD.gn
@@ -17,9 +17,9 @@ js_library("os_toolbar") {
     "../os_settings_search_box:os_settings_search_box",
     "//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/cr_elements/cr_toolbar:cr_toolbar_search_field",
     "//ui/webui/resources/js:load_time_data.m",
   ]
+  externs_list = [ "//ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_search_field_externs.js" ]
 }
 
 html_to_js("web_components") {
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 0d8e816e142..4c1034fcb1b 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
@@ -22,12 +22,11 @@ js_type_check("closure_compile_module") {
 js_library("change_picture") {
   deps = [
     ":change_picture_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:metrics_recorder.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:metrics_recorder",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
-    "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
     "//third_party/polymer/v3_0/components-chromium/iron-selector:iron-selector",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_picture_list",
@@ -40,6 +39,7 @@ js_library("change_picture") {
     "//ui/webui/resources/js:util.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+  externs_list = [ "//ui/webui/resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer_externs.js" ]
 }
 
 js_library("change_picture_browser_proxy") {
@@ -48,7 +48,7 @@ js_library("change_picture_browser_proxy") {
 
 js_library("dark_mode_subpage") {
   deps = [
-    "..:os_route.m",
+    "..:os_route",
     "..:prefs_behavior",
     "..:route_observer_behavior",
     "../..:router",
@@ -60,8 +60,8 @@ js_library("personalization_page") {
   deps = [
     ":personalization_hub_browser_proxy",
     ":wallpaper_browser_proxy",
-    "..:deep_linking_behavior.m",
-    "..:os_route.m",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "..:route_observer_behavior",
     "../..:router",
     "../ambient_mode_page:ambient_mode_browser_proxy",
diff --git a/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn b/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn
index c33b0e6253e..a937d1cc2cf 100644
--- a/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/privacy_sandbox/BUILD.gn
@@ -15,6 +15,8 @@ if (optimize_webui) {
       "privacy_sandbox/app.js",
       "privacy_sandbox/app.html.js",
       "privacy_sandbox/icons.js",
+      "privacy_sandbox/interest_item.js",
+      "privacy_sandbox/interest_item.html.js",
       "privacy_sandbox/privacy_sandbox_browser_proxy.js",
     ]
     input_files_base_dir = rebase_path("$target_gen_dir/../tsc", root_build_dir)
diff --git a/chromium/chrome/browser/resources/settings/settings.gni b/chromium/chrome/browser/resources/settings/settings.gni
index c00101f08fc..084da25bea9 100644
--- a/chromium/chrome/browser/resources/settings/settings.gni
+++ b/chromium/chrome/browser/resources/settings/settings.gni
@@ -5,6 +5,8 @@
 import("//build/config/chromeos/ui_mode.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 
+assert(!is_android, "Android does not use these settings")
+
 settings_closure_flags =
     default_closure_args + [
       "js_module_root=../../chrome/browser/resources/settings/",
@@ -17,7 +19,6 @@ settings_closure_flags =
 # Files holding a Polymer element definition and have an equivalent .html file.
 web_component_files = [
   "a11y_page/a11y_page.ts",
-  "a11y_page/captions_subpage.ts",
   "a11y_page/live_caption_section.ts",
   "about_page/about_page.ts",
   "appearance_page/appearance_fonts_page.ts",
@@ -40,6 +41,7 @@ web_component_files = [
   "autofill_page/password_move_to_account_dialog.ts",
   "autofill_page/password_remove_confirmation_dialog.ts",
   "autofill_page/password_remove_dialog.ts",
+  "autofill_page/password_view.ts",
   "autofill_page/passwords_device_section.ts",
   "autofill_page/passwords_export_dialog.ts",
   "autofill_page/passwords_list_handler.ts",
@@ -84,6 +86,7 @@ web_component_files = [
   "privacy_page/privacy_guide/privacy_guide_completion_link_row.ts",
   "privacy_page/privacy_guide/privacy_guide_cookies_fragment.ts",
   "privacy_page/privacy_guide/privacy_guide_description_item.ts",
+  "privacy_page/privacy_guide/privacy_guide_dialog.ts",
   "privacy_page/privacy_guide/privacy_guide_history_sync_fragment.ts",
   "privacy_page/privacy_guide/privacy_guide_msbb_fragment.ts",
   "privacy_page/privacy_guide/privacy_guide_page.ts",
@@ -104,6 +107,7 @@ web_component_files = [
   "privacy_page/security_keys_phones_dialog.ts",
   "privacy_page/security_page.ts",
   "privacy_sandbox/app.ts",
+  "privacy_sandbox/interest_item.ts",
   "reset_page/reset_page.ts",
   "reset_page/reset_profile_banner.ts",
   "reset_page/reset_profile_dialog.ts",
@@ -159,14 +163,14 @@ if (!is_chromeos_ash) {
     "languages_page/add_languages_dialog.ts",
     "languages_page/languages_page.ts",
     "languages_page/languages_subpage.ts",
+    "system_page/system_page.ts",
   ]
 }
 
-if (!is_chromeos_ash && !is_chromeos_lacros) {
+if (!is_chromeos) {
   web_component_files += [
     "default_browser_page/default_browser_page.ts",
     "people_page/import_data_dialog.ts",
-    "system_page/system_page.ts",
   ]
 }
 
@@ -174,6 +178,10 @@ if (!is_chromeos_ash && !is_mac) {
   web_component_files += [ "languages_page/edit_dictionary_page.ts" ]
 }
 
+if (!is_mac) {
+  web_component_files += [ "a11y_page/captions_subpage.ts" ]
+}
+
 if (is_win) {
   web_component_files += [
     "safety_check_page/safety_check_chrome_cleaner_child.ts",
@@ -184,7 +192,7 @@ if (is_win) {
   ]
 }
 
-if (is_chromeos_ash || is_chromeos_lacros) {
+if (is_chromeos) {
   web_component_files += [ "controls/password_prompt_dialog.ts" ]
 }
 
@@ -217,6 +225,7 @@ non_web_component_files = [
   "autofill_page/multi_store_password_ui_entry.ts",
   "autofill_page/password_check_mixin.ts",
   "autofill_page/password_manager_proxy.ts",
+  "autofill_page/password_requestor_mixin.ts",
   "autofill_page/payments_manager_proxy.ts",
   "autofill_page/show_password_mixin.ts",
   "base_mixin.ts",
@@ -268,7 +277,7 @@ non_web_component_files = [
   "site_settings/website_usage_browser_proxy.ts",
 ]
 
-if (is_chromeos_ash || is_chromeos_lacros) {
+if (is_chromeos) {
   non_web_component_files += [ "autofill_page/blocking_request_manager.ts" ]
 }
 
@@ -282,7 +291,6 @@ if (is_chromeos_ash) {
     non_web_component_files += [
       "default_browser_page/default_browser_browser_proxy.ts",
       "people_page/import_data_browser_proxy.ts",
-      "system_page/system_page_browser_proxy.ts",
     ]
   }
   non_web_component_files += [
@@ -291,6 +299,7 @@ if (is_chromeos_ash) {
     "languages_page/languages_settings_metrics_proxy.ts",
     "languages_page/languages_types.ts",
     "people_page/manage_profile_browser_proxy.ts",
+    "system_page/system_page_browser_proxy.ts",
   ]
 }
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2022-05-17 17:24:03 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2022-06-22 07:51:41 +0000
commit	774f54339e5db91f785733232d3950366db65d07 (patch)
tree	068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/chrome/browser/resources/settings
parent	f7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff)