BASELINE: Update Chromium to 98.0.4758.90

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

39 files changed, 410 insertions, 193 deletions

diff --git a/chromium/chrome/browser/resources/settings/BUILD.gn b/chromium/chrome/browser/resources/settings/BUILD.gn
index 374ba71ddf9..744d9f818c1 100644
--- a/chromium/chrome/browser/resources/settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/BUILD.gn
@@ -69,7 +69,24 @@ generate_grd("build_grd") {
     "images/password_check_positive.svg",
     "images/permissions_banner_dark.svg",
     "images/permissions_banner.svg",
-    "images/privacy_review_promo_banner.svg",
+    "images/privacy_review/clear_on_exit_graphic_dark.svg",
+    "images/privacy_review/clear_on_exit_graphic.svg",
+    "images/privacy_review/completion_banner_dark.svg",
+    "images/privacy_review/completion_banner.svg",
+    "images/privacy_review/cookies_graphic_dark.svg",
+    "images/privacy_review/cookies_graphic.svg",
+    "images/privacy_review/history_sync_graphic_dark.svg",
+    "images/privacy_review/history_sync_graphic.svg",
+    "images/privacy_review/msbb_graphic_dark.svg",
+    "images/privacy_review/msbb_graphic.svg",
+    "images/privacy_review/privacy_sandbox_graphic_dark.svg",
+    "images/privacy_review/privacy_sandbox_graphic.svg",
+    "images/privacy_review/promo_banner_dark.svg",
+    "images/privacy_review/promo_banner.svg",
+    "images/privacy_review/safe_browsing_graphic_dark.svg",
+    "images/privacy_review/safe_browsing_graphic.svg",
+    "images/privacy_review/waa_graphic_dark.svg",
+    "images/privacy_review/waa_graphic.svg",
     "images/privacy_sandbox_banner_dark.svg",
     "images/privacy_sandbox_banner.svg",
     "images/privacy_sandbox_floc_banner_dark.svg",
@@ -108,16 +125,17 @@ preprocess_if_expr("preprocess") {
     "about_page/about_page_browser_proxy.ts",
     "appearance_page/appearance_browser_proxy.ts",
     "appearance_page/fonts_browser_proxy.ts",
+    "autofill_page/autofill_manager_proxy.ts",
     "autofill_page/merge_exceptions_store_copies_mixin.ts",
-    "autofill_page/merge_passwords_store_copies_behavior.js",
+    "autofill_page/merge_passwords_store_copies_mixin.ts",
     "autofill_page/multi_store_exception_entry.ts",
     "autofill_page/multi_store_id_handler.ts",
     "autofill_page/multi_store_password_ui_entry.ts",
     "autofill_page/password_check_mixin.ts",
     "autofill_page/password_manager_proxy.ts",
+    "autofill_page/payments_manager_proxy.ts",
     "autofill_page/show_password_mixin.ts",
     "base_mixin.ts",
-    "chrome_cleanup_page/chrome_cleanup_proxy.ts",
     "clear_browsing_data_dialog/clear_browsing_data_browser_proxy.ts",
     "controls/cr_policy_pref_mixin.ts",
     "controls/pref_control_mixin.ts",
@@ -129,7 +147,6 @@ preprocess_if_expr("preprocess") {
     "global_scroll_target_mixin.ts",
     "hats_browser_proxy.ts",
     "i18n_setup.ts",
-    "incompatible_applications_page/incompatible_applications_browser_proxy.ts",
     "lazy_load.ts",
     "lifetime_browser_proxy.ts",
     "metrics_browser_proxy.ts",
@@ -137,13 +154,15 @@ preprocess_if_expr("preprocess") {
     "on_startup_page/startup_urls_page_browser_proxy.ts",
     "open_window_proxy.ts",
     "page_visibility.ts",
-    "people_page/sync_browser_proxy.js",
-    "people_page/profile_info_browser_proxy.js",
+    "people_page/sync_browser_proxy.ts",
+    "people_page/profile_info_browser_proxy.ts",
     "prefs/prefs_mixin.ts",
     "prefs/prefs.ts",
     "prefs/prefs_types.ts",
     "prefs/pref_util.ts",
     "privacy_page/privacy_page_browser_proxy.ts",
+    "privacy_page/privacy_review/privacy_review_browser_proxy.ts",
+    "privacy_page/privacy_review/constants.ts",
     "privacy_page/security_keys_browser_proxy.ts",
     "privacy_sandbox/privacy_sandbox_browser_proxy.ts",
     "reset_page/reset_browser_proxy.ts",
@@ -164,16 +183,20 @@ preprocess_if_expr("preprocess") {
     "site_settings/website_usage_browser_proxy.ts",
   ]
 
+  if (is_chromeos_ash || is_chromeos_lacros) {
+    in_files += [ "autofill_page/blocking_request_manager.ts" ]
+  }
+
   if (is_chromeos_ash) {
     in_files += [
-      "autofill_page/blocking_request_manager.ts",
-      "people_page/account_manager_browser_proxy.js",
+      "people_page/account_manager_browser_proxy.ts",
       "site_settings/android_info_browser_proxy.ts",
     ]
   } else {
     if (!is_chromeos_lacros) {
       in_files += [
         "default_browser_page/default_browser_browser_proxy.ts",
+        "people_page/import_data_browser_proxy.ts",
         "system_page/system_page_browser_proxy.ts",
       ]
     }
@@ -182,10 +205,16 @@ preprocess_if_expr("preprocess") {
       "languages_page/languages_browser_proxy.ts",
       "languages_page/languages_settings_metrics_proxy.ts",
       "languages_page/languages_types.ts",
-      "people_page/import_data_browser_proxy.ts",
       "people_page/manage_profile_browser_proxy.ts",
     ]
   }
+
+  if (is_win) {
+    in_files += [
+      "chrome_cleanup_page/chrome_cleanup_proxy.ts",
+      "incompatible_applications_page/incompatible_applications_browser_proxy.ts",
+    ]
+  }
 }
 
 preprocess_if_expr("preprocess_generated") {
@@ -263,11 +292,15 @@ preprocess_if_expr("preprocess_generated") {
     "privacy_page/security_page.ts",
     "privacy_page/disable_safebrowsing_dialog.ts",
     "privacy_page/privacy_review/privacy_review_clear_on_exit_fragment.ts",
+    "privacy_page/privacy_review/privacy_review_completion_fragment.ts",
+    "privacy_page/privacy_review/privacy_review_completion_link_row.ts",
+    "privacy_page/privacy_review/privacy_review_cookies_fragment.ts",
     "privacy_page/privacy_review/privacy_review_description_item.ts",
     "privacy_page/privacy_review/privacy_review_fragment_shared_css.ts",
     "privacy_page/privacy_review/privacy_review_history_sync_fragment.ts",
     "privacy_page/privacy_review/privacy_review_msbb_fragment.ts",
     "privacy_page/privacy_review/privacy_review_page.ts",
+    "privacy_page/privacy_review/privacy_review_safe_browsing_fragment.ts",
     "privacy_page/privacy_review/privacy_review_welcome_fragment.ts",
     "privacy_page/privacy_review/step_indicator.ts",
     "privacy_page/security_keys_bio_enroll_dialog.ts",
@@ -343,21 +376,23 @@ preprocess_if_expr("preprocess_generated") {
     in_files += [ "languages_page/edit_dictionary_page.ts" ]
   }
 
+  if (is_chromeos_ash || is_chromeos_lacros) {
+    in_files += [ "controls/password_prompt_dialog.ts" ]
+  }
+
   if (!is_chromeos) {
     in_files += [
       "default_browser_page/default_browser_page.ts",
+      "people_page/import_data_dialog.ts",
       "system_page/system_page.ts",
     ]
   }
 
-  if (is_chromeos_ash) {
-    in_files += [ "controls/password_prompt_dialog.ts" ]
-  } else {
+  if (!is_chromeos_ash) {
     in_files += [
       "languages_page/add_languages_dialog.ts",
       "languages_page/languages_page.ts",
       "languages_page/languages_subpage.ts",
-      "people_page/import_data_dialog.ts",
       "people_page/manage_profile.ts",
     ]
   }
@@ -381,10 +416,7 @@ grit("resources") {
 }
 
 group("closure_compile") {
-  deps = [
-    ":closure_compile_local",
-    "people_page:closure_compile",
-  ]
+  deps = [ ":closure_compile_local" ]
 
   if (is_chromeos_ash) {
     deps += [ "chromeos:closure_compile_module" ]
@@ -410,7 +442,6 @@ js_library("settings") {
   deps = [
     ":i18n_setup",
     ":lifetime_browser_proxy",
-    "people_page:sync_browser_proxy",
   ]
   extra_deps = [ ":build_ts" ]
 }
@@ -515,6 +546,7 @@ html_to_js("web_components_local") {
 ts_library("build_ts") {
   root_dir = "$target_gen_dir/$preprocess_folder"
   out_dir = "$target_gen_dir/tsc"
+  composite = true
   tsconfig_base = "tsconfig_base.json"
   in_files = [
     "a11y_page/a11y_page.ts",
@@ -530,13 +562,14 @@ ts_library("build_ts") {
     "appearance_page/home_url_input.ts",
     "autofill_page/address_edit_dialog.ts",
     "autofill_page/address_remove_confirmation_dialog.ts",
+    "autofill_page/autofill_manager_proxy.ts",
     "autofill_page/autofill_page.ts",
     "autofill_page/autofill_section.ts",
     "autofill_page/avatar_icon.ts",
     "autofill_page/credit_card_edit_dialog.ts",
     "autofill_page/credit_card_list_entry.ts",
     "autofill_page/merge_exceptions_store_copies_mixin.ts",
-    "autofill_page/merge_passwords_store_copies_behavior.js",
+    "autofill_page/merge_passwords_store_copies_mixin.ts",
     "autofill_page/multi_store_exception_entry.ts",
     "autofill_page/multi_store_id_handler.ts",
     "autofill_page/multi_store_password_ui_entry.ts",
@@ -558,6 +591,7 @@ ts_library("build_ts") {
     "autofill_page/passwords_section.ts",
     "autofill_page/passwords_shared_css.ts",
     "autofill_page/payments_list.ts",
+    "autofill_page/payments_manager_proxy.ts",
     "autofill_page/payments_section.ts",
     "autofill_page/show_password_mixin.ts",
     "autofill_page/upi_id_list_entry.ts",
@@ -601,10 +635,10 @@ ts_library("build_ts") {
     "open_window_proxy.ts",
     "page_visibility.ts",
     "people_page/people_page.ts",
-    "people_page/profile_info_browser_proxy.js",
+    "people_page/profile_info_browser_proxy.ts",
     "people_page/signout_dialog.ts",
     "people_page/sync_account_control.ts",
-    "people_page/sync_browser_proxy.js",
+    "people_page/sync_browser_proxy.ts",
     "people_page/sync_controls.ts",
     "people_page/sync_encryption_options.ts",
     "people_page/sync_page.ts",
@@ -619,12 +653,18 @@ ts_library("build_ts") {
     "privacy_page/personalization_options.ts",
     "privacy_page/privacy_page_browser_proxy.ts",
     "privacy_page/privacy_page.ts",
+    "privacy_page/privacy_review/constants.ts",
+    "privacy_page/privacy_review/privacy_review_browser_proxy.ts",
     "privacy_page/privacy_review/privacy_review_clear_on_exit_fragment.ts",
+    "privacy_page/privacy_review/privacy_review_completion_fragment.ts",
+    "privacy_page/privacy_review/privacy_review_completion_link_row.ts",
+    "privacy_page/privacy_review/privacy_review_cookies_fragment.ts",
     "privacy_page/privacy_review/privacy_review_description_item.ts",
     "privacy_page/privacy_review/privacy_review_fragment_shared_css.ts",
     "privacy_page/privacy_review/privacy_review_history_sync_fragment.ts",
     "privacy_page/privacy_review/privacy_review_msbb_fragment.ts",
     "privacy_page/privacy_review/privacy_review_page.ts",
+    "privacy_page/privacy_review/privacy_review_safe_browsing_fragment.ts",
     "privacy_page/privacy_review/privacy_review_welcome_fragment.ts",
     "privacy_page/privacy_review/step_indicator.ts",
     "privacy_page/privacy_review_promo.ts",
@@ -721,11 +761,16 @@ ts_library("build_ts") {
     ]
   }
 
-  if (is_chromeos_ash) {
+  if (is_chromeos_ash || is_chromeos_lacros) {
     in_files += [
       "autofill_page/blocking_request_manager.ts",
       "controls/password_prompt_dialog.ts",
-      "people_page/account_manager_browser_proxy.js",
+    ]
+  }
+
+  if (is_chromeos_ash) {
+    in_files += [
+      "people_page/account_manager_browser_proxy.ts",
       "site_settings/android_info_browser_proxy.ts",
     ]
   } else {
@@ -733,6 +778,8 @@ ts_library("build_ts") {
       in_files += [
         "default_browser_page/default_browser_browser_proxy.ts",
         "default_browser_page/default_browser_page.ts",
+        "people_page/import_data_browser_proxy.ts",
+        "people_page/import_data_dialog.ts",
         "system_page/system_page_browser_proxy.ts",
         "system_page/system_page.ts",
       ]
@@ -745,8 +792,6 @@ ts_library("build_ts") {
       "languages_page/languages_settings_metrics_proxy.ts",
       "languages_page/languages_subpage.ts",
       "languages_page/languages_types.ts",
-      "people_page/import_data_browser_proxy.ts",
-      "people_page/import_data_dialog.ts",
       "people_page/manage_profile_browser_proxy.ts",
       "people_page/manage_profile.ts",
     ]
@@ -777,7 +822,7 @@ ts_library("build_ts") {
     "//tools/typescript/definitions/runtime.d.ts",
     "//tools/typescript/definitions/settings_private.d.ts",
   ]
-  if (is_chromeos_ash) {
+  if (is_chromeos_ash || is_chromeos_lacros) {
     definitions +=
         [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ]
   }
diff --git a/chromium/chrome/browser/resources/settings/chrome_cleanup_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chrome_cleanup_page/BUILD.gn
index a7e84ef9db1..9562d3f61d9 100644
--- a/chromium/chrome/browser/resources/settings/chrome_cleanup_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chrome_cleanup_page/BUILD.gn
@@ -4,6 +4,8 @@
 
 import("//tools/polymer/html_to_js.gni")
 
+assert(is_win)
+
 html_to_js("web_components") {
   js_files = [
     "chrome_cleanup_page.ts",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
index eec0f44a09c..6a5338b2165 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
@@ -66,12 +66,14 @@ if (optimize_webui) {
       "chrome://resources/mojo/url/mojom/url.mojom-lite.js",
       "chrome://resources/mojo/skia/public/mojom/bitmap.mojom-lite.js",
       "chrome://resources/mojo/skia/public/mojom/image_info.mojom-lite.js",
+      "chrome://resources/mojo/skia/public/mojom/skcolor.mojom-webui.js",
       "app-management/app_management.mojom-lite.js",
       "os_apps_page/app_notification_handler.mojom-lite.js",
       "app-management/bitmap.mojom-lite.js",
       "app-management/file_path.mojom-lite.js",
       "app-management/image_info.mojom-lite.js",
       "app-management/image.mojom-lite.js",
+      "app-management/safe_base_name.mojom-lite.js",
       "app-management/types.mojom-lite.js",
       "mojo/nearby_share.mojom-lite.js",
       "mojo/nearby_share_share_type.mojom-lite.js",
@@ -117,6 +119,7 @@ preprocess_if_expr("preprocess_external_mojo") {
   out_manifest = "$target_gen_dir/$preprocess_external_mojo_manifest"
   in_files = [
     "mojo/public/mojom/base/file_path.mojom-lite.js",
+    "mojo/public/mojom/base/safe_base_name.mojom-lite.js",
     "ui/gfx/image/mojom/image.mojom-lite.js",
     "chrome/browser/ui/webui/app_management/app_management.mojom-lite.js",
     "chrome/browser/ui/webui/settings/chromeos/os_apps_page/mojom/app_notification_handler.mojom-lite.js",
@@ -148,6 +151,7 @@ generate_grd("build_grd") {
     "os_settings_v3.html",
     "images/computer_and_bluetooth_switch.svg",
     "images/error_badge.svg",
+    "images/error_badge_dark.svg",
     "images/icon_add_circle.svg",
     "images/icon_add_wifi.svg",
     "images/icon_pair_bluetooth.svg",
@@ -157,6 +161,7 @@ generate_grd("build_grd") {
     "images/notification_access_finished.svg",
     "images/notification_access_setup.svg",
     "images/keyboard_shortcut.svg",
+    "images/smart_privacy.svg",
     "images/switch_access_setup_guide_assign_select.svg",
     "images/switch_access_setup_guide_assign_next.svg",
     "images/switch_access_setup_guide_assign_previous.svg",
@@ -180,6 +185,7 @@ generate_grd("build_grd") {
   resource_path_rewrites = [
     "os_settings_v3.html|chromeos/os_settings_v3.html",
     "mojo/public/mojom/base/file_path.mojom-lite.js|app-management/file_path.mojom-lite.js",
+    "mojo/public/mojom/base/safe_base_name.mojom-lite.js|app-management/safe_base_name.mojom-lite.js",
     "ui/gfx/image/mojom/image.mojom-lite.js|app-management/image.mojom-lite.js",
     "chrome/browser/ui/webui/app_management/app_management.mojom-lite.js|app-management/app_management.mojom-lite.js",
     "chrome/browser/ui/webui/settings/chromeos/os_apps_page/mojom/app_notification_handler.mojom-lite.js|os_apps_page/app_notification_handler.mojom-lite.js",
@@ -258,6 +264,8 @@ preprocess_if_expr("preprocess_v3") {
     "chromeos/os_apps_page/app_management_page/types.js",
     "chromeos/os_apps_page/app_management_page/util.js",
     "chromeos/os_apps_page/app_notifications_page/mojo_interface_provider.js",
+    "chromeos/os_apps_page/permission_constants.js",
+    "chromeos/os_apps_page/permission_util.js",
     "chromeos/os_languages_page/input_method_settings.js",
     "chromeos/os_languages_page/languages_browser_proxy.js",
     "chromeos/os_languages_page/languages.js",
@@ -275,15 +283,17 @@ preprocess_if_expr("preprocess_v3") {
     "chromeos/os_about_page/device_name_util.js",
     "chromeos/os_reset_page/os_reset_browser_proxy.js",
     "chromeos/os_settings.js",
+    "chromeos/parental_controls_page/parental_controls_browser_proxy.js",
     "chromeos/personalization_page/change_picture_browser_proxy.js",
+    "chromeos/personalization_page/personalization_hub_browser_proxy.js",
     "chromeos/personalization_page/wallpaper_browser_proxy.js",
     "chromeos/prefs_behavior.js",
     "chromeos/os_privacy_page/peripheral_data_access_browser_proxy.js",
-    "people_page/account_manager_browser_proxy.js",
-    "people_page/profile_info_browser_proxy.js",
+    "chromeos/os_privacy_page/metrics_consent_browser_proxy.js",
+    "chromeos/os_people_page/account_manager_browser_proxy.js",
+    "chromeos/route_observer_behavior.js",
     "chromeos/ambient_mode_page/ambient_mode_browser_proxy.js",
     "chromeos/ambient_mode_page/constants.js",
-    "people_page/sync_browser_proxy.js",
     "router.js",
   ]
 }
@@ -317,8 +327,10 @@ preprocess_if_expr("copy_browser_settings_tsc") {
     "i18n_setup.js",
     "icons.js",
     "lifetime_browser_proxy.js",
+    "people_page/profile_info_browser_proxy.js",
     "people_page/signout_dialog.js",
     "people_page/sync_account_control.js",
+    "people_page/sync_browser_proxy.js",
     "people_page/sync_controls.js",
     "people_page/sync_encryption_options.js",
     "people_page/sync_page.js",
@@ -364,6 +376,8 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/crostini_page/crostini_disk_resize_confirmation_dialog.js",
     "chromeos/crostini_page/crostini_disk_resize_dialog.js",
     "chromeos/crostini_page/crostini_export_import.js",
+    "chromeos/crostini_page/crostini_extra_containers.js",
+    "chromeos/crostini_page/crostini_extra_containers_create_dialog.js",
     "chromeos/crostini_page/crostini_import_confirmation_dialog.js",
     "chromeos/crostini_page/crostini_page.js",
     "chromeos/crostini_page/crostini_port_forwarding.js",
@@ -419,6 +433,7 @@ preprocess_if_expr("preprocess_gen_v3") {
     "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",
@@ -445,6 +460,7 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/os_bluetooth_page/os_bluetooth_summary.js",
     "chromeos/os_bluetooth_page/os_paired_bluetooth_list_item.js",
     "chromeos/os_bluetooth_page/os_paired_bluetooth_list.js",
+    "chromeos/os_bluetooth_page/settings_fast_pair_toggle.js",
     "chromeos/os_a11y_page/change_dictation_locale_dialog.js",
     "chromeos/os_a11y_page/manage_a11y_page.js",
     "chromeos/os_a11y_page/os_a11y_page.js",
@@ -535,6 +551,7 @@ preprocess_if_expr("preprocess_gen_v3") {
     "chromeos/os_printing_page/os_printing_page.js",
     "chromeos/os_privacy_page/os_privacy_page.js",
     "chromeos/os_privacy_page/peripheral_data_access_protection_dialog.js",
+    "chromeos/os_privacy_page/smart_privacy_page.js",
     "chromeos/os_reset_page/os_powerwash_dialog.js",
     "chromeos/os_reset_page/os_powerwash_dialog_esim_item.js",
     "chromeos/os_reset_page/os_reset_page.js",
@@ -548,16 +565,15 @@ preprocess_if_expr("preprocess_gen_v3") {
     "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.m.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",
-    "chromeos/parental_controls_page/parental_controls_browser_proxy.m.js",
-    "chromeos/parental_controls_page/parental_controls_page.m.js",
-    "chromeos/personalization_page/change_picture.m.js",
-    "chromeos/personalization_page/dark_mode_subpage.m.js",
-    "chromeos/personalization_page/personalization_page.m.js",
+    "chromeos/parental_controls_page/parental_controls_page.js",
+    "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",
@@ -586,6 +602,7 @@ group("closure_compile_module") {
     "os_apps_page/app_management_page:closure_compile_module",
     "os_apps_page/app_management_page/borealis_page:closure_compile_module",
     "os_apps_page/app_management_page/plugin_vm_page:closure_compile_module",
+    "os_apps_page/app_notifications_page:closure_compile",
     "os_bluetooth_page:closure_compile_module",
     "os_files_page:closure_compile_module",
     "os_languages_page:closure_compile_module",
@@ -621,6 +638,7 @@ js_type_check("closure_compile_local_module") {
     ":os_settings_routes.m",
     ":pref_to_setting_metric_converter.m",
     ":prefs_behavior",
+    ":route_observer_behavior",
     ":route_origin_behavior.m",
     ":search_handler.m",
   ]
@@ -646,6 +664,7 @@ js_library("deep_linking_behavior.m") {
 
 js_library("global_scroll_target_behavior") {
   deps = [
+    ":route_observer_behavior",
     "..:router",
     "//ui/webui/resources/js:promise_resolver.m",
   ]
@@ -712,6 +731,13 @@ js_library("pref_to_setting_metric_converter.m") {
   extra_deps = [ ":modulize" ]
 }
 
+js_library("route_observer_behavior") {
+  deps = [
+    "..:router",
+    "//ui/webui/resources/js:assert.m",
+  ]
+}
+
 js_library("route_origin_behavior.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/route_origin_behavior.m.js" ]
   deps = [
@@ -766,10 +792,10 @@ group("polymer3_elements") {
     "os_settings_menu:web_components",
     "os_settings_page:web_components",
     "os_settings_search_box:web_components",
-    "os_settings_ui:polymer3_elements",
+    "os_settings_ui:web_components",
     "os_toolbar:web_components",
-    "parental_controls_page:polymer3_elements",
-    "personalization_page:polymer3_elements",
+    "parental_controls_page:web_components",
+    "personalization_page:web_components",
     "settings_scheduler_slider:web_components",
 
     # Local targets
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 c310483348a..9ae0102f59c 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
@@ -37,6 +37,7 @@ js_library("ambient_mode_page") {
     "..:deep_linking_behavior.m",
     "..:os_route.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -49,6 +50,7 @@ js_library("ambient_mode_photos_page") {
     ":ambient_mode_browser_proxy",
     ":constants",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..: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/bluetooth_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
index ad5609fc77e..5dee806fc42 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
@@ -35,6 +35,7 @@ js_library("bluetooth_page") {
     "..:metrics_recorder.m",
     "..:os_route.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "../..:router",
     "//services/device/public/mojom:mojom_js_library_for_compile",
     "//ui/webui/resources/js:assert.m",
@@ -51,6 +52,7 @@ js_library("bluetooth_subpage") {
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//services/device/public/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
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 89942cadb51..250c8d08d98 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
@@ -17,6 +17,8 @@ js_type_check("closure_compile_module") {
     ":crostini_disk_resize_confirmation_dialog",
     ":crostini_disk_resize_dialog",
     ":crostini_export_import",
+    ":crostini_extra_containers",
+    ":crostini_extra_containers_create_dialog",
     ":crostini_import_confirmation_dialog",
     ":crostini_page",
     ":crostini_port_forwarding",
@@ -31,6 +33,7 @@ js_library("crostini_arc_adb") {
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
@@ -55,6 +58,7 @@ js_library("crostini_arc_adb_confirmation_dialog") {
 
 js_library("crostini_browser_proxy") {
   deps = [
+    "//skia/public/mojom:mojom_js_library_for_compile",
     "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:load_time_data.m",
@@ -98,6 +102,7 @@ js_library("crostini_export_import") {
     ":crostini_import_confirmation_dialog",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -120,11 +125,13 @@ js_library("crostini_page") {
     ":crostini_arc_adb",
     ":crostini_browser_proxy",
     ":crostini_export_import",
+    ":crostini_extra_containers",
     ":crostini_port_forwarding",
     ":crostini_subpage",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "../..:router",
     "../guest_os:guest_os_shared_paths",
     "../guest_os:guest_os_shared_usb_devices",
@@ -167,17 +174,46 @@ js_library("crostini_port_forwarding_add_port_dialog") {
   ]
 }
 
+js_library("crostini_extra_containers") {
+  deps = [
+    ":crostini_browser_proxy",
+    ":crostini_extra_containers_create_dialog",
+    "..:metrics_recorder.m",
+    "..: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",
+  ]
+}
+
+js_library("crostini_extra_containers_create_dialog") {
+  deps = [
+    ":crostini_browser_proxy",
+    "..:metrics_recorder.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
 js_library("crostini_subpage") {
   deps = [
     ":crostini_browser_proxy",
     ":crostini_confirmation_dialog",
     ":crostini_disk_resize_confirmation_dialog",
     ":crostini_disk_resize_dialog",
+    ":crostini_extra_containers",
     ":crostini_port_forwarding",
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "..:route_origin_behavior.m",
     "../..:router",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
@@ -197,6 +233,8 @@ html_to_js("web_components") {
     "crostini_disk_resize_confirmation_dialog.js",
     "crostini_disk_resize_dialog.js",
     "crostini_export_import.js",
+    "crostini_extra_containers.js",
+    "crostini_extra_containers_create_dialog.js",
     "crostini_import_confirmation_dialog.js",
     "crostini_page.js",
     "crostini_port_forwarding_add_port_dialog.js",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/date_time_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/date_time_page/BUILD.gn
index d755321fc6e..c6eb6187536 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
@@ -23,6 +23,8 @@ js_library("date_time_page") {
     "..:deep_linking_behavior.m",
     "..:os_settings_routes.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
+    "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
     "//ui/webui/resources/cr_elements/policy:cr_policy_pref_indicator.m",
@@ -62,6 +64,7 @@ js_library("timezone_subpage") {
     "..:deep_linking_behavior.m",
     "..:os_settings_routes.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "../..:router",
     "//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/device_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
index b0eff775cf6..e2f44f377f3 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
@@ -32,6 +32,7 @@ js_library("device_page") {
   deps = [
     ":device_page_browser_proxy",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
@@ -48,6 +49,7 @@ js_library("device_page_browser_proxy") {
 js_library("display") {
   deps = [
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "../settings_scheduler_slider:settings_scheduler_slider",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -87,6 +89,7 @@ js_library("keyboard") {
     ":device_page_browser_proxy",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:i18n_setup",
     "../..:router",
     "//ui/webui/resources/js:assert.m",
@@ -111,6 +114,7 @@ js_library("pointers") {
     ":device_page_browser_proxy",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
   ]
@@ -122,6 +126,7 @@ js_library("power") {
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
@@ -132,6 +137,7 @@ js_library("storage") {
   deps = [
     ":device_page_browser_proxy",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "..:route_origin_behavior.m",
     "../..:router",
     "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
@@ -163,6 +169,7 @@ js_library("stylus") {
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
     "//ui/webui/resources/js:assert.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 21ef9409b0d..c5505c9ca5d 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
@@ -28,6 +28,7 @@ js_library("google_assistant_page") {
     "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
     "//chrome/browser/resources/settings/chromeos:os_route.m",
     "//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",
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 5e8ae9fe3a1..db8b3f73c14 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
@@ -49,6 +49,7 @@ js_library("internet_config") {
     ":internet_shared_css",
     "//chrome/browser/resources/settings:router",
     "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
+    "//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",
     "//ui/webui/resources/cr_components/chromeos/network:network_config.m",
@@ -64,6 +65,7 @@ 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: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",
     "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider.m",
@@ -84,8 +86,8 @@ js_library("internet_detail_page") {
     "//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:route_observer_behavior",
     "//chrome/browser/resources/settings/chromeos/os_people_page:os_sync_browser_proxy.m",
-    "//chrome/browser/resources/settings/people_page: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",
@@ -112,6 +114,7 @@ js_library("internet_detail_page") {
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+  externs_list = [ "../settings_controls_types.js" ]
 }
 
 js_library("internet_known_networks_page") {
@@ -121,6 +124,7 @@ js_library("internet_known_networks_page") {
     "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
     "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
     "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/chromeos:route_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",
@@ -148,6 +152,7 @@ js_library("internet_page") {
     "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
     "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
     "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//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",
@@ -188,6 +193,7 @@ js_library("internet_subpage") {
     "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
     "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
     "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/chromeos:route_observer_behavior",
     "//chrome/browser/resources/settings/chromeos:route_origin_behavior.m",
     "//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",
@@ -222,6 +228,7 @@ js_library("network_proxy_section") {
     "//chrome/browser/resources/settings:router",
     "//chrome/browser/resources/settings/chromeos:os_route.m",
     "//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",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/network:cr_policy_network_behavior_mojo.m",
@@ -335,6 +342,7 @@ 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: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",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.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 bdd924da90b..6f7ef8a4809 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/kerberos_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/kerberos_page/BUILD.gn
@@ -23,8 +23,9 @@ js_library("kerberos_accounts") {
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
-    "../../people_page:account_manager_browser_proxy",
+    "../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",
@@ -58,6 +59,7 @@ js_library("kerberos_add_account_dialog") {
 js_library("kerberos_page") {
   deps = [
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..: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/multidevice_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
index e479617fa73..8f3ed5026d2 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
@@ -5,6 +5,7 @@
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
+import("../../../nearby_share/shared/nearby_shared.gni")
 import("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
@@ -20,6 +21,7 @@ js_type_check("closure_compile_module") {
     ":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",
@@ -93,7 +95,9 @@ js_library("multidevice_page.m") {
     "..:metrics_recorder.m",
     "..:os_route.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "../..:router",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
     "//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",
@@ -107,6 +111,7 @@ js_library("multidevice_notification_access_setup_dialog.m") {
   deps = [
     ":multidevice_constants.m",
     "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
   extra_deps = [ ":multidevice_notification_access_setup_dialog_module" ]
@@ -142,6 +147,7 @@ js_library("multidevice_smartlock_subpage.m") {
     "..:os_route.m",
     "..:os_settings_routes.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
@@ -161,6 +167,7 @@ js_library("multidevice_subpage.m") {
     "..:deep_linking_behavior.m",
     "..:os_route.m",
     "..:os_settings_routes.m",
+    "..: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",
@@ -189,11 +196,11 @@ js_library("multidevice_task_continuation_item.m") {
     ":multidevice_feature_behavior.m",
     ":multidevice_feature_item.m",
     ":multidevice_task_continuation_disabled_link.m",
-    "../../people_page:sync_browser_proxy",
     "//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") {
@@ -205,7 +212,6 @@ js_library("multidevice_wifi_sync_item.m") {
     "..:os_route.m",
     "..:route_origin_behavior.m",
     "../..:router",
-    "../../people_page:sync_browser_proxy",
     "../os_people_page:os_sync_browser_proxy.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -213,6 +219,7 @@ js_library("multidevice_wifi_sync_item.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") {
@@ -241,6 +248,22 @@ js_library("multidevice_wifi_sync_disabled_link.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" ]
+  deps = [
+    "../os_people_page:lock_screen_password_prompt_dialog.m",
+    "../os_people_page:lock_state_behavior.m",
+    "//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",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
+  ]
+  extra_deps = [ ":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" ]
   deps = [
@@ -264,6 +287,7 @@ group("polymer3_elements") {
     ":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",
@@ -275,6 +299,21 @@ group("polymer3_elements") {
   ]
 }
 
+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"
@@ -299,9 +338,10 @@ polymer_modulizer("multidevice_page") {
   html_file = "multidevice_page.html"
   html_type = "dom-module"
   migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
+  namespace_rewrites =
+      os_settings_namespace_rewrites + nearby_shared_namespace_rewrites
   auto_imports =
-      os_settings_auto_imports +
+      os_settings_auto_imports + nearby_shared_auto_imports_closure_fix +
       [ "ui/webui/resources/html/polymer.html|Polymer,html,beforeNextRender" ]
 }
 
@@ -395,6 +435,15 @@ polymer_modulizer("multidevice_wifi_sync_disabled_link") {
   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"
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 db75bbdeab2..0fa34a21012 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
@@ -14,11 +14,7 @@ js_type_check("closure_compile_module") {
   # TODO(crbug.com/1121865): browser_resolver_prefix_replacements allows path
   # from ../../shared/* to resolve to ../../../nearby_share/shared/* for closure
   # purposes.
-  closure_flags = os_settings_closure_flags + [
-                    "js_module_root=../../chrome/browser/resources/nearby_share",
-                    "js_module_root=./gen/chrome/browser/resources/nearby_share",
-                    "browser_resolver_prefix_replacements=\"../../shared/=../../../nearby_share/shared/\"",
-                  ]
+  closure_flags = os_settings_closure_flags
   deps = [
     ":nearby_share_confirm_page.m",
     ":nearby_share_contact_visibility_dialog.m",
@@ -138,6 +134,7 @@ js_library("nearby_share_subpage.m") {
     "..:deep_linking_behavior.m",
     "..:os_route.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "../..:router",
     "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page.m",
     "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
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 e252cc24b69..96e9643ddbe 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
@@ -52,6 +52,7 @@ js_library("manage_a11y_page") {
     "//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:route_observer_behavior",
     "//chrome/browser/resources/settings/chromeos:route_origin_behavior.m",
     "//chrome/browser/resources/settings/chromeos/device_page:device_page_browser_proxy",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -71,6 +72,7 @@ js_library("os_a11y_page") {
     "//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:route_observer_behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
@@ -144,6 +146,7 @@ js_library("switch_access_subpage") {
     "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
     "//chrome/browser/resources/settings/chromeos:os_route.m",
     "//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",
@@ -161,6 +164,7 @@ js_library("tts_subpage") {
     "//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: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",
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 a8d9f1ebcb8..9a694db0f6c 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
@@ -42,6 +42,7 @@ js_library("detailed_build_info") {
     ":edit_hostname_dialog",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
@@ -75,6 +76,7 @@ js_library("os_about_page") {
     ":device_name_browser_proxy",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:i18n_setup",
     "../..:lifetime_browser_proxy",
     "../..:router",
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 8d3bd4c53ec..aeb1ba99a91 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
@@ -13,6 +13,8 @@ js_type_check("closure_compile_module") {
     ":android_apps_browser_proxy",
     ":android_apps_subpage",
     ":os_apps_page",
+    ":permission_constants",
+    ":permission_util",
   ]
 }
 
@@ -26,6 +28,7 @@ js_library("android_apps_subpage") {
     "..:deep_linking_behavior.m",
     "..:os_route.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
@@ -57,6 +60,17 @@ js_library("os_apps_page") {
   ]
 }
 
+js_library("permission_util") {
+  deps = [
+    ":permission_constants",
+    "//ui/webui/resources/js:assert.m",
+  ]
+}
+
+js_library("permission_constants") {
+  deps = [ "//chrome/browser/ui/webui/app_management:mojo_bindings_js_library_for_compile" ]
+}
+
 html_to_js("web_components") {
   js_files = [
     "android_apps_subpage.js",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/BUILD.gn
index 2101b2cc80d..56065b91659 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
@@ -65,6 +65,7 @@ js_library("app_detail_view") {
     ":dom_switch",
     ":store_client",
     "../..:os_route.m",
+    "../..:route_observer_behavior",
     "../../..:router",
     "./borealis_page:borealis_detail_view",
     "./plugin_vm_page:plugin_vm_detail_view",
@@ -155,6 +156,7 @@ js_library("main_view") {
     ":store_client",
     ":util",
     "../..:os_route.m",
+    "../..:route_observer_behavior",
     "../../..:router",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
@@ -231,7 +233,7 @@ js_library("shared_vars") {
 js_library("store") {
   deps = [
     "//ui/webui/resources/js:cr.m",
-    "//ui/webui/resources/js/cr/ui:store.m",
+    "//ui/webui/resources/js/cr/ui:store",
   ]
 }
 
@@ -240,8 +242,8 @@ js_library("store_client") {
     ":store",
     ":types",
     "//ui/webui/resources/js:cr.m",
-    "//ui/webui/resources/js/cr/ui:store.m",
-    "//ui/webui/resources/js/cr/ui:store_client.m",
+    "//ui/webui/resources/js/cr/ui:store",
+    "//ui/webui/resources/js/cr/ui:store_client",
   ]
 }
 
@@ -272,6 +274,7 @@ js_library("supported_links_item") {
     ":supported_links_overlapping_apps_dialog",
     ":types",
     ":util",
+    "../..:metrics_recorder.m",
     "//ui/webui/resources/cr_components/chromeos/localized_link:localized_link",
     "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
     "//ui/webui/resources/cr_elements/cr_radio_group:cr_radio_group.m",
@@ -306,6 +309,7 @@ js_library("uninstall_button") {
 
 js_library("util") {
   deps = [
+    "../:permission_constants",
     "../..:os_route.m",
     "../../..:router",
   ]
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 ec8477d2599..3e27d53d31a 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
@@ -18,6 +18,7 @@ js_type_check("closure_compile") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
+    ":app_notification_row",
     ":app_notifications_subpage",
     ":mojo_interface_provider",
   ]
@@ -30,6 +31,7 @@ js_library("app_notifications_subpage") {
     "../..:deep_linking_behavior.m",
     "../..:metrics_recorder.m",
     "../..:os_route.m",
+    "../..:route_observer_behavior",
     "../../..:router",
     "//chrome/browser/ui/webui/settings/chromeos/os_apps_page/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -38,6 +40,8 @@ js_library("app_notifications_subpage") {
 
 js_library("app_notification_row") {
   deps = [
+    "../:permission_constants",
+    "../:permission_util",
     "../..:metrics_recorder.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
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 2f863169213..b8abf5f7b75 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
@@ -18,6 +18,7 @@ js_type_check("closure_compile_module") {
     ":os_bluetooth_summary",
     ":os_paired_bluetooth_list",
     ":os_paired_bluetooth_list_item",
+    ":settings_fast_pair_toggle",
   ]
 }
 
@@ -35,6 +36,7 @@ js_library("os_bluetooth_page") {
 js_library("os_bluetooth_devices_subpage") {
   deps = [
     ":os_paired_bluetooth_list",
+    ":settings_fast_pair_toggle",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/bluetooth:cros_bluetooth_config",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -77,6 +79,7 @@ js_library("os_bluetooth_device_detail_subpage") {
   deps = [
     ":os_bluetooth_change_device_name_dialog",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_device_battery_info",
@@ -89,6 +92,7 @@ js_library("os_bluetooth_change_device_name_dialog") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_utils",
+    "//ui/webui/resources/cr_components/chromeos/bluetooth:cros_bluetooth_config",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
 }
@@ -101,6 +105,12 @@ js_library("os_bluetooth_pairing_dialog") {
   ]
 }
 
+js_library("settings_fast_pair_toggle") {
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+  ]
+}
+
 html_to_js("web_components") {
   js_files = [
     "os_paired_bluetooth_list_item.js",
@@ -111,5 +121,6 @@ html_to_js("web_components") {
     "os_bluetooth_device_detail_subpage.js",
     "os_bluetooth_change_device_name_dialog.js",
     "os_bluetooth_pairing_dialog.js",
+    "settings_fast_pair_toggle.js",
   ]
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_files_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_files_page/BUILD.gn
index 01218627943..7f1a8d5cf34 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
@@ -19,6 +19,7 @@ js_library("os_files_page") {
   deps = [
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
   ]
 }
@@ -26,6 +27,7 @@ js_library("os_files_page") {
 js_library("smb_shares_page") {
   deps = [
     "..:os_route.m",
+    "..: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 0db314fd801..9f90871e540 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
@@ -121,6 +121,7 @@ js_library("input_method_util.m") {
   deps = [
     ":input_method_settings",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/js:cr.m",
   ]
@@ -150,6 +151,7 @@ js_library("input_page.m") {
     ":os_edit_dictionary_page.m",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:i18n_setup",
     "../..:router",
     "../keyboard_shortcut_banner:keyboard_shortcut_banner",
@@ -204,6 +206,7 @@ js_library("os_languages_page_v2.m") {
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:i18n_setup",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -243,6 +246,7 @@ js_library("smart_inputs_page.m") {
     "..:deep_linking_behavior.m",
     "..:os_route.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/js:load_time_data.m",
   ]
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 f081c60eb11..ff74d01700a 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
@@ -12,6 +12,7 @@ js_type_check("closure_compile_module") {
   is_polymer3 = true
   deps = [
     ":account_manager.m",
+    ":account_manager_browser_proxy",
     ":fingerprint_browser_proxy.m",
     ":fingerprint_list.m",
     ":lock_screen.m",
@@ -28,14 +29,19 @@ js_type_check("closure_compile_module") {
   ]
 }
 
+js_library("account_manager_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+}
+
 js_library("account_manager.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.m.js" ]
   deps = [
+    ":account_manager_browser_proxy",
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
-    "../../people_page:account_manager_browser_proxy",
     "//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",
@@ -63,6 +69,7 @@ js_library("fingerprint_list.m") {
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior",
     "//third_party/polymer/v3_0/components-chromium/paper-ripple:paper-ripple",
@@ -84,6 +91,7 @@ js_library("lock_screen.m") {
     ":lock_state_behavior.m",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "../multidevice_page:multidevice_smartlock_item.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -126,21 +134,20 @@ js_library("lock_state_behavior.m") {
 js_library("os_people_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.m.js" ]
   deps = [
+    ":account_manager_browser_proxy",
     ":lock_screen.m",
     ":lock_state_behavior.m",
     ":os_sync_controls.m",
     "..:deep_linking_behavior.m",
     "..:os_page_visibility.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
-    "../../people_page:account_manager_browser_proxy",
-    "../parental_controls_page:parental_controls_page.m",
-    "//chrome/browser/resources/settings/people_page:profile_info_browser_proxy",
-    "//chrome/browser/resources/settings/people_page:sync_browser_proxy",
+    "../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.m",
+    "//ui/webui/resources/cr_elements/chromeos/cr_picture:png",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:icon",
@@ -211,6 +218,7 @@ js_library("user_list.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/user_list.m.js" ]
   deps = [
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
@@ -242,6 +250,7 @@ js_library("users_page.m") {
     ":users_add_user_dialog.m",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..: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_printing_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_printing_page/BUILD.gn
index c59ddaef006..97577d1af99 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
@@ -106,6 +106,7 @@ js_library("cups_printers") {
     ":cups_settings_add_printer_dialog",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
@@ -156,6 +157,7 @@ js_library("os_printing_page") {
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..: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_privacy_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_privacy_page/BUILD.gn
index 250e92b667a..14ff8c9c469 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_privacy_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_privacy_page/BUILD.gn
@@ -12,15 +12,18 @@ js_type_check("closure_compile_module") {
   deps = [
     ":os_privacy_page",
     ":peripheral_data_access_protection_dialog",
+    ":smart_privacy_page",
   ]
 }
 
 js_library("os_privacy_page") {
   deps = [
+    ":metrics_consent_browser_proxy",
     ":peripheral_data_access_browser_proxy",
     ":peripheral_data_access_protection_dialog",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "../os_people_page:lock_screen.m",
     "../os_people_page:lock_state_behavior.m",
@@ -30,6 +33,13 @@ js_library("os_privacy_page") {
   externs_list = chrome_extension_public_externs
 }
 
+js_library("metrics_consent_browser_proxy") {
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:cr.m",
+  ]
+}
+
 js_library("peripheral_data_access_browser_proxy") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -45,9 +55,19 @@ js_library("peripheral_data_access_protection_dialog") {
   ]
 }
 
+js_library("smart_privacy_page") {
+  deps = [
+    "..:prefs_behavior",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
+}
+
 html_to_js("web_components") {
   js_files = [
     "os_privacy_page.js",
     "peripheral_data_access_protection_dialog.js",
+    "smart_privacy_page.js",
   ]
 }
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 1ca8a47517e..76f55b5b82a 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
@@ -50,6 +50,7 @@ js_library("os_reset_page") {
   deps = [
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/cellular_setup:esim_manager_utils.m",
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 502b65d8e44..6b57cb7247e 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
@@ -22,6 +22,7 @@ js_library("os_search_page") {
     "//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: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",
@@ -52,6 +53,7 @@ js_library("search_subpage") {
     "//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: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",
@@ -66,6 +68,7 @@ js_library("search_engine") {
     "//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: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",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
index 18a9e267c64..73b306184d8 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
@@ -112,6 +112,9 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                    "settings.pageVisibility|pageVisibility",
                                    "settings.PeripheralDataAccessBrowserProxy|PeripheralDataAccessBrowserProxy",
                                    "settings.DataAccessPolicyState|DataAccessPolicyState",
+                                   "settings.MetricsConsentBrowserProxy|MetricsConsentBrowserProxy",
+                                   "settings.MetricsConsentState|MetricsConsentState",
+                                   "settings.PersonalizationHubBrowserProxy|PersonalizationHubBrowserProxy",
                                    "settings.PhoneHubNotificationAccessStatus|PhoneHubNotificationAccessStatus",
                                    "settings.PowerSource|PowerSource",
                                    "settings.PowerManagementSettings|PowerManagementSettings",
@@ -192,7 +195,6 @@ settings_auto_imports = [
   "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",
-  "chrome/browser/resources/settings/router.html|Router,Route,RouteObserverBehavior",
 ]
 
 os_settings_auto_imports = settings_auto_imports +
@@ -233,18 +235,20 @@ os_settings_auto_imports = settings_auto_imports +
                              "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/people_page/account_manager_browser_proxy.html|AccountManagerBrowserProxy,AccountManagerBrowserProxyImpl,Account",
-                             "chrome/browser/resources/settings/people_page/profile_info_browser_proxy.html|ProfileInfoBrowserProxyImpl,ProfileInfoBrowserProxy,ProfileInfo",
-                             "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxyImpl,SyncBrowserProxy,StatusAction,SyncStatus,SyncPrefs",
+                             "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/route.html|routes",
-                             "chrome/browser/resources/settings/router.html|Router,Route,RouteObserverBehavior",
+                             "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",
@@ -286,7 +290,14 @@ os_settings_auto_imports = settings_auto_imports +
                              "third_party/polymer/v1_0/components-chromium/iron-resizable-behavior/iron-resizable-behavior.html|IronResizableBehavior",
                            ]
 
-os_settings_closure_flags = settings_closure_flags
+# TODO(crbug.com/1121865): browser_resolver_prefix_replacements allows path
+# from ../../shared/* to resolve to ../../../nearby_share/shared/* for closure
+# purposes.
+os_settings_closure_flags = settings_closure_flags + [
+                              "js_module_root=../../chrome/browser/resources/nearby_share",
+                              "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",
@@ -312,6 +323,8 @@ os_settings_migrated_imports = cr_components_migrated_imports + [
                                  "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",
@@ -455,6 +468,7 @@ os_settings_migrated_imports = cr_components_migrated_imports + [
                                  "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",
@@ -469,10 +483,18 @@ os_settings_migrated_imports = cr_components_migrated_imports + [
                                  "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_toolbar/os_toolbar.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",
@@ -492,7 +514,7 @@ os_settings_migrated_imports = cr_components_migrated_imports + [
                                  "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/people_page/account_manager_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",
@@ -517,6 +539,12 @@ os_settings_migrated_imports = cr_components_migrated_imports + [
                                  "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",
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 ef26e6c139b..b8afff577e9 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
@@ -16,6 +16,7 @@ js_library("os_settings_main") {
   deps = [
     "..:os_page_visibility.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "../os_settings_page:os_settings_page",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
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 9fdd49ffc1e..044249aa86c 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
@@ -15,6 +15,7 @@ js_type_check("closure_compile_module") {
 js_library("os_settings_menu") {
   deps = [
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/iron-collapse:iron-collapse",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
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 b0193e79509..17a96d049be 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings_page/BUILD.gn
@@ -22,6 +22,7 @@ js_library("os_settings_page") {
     ":settings_idle_load",
     "..:os_page_visibility.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "../bluetooth_page:bluetooth_page",
     "../crostini_page:crostini_page",
@@ -37,7 +38,7 @@ js_library("os_settings_page") {
     "../os_printing_page:os_printing_page",
     "../os_privacy_page:os_privacy_page",
     "../os_search_page:os_search_page",
-    "../personalization_page:personalization_page.m",
+    "../personalization_page:personalization_page",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
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 a2dd0793d73..f84b624d8aa 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
@@ -19,6 +19,7 @@ js_library("os_search_result_row") {
   deps = [
     "..:os_icons.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "..:search_handler.m",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
@@ -35,6 +36,7 @@ js_library("os_settings_search_box") {
     ":os_search_result_row",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "..:search_handler.m",
     "../..:router",
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
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 bc7a86f4b64..62e0ae7de41 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
@@ -2,19 +2,17 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//chrome/browser/resources/settings/chromeos/os_settings.gni")
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
-  deps = [ ":os_settings_ui.m" ]
+  deps = [ ":os_settings_ui" ]
 }
 
-js_library("os_settings_ui.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.m.js" ]
+js_library("os_settings_ui") {
   deps = [
     "..:metrics_recorder.m",
     "..:os_page_visibility.m",
@@ -31,19 +29,9 @@ js_library("os_settings_ui.m") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:util.m",
   ]
-  extra_deps = [ ":os_settings_ui_module" ]
   externs_list = [ "../settings_controls_types.js" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [ ":os_settings_ui_module" ]
-}
-
-polymer_modulizer("os_settings_ui") {
-  js_file = "os_settings_ui.js"
-  html_file = "os_settings_ui.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  auto_imports = os_settings_auto_imports + [ "ui/webui/resources/cr_elements/cr_drawer/cr_drawer.html|CrDrawerElement" ]
-  namespace_rewrites = os_settings_namespace_rewrites
+html_to_js("web_components") {
+  js_files = [ "os_settings_ui.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/parental_controls_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/parental_controls_page/BUILD.gn
index 8979a80416c..3a0b04543a0 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/parental_controls_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/parental_controls_page/BUILD.gn
@@ -3,53 +3,32 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
-    ":parental_controls_browser_proxy.m",
-    ":parental_controls_page.m",
+    ":parental_controls_browser_proxy",
+    ":parental_controls_page",
   ]
 }
 
-js_library("parental_controls_browser_proxy.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_browser_proxy.m.js" ]
-  extra_deps = [ ":modulize" ]
+js_library("parental_controls_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr.m" ]
 }
 
-js_library("parental_controls_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/parental_controls_page/parental_controls_page.m.js" ]
+js_library("parental_controls_page") {
   deps = [
-    ":parental_controls_browser_proxy.m",
+    ":parental_controls_browser_proxy",
     "../..:router",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":parental_controls_page_module" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":modulize",
-    ":parental_controls_page_module",
-  ]
-}
-
-polymer_modulizer("parental_controls_page") {
-  js_file = "parental_controls_page.js"
-  html_file = "parental_controls_page.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
-}
-
-js_modulizer("modulize") {
-  input_files = [ "parental_controls_browser_proxy.js" ]
-  namespace_rewrites = os_settings_namespace_rewrites
+html_to_js("web_components") {
+  js_files = [ "parental_controls_page.js" ]
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
index 4748c5262bc..0d8e816e142 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
@@ -3,114 +3,87 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
+import("//tools/polymer/html_to_js.gni")
 import("../os_settings.gni")
 
 js_type_check("closure_compile_module") {
   closure_flags = os_settings_closure_flags
   is_polymer3 = true
   deps = [
-    ":change_picture.m",
+    ":change_picture",
     ":change_picture_browser_proxy",
-    ":dark_mode_subpage.m",
-    ":personalization_page.m",
+    ":dark_mode_subpage",
+    ":personalization_hub_browser_proxy",
+    ":personalization_page",
     ":wallpaper_browser_proxy",
   ]
 }
 
-js_library("change_picture.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/change_picture.m.js" ]
+js_library("change_picture") {
   deps = [
     ":change_picture_browser_proxy",
     "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
+    "..: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.m",
-    "//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_picture_pane.m",
-    "//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_picture_types.m",
-    "//ui/webui/resources/cr_elements/chromeos/cr_picture:png.m",
+    "//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_picture_list",
+    "//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_picture_pane",
+    "//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_picture_types",
+    "//ui/webui/resources/cr_elements/chromeos/cr_picture:png",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:util.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-  extra_deps = [ ":change_picture_module" ]
 }
 
 js_library("change_picture_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
 }
 
-js_library("dark_mode_subpage.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/dark_mode_subpage.m.js" ]
-
+js_library("dark_mode_subpage") {
   deps = [
     "..:os_route.m",
     "..:prefs_behavior",
+    "..:route_observer_behavior",
     "../..:router",
     "//ui/webui/resources/js:load_time_data",
   ]
-  extra_deps = [ ":dark_mode_subpage_module" ]
 }
 
-js_library("personalization_page.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/personalization_page.m.js" ]
+js_library("personalization_page") {
   deps = [
+    ":personalization_hub_browser_proxy",
     ":wallpaper_browser_proxy",
     "..:deep_linking_behavior.m",
     "..:os_route.m",
+    "..:route_observer_behavior",
     "../..:router",
     "../ambient_mode_page:ambient_mode_browser_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":personalization_page_module" ]
 }
 
-js_library("wallpaper_browser_proxy") {
+js_library("personalization_hub_browser_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
 
-group("polymer3_elements") {
-  public_deps = [
-    ":change_picture_module",
-    ":dark_mode_subpage_module",
-    ":personalization_page_module",
-  ]
-}
-
-polymer_modulizer("change_picture") {
-  js_file = "change_picture.js"
-  html_file = "change_picture.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,assertNotReached",
-                   "ui/webui/resources/polymer/v3_0/iron-a11y-announcer/iron-a11y-announcer.html|IronA11yAnnouncer",
-                 ]
-}
-
-polymer_modulizer("dark_mode_subpage") {
-  js_file = "dark_mode_subpage.js"
-  html_file = "dark_mode_subpage.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
+js_library("wallpaper_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
 }
 
-polymer_modulizer("personalization_page") {
-  js_file = "personalization_page.js"
-  html_file = "personalization_page.html"
-  html_type = "dom-module"
-  migrated_imports = os_settings_migrated_imports
-  namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
+html_to_js("web_components") {
+  js_files = [
+    "change_picture.js",
+    "dark_mode_subpage.js",
+    "personalization_page.js",
+  ]
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/settings_scheduler_slider/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/settings_scheduler_slider/BUILD.gn
index fb516282baa..0995902e9f9 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/settings_scheduler_slider/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/settings_scheduler_slider/BUILD.gn
@@ -17,6 +17,7 @@ js_library("settings_scheduler_slider") {
     "..:prefs_behavior",
     "//third_party/polymer/v3_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior",
     "//third_party/polymer/v3_0/components-chromium/paper-behaviors:paper-ripple-behavior",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
 }
 
diff --git a/chromium/chrome/browser/resources/settings/controls/BUILD.gn b/chromium/chrome/browser/resources/settings/controls/BUILD.gn
index 47fd5bb5580..52cfcb84d60 100644
--- a/chromium/chrome/browser/resources/settings/controls/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/controls/BUILD.gn
@@ -17,7 +17,7 @@ html_to_js("web_components") {
     "settings_textarea.ts",
     "settings_toggle_button.ts",
   ]
-  if (is_chromeos_ash) {
+  if (is_chromeos_ash || is_chromeos_lacros) {
     js_files += [ "password_prompt_dialog.ts" ]
   }
 }
diff --git a/chromium/chrome/browser/resources/settings/incompatible_applications_page/BUILD.gn b/chromium/chrome/browser/resources/settings/incompatible_applications_page/BUILD.gn
index 867edd64e2e..ccd31f49d36 100644
--- a/chromium/chrome/browser/resources/settings/incompatible_applications_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/incompatible_applications_page/BUILD.gn
@@ -4,6 +4,8 @@
 
 import("//tools/polymer/html_to_js.gni")
 
+assert(is_win)
+
 html_to_js("web_components") {
   js_files = [
     "incompatible_application_item.ts",
diff --git a/chromium/chrome/browser/resources/settings/people_page/BUILD.gn b/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
index 5b8b9ed7eb7..f3819e75b93 100644
--- a/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
@@ -3,32 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/chromeos/ui_mode.gni")
-import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/polymer/html_to_js.gni")
-import("../settings.gni")
-
-js_type_check("closure_compile") {
-  is_polymer3 = true
-  closure_flags = settings_closure_flags + mojom_js_args
-  deps = [
-    ":account_manager_browser_proxy",
-    ":profile_info_browser_proxy",
-    ":sync_browser_proxy",
-  ]
-}
-
-js_library("account_manager_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr.m" ]
-}
-
-js_library("profile_info_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr.m" ]
-}
-
-js_library("sync_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr.m" ]
-  externs_list = [ "$externs_path/metrics_private.js" ]
-}
 
 html_to_js("web_components") {
   js_files = [
diff --git a/chromium/chrome/browser/resources/settings/privacy_page/privacy_review/BUILD.gn b/chromium/chrome/browser/resources/settings/privacy_page/privacy_review/BUILD.gn
index bb61b57f9d7..468a5d4ac4d 100644
--- a/chromium/chrome/browser/resources/settings/privacy_page/privacy_review/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/privacy_page/privacy_review/BUILD.gn
@@ -7,11 +7,15 @@ import("//tools/polymer/html_to_js.gni")
 html_to_js("web_components") {
   js_files = [
     "privacy_review_clear_on_exit_fragment.ts",
+    "privacy_review_completion_fragment.ts",
+    "privacy_review_completion_link_row.ts",
+    "privacy_review_cookies_fragment.ts",
     "privacy_review_description_item.ts",
     "privacy_review_fragment_shared_css.ts",
     "privacy_review_history_sync_fragment.ts",
     "privacy_review_msbb_fragment.ts",
     "privacy_review_page.ts",
+    "privacy_review_safe_browsing_fragment.ts",
     "privacy_review_welcome_fragment.ts",
     "step_indicator.ts",
   ]