BASELINE: Update Chromium to 87.0.4280.67

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

40 files changed, 1802 insertions, 535 deletions

diff --git a/chromium/chrome/browser/resources/settings/BUILD.gn b/chromium/chrome/browser/resources/settings/BUILD.gn
index 80ce6474e7b..77e8782ec6f 100644
--- a/chromium/chrome/browser/resources/settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//chrome/common/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/grit/grit_rule.gni")
+import("//tools/grit/preprocess_grit.gni")
 import("//tools/polymer/html_to_js.gni")
 import("//tools/polymer/polymer.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
@@ -13,12 +13,11 @@ import("../optimize_webui.gni")
 import("settings.gni")
 
 if (optimize_webui) {
-  settings_pak_file = "settings_resources.pak"
-  unpak_folder = "settings_resources.unpak"
+  preprocess_folder = "preprocessed"
 
   optimize_webui("build_polymer3") {
     host = "settings"
-    input = rebase_path("$target_gen_dir/$unpak_folder", root_build_dir)
+    input = rebase_path("$target_gen_dir/$preprocess_folder", root_build_dir)
     js_module_in_files = [
       "settings.js",
       "lazy_load.js",
@@ -30,36 +29,254 @@ if (optimize_webui) {
     ]
 
     deps = [
-      ":unpak",
-      "../../../../ui/webui/resources:modulize",
+      ":preprocess",
+      ":preprocess_generated",
+      "../../../../ui/webui/resources:preprocess",
+    ]
+    excludes = [
+      "chrome://resources/js/cr.m.js",
+      "chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js",
+      "chrome://resources/mojo/skia/public/mojom/skcolor.mojom-lite.js",
     ]
-    excludes = [ "chrome://resources/js/cr.m.js" ]
   }
 
-  unpak("unpak") {
-    pak_file = settings_pak_file
-    out_folder = unpak_folder
+  preprocess_grit("preprocess") {
+    in_folder = "./"
+    out_folder = "$target_gen_dir/$preprocess_folder"
+    in_files = [
+      "a11y_page/captions_browser_proxy.js",
+      "appearance_page/appearance_browser_proxy.js",
+      "autofill_page/merge_exceptions_store_copies_behavior.js",
+      "autofill_page/merge_passwords_store_copies_behavior.js",
+      "autofill_page/multi_store_exception_entry.js",
+      "autofill_page/multi_store_id_handler.js",
+      "autofill_page/multi_store_password_ui_entry.js",
+      "autofill_page/password_check_behavior.js",
+      "autofill_page/password_manager_proxy.js",
+      "autofill_page/show_password_behavior.js",
+      "chrome_cleanup_page/chrome_cleanup_proxy.js",
+      "clear_browsing_data_dialog/clear_browsing_data_browser_proxy.js",
+      "controls/settings_idle_load.js",
+      "downloads_page/downloads_browser_proxy.js",
+      "ensure_lazy_loaded.js",
+      "hats_browser_proxy.js",
+      "i18n_setup.js",
+      "incompatible_applications_page/incompatible_applications_browser_proxy.js",
+      "lazy_load.js",
+      "metrics_browser_proxy.js",
+      "on_startup_page/on_startup_browser_proxy.js",
+      "on_startup_page/startup_urls_page_browser_proxy.js",
+      "open_window_proxy.js",
+      "page_visibility.js",
+      "privacy_page/security_keys_browser_proxy.js",
+      "reset_page/reset_browser_proxy.js",
+      "route.js",
+      "safety_check_page/safety_check_browser_proxy.js",
+      "settings_page/main_page_behavior.js",
+      "settings_routes.js",
+      "settings.js",
+      "site_settings/constants.js",
+      "site_settings/cookie_info.js",
+      "site_settings/local_data_browser_proxy.js",
+      "site_settings/site_settings_behavior.js",
+      "site_settings/site_settings_prefs_browser_proxy.js",
+      "site_settings/website_usage_browser_proxy.js",
+    ]
 
-    deps = [ ":flattened_resources" ]
+    if (is_chromeos) {
+      in_files += [
+        "autofill_page/blocking_request_manager.js",
+        "languages_page/languages_metrics_proxy.js",
+        "site_settings/android_info_browser_proxy.js",
+      ]
+    } else {
+      in_files += [
+        "default_browser_page/default_browser_browser_proxy.js",
+        "people_page/import_data_browser_proxy.js",
+        "people_page/manage_profile_browser_proxy.js",
+        "printing_page/printing_browser_proxy.js",
+        "system_page/system_page_browser_proxy.js",
+      ]
+    }
   }
 
-  grit("flattened_resources") {
-    source = "settings_resources.grd"
-
-    grit_flags = [
-      "-E",
-      "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
-    ]
-
+  preprocess_grit("preprocess_generated") {
     deps = [ ":polymer3_elements" ]
-    defines = chrome_grit_defines
-    outputs = [
-      "grit/settings_resources.h",
-      "grit/settings_resources_map.cc",
-      "grit/settings_resources_map.h",
-      settings_pak_file,
+    in_folder = target_gen_dir
+    out_folder = "$target_gen_dir/$preprocess_folder"
+    in_files = [
+      "a11y_page/a11y_page.js",
+      "a11y_page/captions_subpage.m.js",
+      "about_page/about_page_browser_proxy.m.js",
+      "about_page/about_page.js",
+      "appearance_page/appearance_fonts_page.js",
+      "appearance_page/appearance_page.js",
+      "appearance_page/fonts_browser_proxy.m.js",
+      "appearance_page/home_url_input.js",
+      "autofill_page/autofill_page.js",
+      "autofill_page/avatar_icon.js",
+      "autofill_page/payments_list.js",
+      "autofill_page/credit_card_list_entry.js",
+      "autofill_page/upi_id_list_entry.js",
+      "autofill_page/passwords_shared_css.js",
+      "autofill_page/credit_card_edit_dialog.js",
+      "autofill_page/autofill_section.js",
+      "autofill_page/address_edit_dialog.js",
+      "autofill_page/password_check.js",
+      "autofill_page/password_check_edit_dialog.js",
+      "autofill_page/password_check_edit_disclaimer_dialog.js",
+      "autofill_page/password_check_list_item.js",
+      "autofill_page/password_list_item.js",
+      "autofill_page/passwords_list_handler.js",
+      "autofill_page/password_remove_confirmation_dialog.js",
+      "autofill_page/passwords_section.js",
+      "autofill_page/passwords_device_section.js",
+      "autofill_page/password_edit_dialog.js",
+      "autofill_page/password_move_to_account_dialog.js",
+      "autofill_page/password_remove_dialog.js",
+      "autofill_page/passwords_export_dialog.js",
+      "autofill_page/payments_section.js",
+      "basic_page/basic_page.js",
+      "clear_browsing_data_dialog/clear_browsing_data_dialog.js",
+      "clear_browsing_data_dialog/history_deletion_dialog.js",
+      "clear_browsing_data_dialog/installed_app_checkbox.js",
+      "clear_browsing_data_dialog/passwords_deletion_dialog.js",
+      "controls/controlled_button.m.js",
+      "controls/controlled_radio_button.m.js",
+      "controls/extension_controlled_indicator.m.js",
+      "controls/password_prompt_dialog.m.js",
+      "controls/settings_boolean_control_behavior.m.js",
+      "controls/settings_checkbox.js",
+      "controls/settings_dropdown_menu.m.js",
+      "controls/pref_control_behavior.m.js",
+      "controls/settings_radio_group.m.js",
+      "controls/settings_slider.m.js",
+      "controls/settings_textarea.m.js",
+      "controls/settings_toggle_button.m.js",
+      "downloads_page/downloads_page.js",
+      "extension_control_browser_proxy.m.js",
+      "global_scroll_target_behavior.m.js",
+      "icons.m.js",
+      "languages_page/languages.m.js",
+      "languages_page/languages_browser_proxy.m.js",
+      "languages_page/add_languages_dialog.js",
+      "languages_page/languages_page.js",
+      "lifetime_browser_proxy.m.js",
+      "settings_menu/settings_menu.js",
+      "on_startup_page/on_startup_page.js",
+      "on_startup_page/startup_url_dialog.js",
+      "on_startup_page/startup_url_entry.js",
+      "on_startup_page/startup_urls_page.js",
+      "people_page/sync_account_control.m.js",
+      "people_page/sync_browser_proxy.m.js",
+      "people_page/sync_encryption_options.m.js",
+      "people_page/people_page.js",
+      "people_page/profile_info_browser_proxy.m.js",
+      "people_page/signout_dialog.m.js",
+      "people_page/sync_controls.m.js",
+      "people_page/sync_page.m.js",
+      "prefs/prefs.m.js",
+      "prefs/prefs_behavior.m.js",
+      "prefs/prefs_types.m.js",
+      "prefs/pref_util.m.js",
+      "printing_page/cloud_printers.js",
+      "printing_page/printing_page.js",
+      "privacy_page/collapse_radio_button.js",
+      "privacy_page/cookies_page.js",
+      "privacy_page/do_not_track_toggle.js",
+      "privacy_page/privacy_page.js",
+      "privacy_page/personalization_options.m.js",
+      "privacy_page/privacy_page_browser_proxy.m.js",
+      "privacy_page/secure_dns.js",
+      "privacy_page/secure_dns_input.js",
+      "privacy_page/security_page.js",
+      "privacy_page/disable_safebrowsing_dialog.js",
+      "privacy_page/security_keys_bio_enroll_dialog.js",
+      "privacy_page/security_keys_credential_management_dialog.js",
+      "privacy_page/security_keys_pin_field.js",
+      "privacy_page/security_keys_reset_dialog.js",
+      "privacy_page/security_keys_set_pin_dialog.js",
+      "privacy_page/security_keys_subpage.js",
+      "reset_page/reset_page.js",
+      "reset_page/reset_profile_dialog.js",
+      "reset_page/reset_profile_banner.js",
+      "router.m.js",
+      "safety_check_page/safety_check_child.js",
+      "safety_check_page/safety_check_extensions_child.js",
+      "safety_check_page/safety_check_page.js",
+      "safety_check_page/safety_check_passwords_child.js",
+      "safety_check_page/safety_check_safe_browsing_child.js",
+      "safety_check_page/safety_check_updates_child.js",
+      "search_engines_page/search_engines_browser_proxy.m.js",
+      "search_engines_page/omnibox_extension_entry.js",
+      "search_engines_page/search_engine_dialog.js",
+      "search_engines_page/search_engine_entry_css.js",
+      "search_engines_page/search_engine_entry.js",
+      "search_engines_page/search_engines_list.js",
+      "search_engines_page/search_engines_page.js",
+      "search_page/search_page.js",
+      "search_settings.m.js",
+      "settings_main/settings_main.js",
+      "settings_page/settings_animated_pages.m.js",
+      "settings_page/settings_section.m.js",
+      "settings_page/settings_subpage.m.js",
+      "settings_ui/settings_ui.js",
+      "setting_id_param_util.m.js",
+      "settings_page_css.m.js",
+      "settings_shared_css.m.js",
+      "settings_vars_css.m.js",
+      "site_favicon.js",
+      "site_settings/add_site_dialog.js",
+      "site_settings/all_sites.js",
+      "site_settings/all_sites_icons.js",
+      "site_settings/category_default_setting.js",
+      "site_settings/category_setting_exceptions.js",
+      "site_settings/chooser_exception_list.js",
+      "site_settings/chooser_exception_list_entry.js",
+      "site_settings/clear_storage_dialog_css.js",
+      "site_settings/edit_exception_dialog.js",
+      "site_settings/media_picker.js",
+      "site_settings/pdf_documents.js",
+      "site_settings/protocol_handlers.js",
+      "site_settings/settings_category_default_radio_group.js",
+      "site_settings/site_data.js",
+      "site_settings/site_data_details_subpage.js",
+      "site_settings/site_data_entry.js",
+      "site_settings/site_details.js",
+      "site_settings/site_details_permission.js",
+      "site_settings/site_entry.js",
+      "site_settings/site_list.js",
+      "site_settings/site_list_entry.js",
+      "site_settings/zoom_levels.js",
+      "site_settings_page/recent_site_permissions.js",
+      "site_settings_page/site_settings_list.js",
+      "site_settings_page/site_settings_page.js",
     ]
-    output_dir = "$root_gen_dir/chrome/browser/resources/settings"
+
+    if (is_win) {
+      in_files += [
+        "chrome_cleanup_page/chrome_cleanup_page.js",
+        "chrome_cleanup_page/items_to_remove_list.js",
+        "incompatible_applications_page/incompatible_applications_page.js",
+        "incompatible_applications_page/incompatible_application_item.js",
+        "safety_check_page/safety_check_chrome_cleaner_child.js",
+      ]
+    }
+
+    if (!is_mac) {
+      in_files += [ "languages_page/edit_dictionary_page.js" ]
+    }
+
+    if (is_chromeos) {
+      in_files += [ "people_page/account_manager_browser_proxy.m.js" ]
+    } else {
+      in_files += [
+        "default_browser_page/default_browser_page.js",
+        "people_page/import_data_dialog.js",
+        "people_page/manage_profile.js",
+        "system_page/system_page.js",
+      ]
+    }
   }
 }
 
@@ -71,7 +288,6 @@ group("closure_compile") {
     "appearance_page:closure_compile",
     "controls:closure_compile",
     "languages_page:closure_compile",
-    "nearby_share_page:closure_compile",
     "people_page:closure_compile",
     "prefs:closure_compile",
     "privacy_page:closure_compile",
@@ -157,7 +373,6 @@ group("closure_compile_module") {
     "controls:closure_compile_module",
     "downloads_page:closure_compile_module",
     "languages_page:closure_compile_module",
-    "nearby_share_page:closure_compile_module",
     "on_startup_page:closure_compile_module",
     "people_page:closure_compile_module",
     "prefs:closure_compile_module",
@@ -263,6 +478,7 @@ js_library("lazy_load") {
     "autofill_page:autofill_section",
     "autofill_page:payments_section",
     "chrome_cleanup_page:chrome_cleanup_proxy",
+    "clear_browsing_data_dialog:clear_browsing_data_browser_proxy",
     "languages_page:languages_browser_proxy.m",
     "languages_page:languages_metrics_proxy",
     "languages_page:languages_page",
@@ -270,6 +486,7 @@ js_library("lazy_load") {
     "privacy_page:security_page",
     "site_settings:local_data_browser_proxy",
     "site_settings:protocol_handlers",
+    "site_settings:settings_category_default_radio_group",
     "site_settings:site_settings_prefs_browser_proxy",
     "site_settings_page",
   ]
diff --git a/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn b/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn
index 8f06869a570..2d596d9ea2d 100644
--- a/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn
@@ -218,12 +218,14 @@ js_library("passwords_list_handler") {
     ":password_manager_proxy",
     ":password_move_to_account_dialog",
     ":password_remove_dialog",
+    "../people_page:sync_browser_proxy.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
     "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
     "//ui/webui/resources/cr_elements/cr_toast:cr_toast.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
 }
diff --git a/chromium/chrome/browser/resources/settings/basic_page/BUILD.gn b/chromium/chrome/browser/resources/settings/basic_page/BUILD.gn
index 0c4de06b615..dcb01001d62 100644
--- a/chromium/chrome/browser/resources/settings/basic_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/basic_page/BUILD.gn
@@ -20,6 +20,7 @@ js_library("basic_page") {
     "..:search_settings.m",
     "../chrome_cleanup_page:chrome_cleanup_proxy",
     "../prefs:prefs_behavior.m",
+    "../privacy_page:privacy_page",
     "../safety_check_page:safety_check_page",
     "../search_page",
     "../settings_page:main_page_behavior",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
index 6fa59625436..1d4de3bef31 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
@@ -39,6 +39,7 @@ if (optimize_webui) {
       "chrome://resources/chromeos/colors/cros_colors.generated.css",
       "chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom.html",
       "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html",
+      "chrome://resources/mojo/mojo/public/mojom/base/unguessable_token.mojom-lite.js",
       "chrome://os-settings/app-management/app_management.mojom-lite.js",
       "chrome://os-settings/app-management/file_path.mojom-lite.js",
       "chrome://os-settings/app-management/image.mojom-lite.js",
@@ -54,11 +55,15 @@ if (optimize_webui) {
       "chrome://resources/mojo/skia/public/mojom/bitmap.mojom-lite.js",
       "chrome://resources/mojo/skia/public/mojom/image_info.mojom-lite.js",
       "chrome://resources/mojo/url/mojom/url.mojom-lite.js",
-      "shared/nearby_share_settings.html",
-      "shared/nearby_share_settings_behavior.html",
+      "mojo/nearby_share.mojom-lite.js",
+      "mojo/nearby_share_target_types.mojom-lite.js",
+      "mojo/nearby_share_settings.mojom-lite.js",
     ]
 
-    deps = [ ":unpak" ]
+    deps = [
+      ":unpak",
+      ":unpak_nearby",
+    ]
   }
 
   optimize_webui("build_polymer3") {
@@ -75,12 +80,14 @@ if (optimize_webui) {
     ]
 
     deps = [
+      ":unpak_nearby_v3",
       ":unpak_v3",
-      "../../../../../ui/webui/resources:modulize",
+      "../../../../../ui/webui/resources:preprocess",
     ]
     excludes = [
       "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-lite.js",
       "chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-lite.js",
+      "chrome://resources/mojo/mojo/public/mojom/base/unguessable_token.mojom-lite.js",
       "chrome://resources/mojo/services/network/public/mojom/ip_address.mojom-lite.js",
       "chrome://resources/cr_components/chromeos/network/mojo_interface_provider.m.js",
       "chrome://resources/js/cr.m.js",
@@ -98,8 +105,9 @@ if (optimize_webui) {
       "search/search.mojom-lite.js",
       "search/search_result_icon.mojom-lite.js",
       "search/user_action_recorder.mojom-lite.js",
-      "shared/nearby_share_settings.m.js",
-      "shared/nearby_share_settings_behavior.m.js",
+      "mojo/nearby_share.mojom-lite.js",
+      "mojo/nearby_share_target_types.mojom-lite.js",
+      "mojo/nearby_share_settings.mojom-lite.js",
     ]
   }
 
@@ -134,6 +142,30 @@ if (optimize_webui) {
     deps = [ ":flattened_resources" ]
   }
 
+  unpak("unpak_nearby") {
+    pak_file = "../../../../nearby_shared_resources.pak"
+    out_folder = unpak_folder + "/shared"
+    pak_base_dir = "../../"
+    excludes = unpak_excludes
+
+    deps = [
+      ":unpak",
+      "//chrome/browser/resources:nearby_shared_resources",
+    ]
+  }
+
+  unpak("unpak_nearby_v3") {
+    pak_file = "../../../../nearby_shared_resources_v3.pak"
+    out_folder = unpak_folder_v3 + "/shared"
+    pak_base_dir = "../../nearby_share/shared/"
+    excludes = unpak_excludes
+
+    deps = [
+      ":unpak_v3",
+      "//chrome/browser/resources:nearby_shared_resources_v3",
+    ]
+  }
+
   grit("flattened_resources") {
     source = "../os_settings_resources.grd"
 
@@ -174,7 +206,9 @@ group("closure_compile") {
     "internet_page:closure_compile",
     "localized_link:closure_compile",
     "multidevice_page:closure_compile",
+    "nearby_share_page:closure_compile",
     "os_a11y_page:closure_compile",
+    "os_about_page:closure_compile",
     "os_apps_page:closure_compile",
     "os_files_page:closure_compile",
     "os_languages_page:closure_compile",
@@ -267,12 +301,13 @@ group("closure_compile_module") {
 
     #"device_page:closure_compile_module",
     #"google_assistant_page:closure_compile_module",
-    #"internet_page:closure_compile_module",
+    "internet_page:closure_compile_module",
     "localized_link:closure_compile_module",
     "multidevice_page:closure_compile_module",
+    "nearby_share_page:closure_compile_module",
+    "os_a11y_page:closure_compile_module",
+    "os_about_page:closure_compile_module",
 
-    #"os_a11y_page:closure_compile_module",
-    #"os_about_page:closure_compile_module",
     #"os_apps_page:closure_compile_module",
     #"os_apps_page/app_management_page/plugin_vm_page:closure_compile_module",
     "os_files_page:closure_compile_module",
@@ -406,6 +441,7 @@ group("polymer3_elements") {
     "internet_page:polymer3_elements",
     "localized_link:polymer3_elements",
     "multidevice_page:polymer3_elements",
+    "nearby_share_page:polymer3_elements",
     "os_a11y_page:polymer3_elements",
     "os_about_page:polymer3_elements",
     "os_apps_page:polymer3_elements",
@@ -435,10 +471,12 @@ group("polymer3_elements") {
     "..:modulize",
     "..:settings_shared_css_module",
     "..:settings_vars_css_module",
-    "../nearby_share_page:polymer3_elements",
+    "../../settings:settings_page_css_module",
+    "../about_page:modulize",
     "../prefs:modulize",
     "../prefs:prefs_module",
     "../settings_page:settings_animated_pages_module",
+    "../settings_page:settings_section_module",
     "../settings_page:settings_subpage_module",
   ]
 }
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 a32163145d0..1af112c6b63 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
@@ -32,6 +32,7 @@ js_library("ambient_mode_page") {
   deps = [
     ":ambient_mode_browser_proxy",
     ":constants",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "../../prefs:prefs_behavior",
@@ -119,6 +120,7 @@ js_library("ambient_mode_page.m") {
   deps = [
     ":ambient_mode_browser_proxy.m",
     ":constants.m",
+    "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:router.m",
     "../../prefs:prefs_behavior.m",
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 abf46959d3f..b0076de1c66 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
@@ -22,6 +22,7 @@ js_type_check("closure_compile") {
 js_library("crostini_arc_adb") {
   deps = [
     ":crostini_browser_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "..:os_route",
     "../localized_link:localized_link",
@@ -38,6 +39,7 @@ js_library("crostini_browser_proxy") {
 js_library("crostini_export_import") {
   deps = [
     ":crostini_browser_proxy",
+    "..:deep_linking_behavior",
     "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
 }
@@ -53,6 +55,7 @@ js_library("crostini_disk_resize_dialog") {
 js_library("crostini_page") {
   deps = [
     ":crostini_browser_proxy",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "../../prefs:prefs_behavior",
@@ -104,6 +107,7 @@ js_library("crostini_port_forwarding_add_port_dialog") {
 js_library("crostini_subpage") {
   deps = [
     ":crostini_browser_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "..:os_route",
     "..:route_origin_behavior",
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 50fff49ef46..49cec5e6059 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
@@ -19,6 +19,7 @@ js_library("date_time_page") {
   deps = [
     ":date_time_types",
     ":timezone_selector",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "../../prefs:prefs_behavior",
@@ -50,6 +51,7 @@ js_library("timezone_subpage") {
     ":date_time_types",
     ":timezone_browser_proxy",
     ":timezone_selector",
+    "..:deep_linking_behavior",
     "../../prefs:prefs_behavior",
     "//ui/webui/resources/js:cr",
   ]
@@ -69,6 +71,7 @@ js_type_check("closure_compile_module") {
 js_library("date_time_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/date_time_page/date_time_page.m.js" ]
   deps = [
+    "..:deep_linking_behavior.m",
     "..:os_settings_routes.m",
     "../../prefs:prefs_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -115,9 +118,10 @@ js_library("timezone_subpage.m") {
   deps = [
     ":date_time_types.m",
     ":timezone_browser_proxy.m",
+    "..:deep_linking_behavior.m",
     "..:os_settings_routes.m",
-    "../../prefs:prefs_behavior.m",
     "../..:router.m",
+    "../../prefs:prefs_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
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 8f82d9031d3..575d08d2d15 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
@@ -39,6 +39,9 @@ js_library("device_page_browser_proxy") {
 js_library("pointers") {
   deps = [
     ":device_page_browser_proxy",
+    "..:deep_linking_behavior",
+    "..:os_route",
+    "../..:router",
     "../../controls:settings_toggle_button",
     "../localized_link:localized_link",
   ]
@@ -47,6 +50,7 @@ js_library("pointers") {
 js_library("keyboard") {
   deps = [
     ":device_page_browser_proxy",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "../../controls:settings_dropdown_menu",
@@ -61,6 +65,7 @@ js_library("keyboard") {
 js_library("stylus") {
   deps = [
     ":device_page_browser_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "../../prefs:prefs_types",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator",
@@ -72,6 +77,7 @@ js_library("stylus") {
 js_library("display") {
   deps = [
     ":display_layout",
+    "..:deep_linking_behavior",
     "../..:router",
     "../../controls:settings_dropdown_menu",
     "../../controls:settings_slider",
@@ -129,6 +135,7 @@ js_library("night_light_slider") {
 js_library("power") {
   deps = [
     ":device_page_browser_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "../..:router",
     "../../prefs:prefs_types",
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 e6ec1bbc610..75fb7315ed3 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
@@ -19,7 +19,9 @@ js_library("google_assistant_browser_proxy") {
 js_library("google_assistant_page") {
   deps = [
     ":google_assistant_browser_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
+    "..:os_route",
     "../../prefs:prefs_behavior",
     "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:i18n_behavior",
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 b48ce0b0edf..19cc416472e 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/internet_page/BUILD.gn
@@ -2,7 +2,9 @@
 # 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("//ui/webui/resources/tools/js_modulizer.gni")
 
 js_type_check("closure_compile") {
   deps = [
@@ -83,6 +85,7 @@ js_library("internet_detail_page") {
     "//ui/webui/resources/cr_components/chromeos/network:network_siminfo",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:i18n_behavior",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
   externs_list = [
     "$externs_path/chrome_send.js",
@@ -169,32 +172,68 @@ js_library("tether_connection_dialog") {
 }
 
 js_library("cellular_setup_dialog") {
-  deps = [ "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog" ]
+  deps = [
+    ":cellular_setup_settings_delegate",
+    "//ui/webui/resources/cr_components/chromeos/cellular_setup:cellular_setup",
+    "//ui/webui/resources/cr_components/chromeos/cellular_setup:cellular_setup_delegate",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
+  ]
+}
+
+js_library("cellular_setup_settings_delegate") {
+  deps = [
+    "//ui/webui/resources/cr_components/chromeos/cellular_setup:cellular_setup_delegate",
+    "//ui/webui/resources/js:cr",
+  ]
 }
 
 # TODO: Uncomment as the Polymer3 migration makes progress.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [
-#    ":cellular_setup_dialog.m"
-#    ":internet_config.m",
-#    ":internet_detail_page.m",
-#    ":internet_known_networks_page.m",
-#    ":internet_page.m",
-#    ":internet_page_browser_proxy.m",
-#    ":internet_shared_css.m",
-#    ":internet_subpage.m",
-#    ":network_proxy_section.m",
-#    ":network_summary.m",
-#    ":network_summary_item.m",
-#    ":tether_connection_dialog.m"
-#  ]
-#}
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [
+    ":cellular_setup_dialog.m",
+    ":cellular_setup_settings_delegate.m",
+    ":internet_config.m",
+    ":internet_detail_page.m",
+    ":internet_known_networks_page.m",
+
+    #    ":internet_page.m",
+    ":internet_page_browser_proxy.m",
+    ":internet_shared_css.m",
+
+    #    ":internet_subpage.m",
+    ":network_proxy_section.m",
+    ":network_summary.m",
+    ":network_summary_item.m",
+    ":tether_connection_dialog.m",
+  ]
+}
+
+js_library("cellular_setup_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/cellular_setup_dialog.m.js" ]
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/cellular_setup:cellular_setup.m",
+    "//ui/webui/resources/cr_components/chromeos/cellular_setup:cellular_setup_delegate.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":cellular_setup_dialog_module" ]
+}
 
 js_library("internet_config.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_config.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":internet_shared_css.m",
+    "//chrome/browser/resources/settings:router.m",
+    "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/network:network_config.m",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:util.m",
   ]
   extra_deps = [ ":internet_config_module" ]
 }
@@ -202,7 +241,43 @@ js_library("internet_config.m") {
 js_library("internet_detail_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":internet_page_browser_proxy.m",
+    ":internet_shared_css.m",
+    ":network_proxy_section.m",
+    ":tether_connection_dialog.m",
+    "//chrome/browser/resources/settings:router.m",
+    "//chrome/browser/resources/settings/chromeos:deep_linking_behavior.m",
+    "//chrome/browser/resources/settings/chromeos:metrics_recorder.m",
+    "//chrome/browser/resources/settings/chromeos/os_people_page:os_sync_browser_proxy.m",
+    "//chrome/browser/resources/settings/controls:controlled_button.m",
+    "//chrome/browser/resources/settings/controls:settings_toggle_button.m",
+    "//chrome/browser/resources/settings/people_page:sync_browser_proxy.m",
+    "//chrome/browser/resources/settings/prefs:prefs.m",
+    "//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",
+    "//third_party/polymer/v3_0/components-chromium/paper-spinner:paper-spinner-lite",
+    "//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:cr_policy_network_indicator_mojo.m",
+    "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_apnlist.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_choose_mobile.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_config_toggle.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_icon.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_ip_config.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_nameservers.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_property_list_mojo.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_siminfo.m",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button.m",
+    "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
   extra_deps = [ ":internet_detail_page_module" ]
 }
@@ -210,7 +285,20 @@ js_library("internet_detail_page.m") {
 js_library("internet_known_networks_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_page.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":internet_shared_css.m",
+    "//chrome/browser/resources/settings:router.m",
+    "//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",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/network:cr_policy_network_behavior_mojo.m",
+    "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
+    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
+    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row.m",
+    "//ui/webui/resources/js:assert.m",
   ]
   extra_deps = [ ":internet_known_networks_page_module" ]
 }
@@ -231,11 +319,17 @@ js_library("internet_page_browser_proxy.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("internet_shared_css.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_shared_css.m.js" ]
+js_library("cellular_setup_settings_delegate.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "//ui/webui/resources/cr_components/chromeos/cellular_setup:cellular_setup_delegate.m",
+    "//ui/webui/resources/js:cr.m",
   ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("internet_shared_css.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/internet_shared_css.m.js" ]
   extra_deps = [ ":internet_shared_css_module" ]
 }
 
@@ -250,7 +344,20 @@ js_library("internet_subpage.m") {
 js_library("network_proxy_section.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":internet_shared_css.m",
+    "//chrome/browser/resources/settings:router.m",
+    "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chrome/browser/resources/settings/controls:extension_controlled_indicator.m",
+    "//chrome/browser/resources/settings/controls:settings_toggle_button.m",
+    "//chrome/browser/resources/settings/prefs:prefs_behavior.m",
+    "//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",
+    "//ui/webui/resources/cr_components/chromeos/network:cr_policy_network_indicator_mojo.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_proxy.m",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":network_proxy_section_module" ]
 }
@@ -258,7 +365,11 @@ js_library("network_proxy_section.m") {
 js_library("network_summary.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/network_summary.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":network_summary_item.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
   ]
   extra_deps = [ ":network_summary_module" ]
 }
@@ -266,7 +377,16 @@ js_library("network_summary.m") {
 js_library("network_summary_item.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/network_summary_item.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "//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",
+    "//ui/webui/resources/cr_components/chromeos/network:network_icon.m",
+    "//ui/webui/resources/cr_components/chromeos/network:network_siminfo.m",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
+    "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":network_summary_item_module" ]
 }
@@ -274,19 +394,20 @@ js_library("network_summary_item.m") {
 js_library("tether_connection_dialog.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/tether_connection_dialog.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "//chrome/browser/resources/settings/chromeos:os_route.m",
+    "//chromeos/services/network_config/public/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout",
+    "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/network:network_icon.m",
+    "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":tether_connection_dialog_module" ]
 }
 
-js_library("cellular_setup_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/internet_page/cellular_setup_dialog.m.js" ]
-  deps = [
-    # TODO: Fill those in.
-  ]
-  extra_deps = [ ":cellular_setup_dialog_module" ]
-}
-
 import("//tools/polymer/polymer.gni")
 
 group("polymer3_elements") {
@@ -310,18 +431,24 @@ polymer_modulizer("internet_config") {
   js_file = "internet_config.js"
   html_file = "internet_config.html"
   html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites = os_settings_namespace_rewrites
 }
 
 polymer_modulizer("internet_detail_page") {
   js_file = "internet_detail_page.js"
   html_file = "internet_detail_page.html"
   html_type = "dom-module"
+  auto_imports = os_settings_auto_imports + [ "chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.html|InternetPageBrowserProxy,InternetPageBrowserProxyImpl" ]
+  namespace_rewrites = os_settings_namespace_rewrites
 }
 
 polymer_modulizer("internet_known_networks_page") {
   js_file = "internet_known_networks_page.js"
   html_file = "internet_known_networks_page.html"
   html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites = os_settings_namespace_rewrites
 }
 
 polymer_modulizer("internet_page") {
@@ -346,34 +473,47 @@ polymer_modulizer("network_proxy_section") {
   js_file = "network_proxy_section.js"
   html_file = "network_proxy_section.html"
   html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites = os_settings_namespace_rewrites
 }
 
 polymer_modulizer("network_summary") {
   js_file = "network_summary.js"
   html_file = "network_summary.html"
   html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites = os_settings_namespace_rewrites
 }
 
 polymer_modulizer("network_summary_item") {
   js_file = "network_summary_item.js"
   html_file = "network_summary_item.html"
   html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites = os_settings_namespace_rewrites
 }
 
 polymer_modulizer("tether_connection_dialog") {
   js_file = "tether_connection_dialog.js"
   html_file = "tether_connection_dialog.html"
   html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites =
+      [ "cros_network_config.mojom.m.js|cros_network_config.mojom-lite.js" ]
 }
 
 polymer_modulizer("cellular_setup_dialog") {
   js_file = "cellular_setup_dialog.js"
   html_file = "cellular_setup_dialog.html"
   html_type = "dom-module"
+  auto_imports = os_settings_auto_imports
+  namespace_rewrites = os_settings_namespace_rewrites
 }
 
-import("//ui/webui/resources/tools/js_modulizer.gni")
-
 js_modulizer("modulize") {
-  input_files = [ "internet_page_browser_proxy.js" ]
+  input_files = [
+    "internet_page_browser_proxy.js",
+    "cellular_setup_settings_delegate.js",
+  ]
+  namespace_rewrites = os_settings_namespace_rewrites
 }
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 0453afeeb30..2aacc9d130c 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
@@ -12,6 +12,7 @@ js_type_check("closure_compile") {
     ":multidevice_feature_behavior",
     ":multidevice_feature_item",
     ":multidevice_feature_toggle",
+    ":multidevice_notification_access_setup_dialog",
     ":multidevice_page",
     ":multidevice_smartlock_subpage",
     ":multidevice_subpage",
@@ -46,6 +47,7 @@ js_library("multidevice_feature_item") {
     "..:route_origin_behavior",
     "../..:router",
     "../localized_link:localized_link",
+    "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:cr",
   ]
 }
@@ -62,6 +64,8 @@ js_library("multidevice_page") {
     ":multidevice_browser_proxy",
     ":multidevice_constants",
     ":multidevice_feature_behavior",
+    ":multidevice_notification_access_setup_dialog",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "..:os_route",
     "../..:router",
@@ -74,6 +78,13 @@ js_library("multidevice_page") {
   externs_list = [ "$externs_path/pending_polymer.js" ]
 }
 
+js_library("multidevice_notification_access_setup_dialog") {
+  deps = [
+    "//ui/webui/resources/js:i18n_behavior",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
+  ]
+}
+
 js_library("multidevice_radio_button") {
   deps = [
     "//third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior-extracted",
@@ -86,13 +97,15 @@ js_library("multidevice_smartlock_subpage") {
   deps = [
     ":multidevice_constants",
     ":multidevice_feature_behavior",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "..:os_route",
     "..:os_settings_routes",
+    "../..:router",
     "../../prefs:prefs_behavior",
     "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button",
-    "//ui/webui/resources/js:web_ui_listener_behavior",
     "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
 }
 
@@ -101,8 +114,10 @@ js_library("multidevice_subpage") {
     ":multidevice_browser_proxy",
     ":multidevice_constants",
     ":multidevice_feature_behavior",
+    "..:deep_linking_behavior",
     "..:os_route",
     "..:os_settings_routes",
+    "../..:router",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
   ]
   externs_list = [ "$externs_path/networking_private.js" ]
@@ -130,6 +145,7 @@ js_type_check("closure_compile_module") {
     ":multidevice_feature_behavior.m",
     ":multidevice_feature_item.m",
     ":multidevice_feature_toggle.m",
+    ":multidevice_notification_access_setup_dialog.m",
     ":multidevice_page.m",
     ":multidevice_radio_button.m",
     ":multidevice_smartlock_subpage.m",
@@ -140,7 +156,7 @@ js_type_check("closure_compile_module") {
 
 js_library("multidevice_browser_proxy.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.m.js" ]
-  deps = [ 
+  deps = [
     ":multidevice_constants.m",
     "//ui/webui/resources/js:cr.m",
   ]
@@ -157,8 +173,8 @@ js_library("multidevice_feature_behavior.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_behavior.m.js" ]
   deps = [
     ":multidevice_constants.m",
-    "//ui/webui/resources/js:i18n_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":modulize" ]
 }
@@ -173,6 +189,7 @@ js_library("multidevice_feature_item.m") {
     "../..:router.m",
     "../localized_link:localized_link.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
   ]
   extra_deps = [ ":multidevice_feature_item_module" ]
 }
@@ -193,19 +210,30 @@ js_library("multidevice_page.m") {
     ":multidevice_browser_proxy.m",
     ":multidevice_constants.m",
     ":multidevice_feature_behavior.m",
+    ":multidevice_notification_access_setup_dialog.m",
+    "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
     "../..:router.m",
     "../../controls:password_prompt_dialog.m",
     "../../prefs:prefs_behavior.m",
     "../localized_link:localized_link.m",
-    "//ui/webui/resources/js:web_ui_listener_behavior.m",
-    "//ui/webui/resources/js:assert.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
   extra_deps = [ ":multidevice_page_module" ]
 }
 
+js_library("multidevice_notification_access_setup_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_notification_access_setup_dialog.m.js" ]
+  deps = [
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
+  ]
+  extra_deps = [ ":multidevice_notification_access_setup_dialog_module" ]
+}
+
 js_library("multidevice_radio_button.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_radio_button.m.js" ]
   deps = [
@@ -221,13 +249,15 @@ js_library("multidevice_smartlock_subpage.m") {
   deps = [
     ":multidevice_constants.m",
     ":multidevice_feature_behavior.m",
+    "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
     "..:os_settings_routes.m",
+    "../..:router.m",
     "../../prefs:prefs_behavior.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   extra_deps = [ ":multidevice_smartlock_subpage_module" ]
   externs_list = [ "$externs_path/quick_unlock_private.js" ]
@@ -238,14 +268,14 @@ js_library("multidevice_subpage.m") {
   deps = [
     ":multidevice_browser_proxy.m",
     ":multidevice_constants.m",
+    "..:deep_linking_behavior.m",
     "..:os_route.m",
     "..:os_settings_routes.m",
-    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
+    "../..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
   ]
-  extra_deps = [
-    ":multidevice_subpage_module"
-  ]
+  extra_deps = [ ":multidevice_subpage_module" ]
 }
 
 js_library("multidevice_tether_item.m") {
@@ -254,10 +284,10 @@ js_library("multidevice_tether_item.m") {
     ":multidevice_feature_behavior.m",
     "..:os_route.m",
     "..:os_settings_routes.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider.m",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
     "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   extra_deps = [ ":multidevice_tether_item_module" ]
 }
@@ -267,6 +297,7 @@ group("polymer3_elements") {
     ":modulize",
     ":multidevice_feature_item_module",
     ":multidevice_feature_toggle_module",
+    ":multidevice_notification_access_setup_dialog_module",
     ":multidevice_page_module",
     ":multidevice_radio_button_module",
     ":multidevice_smartlock_subpage_module",
@@ -281,7 +312,8 @@ polymer_modulizer("multidevice_feature_item") {
   html_type = "dom-module"
   migrated_imports = os_settings_migrated_imports
   namespace_rewrites = os_settings_namespace_rewrites
-  auto_imports = os_settings_auto_imports
+  auto_imports = os_settings_auto_imports +
+                 [ "ui/webui/resources/html/assert.html|assert" ]
 }
 
 polymer_modulizer("multidevice_feature_toggle") {
@@ -299,10 +331,20 @@ polymer_modulizer("multidevice_page") {
   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/polymer.html|Polymer,html,beforeNextRender",
-    "ui/webui/resources/html/assert.html|assert",
-  ]
+  auto_imports =
+      os_settings_auto_imports + [
+        "ui/webui/resources/html/polymer.html|Polymer,html,beforeNextRender",
+        "ui/webui/resources/html/assert.html|assert",
+      ]
+}
+
+polymer_modulizer("multidevice_notification_access_setup_dialog") {
+  js_file = "multidevice_notification_access_setup_dialog.js"
+  html_file = "multidevice_notification_access_setup_dialog.html"
+  html_type = "dom-module"
+  migrated_imports = os_settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("multidevice_radio_button") {
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
new file mode 100644
index 00000000000..b7abe68fc4c
--- /dev/null
+++ b/chromium/chrome/browser/resources/settings/chromeos/nearby_share_page/BUILD.gn
@@ -0,0 +1,369 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//third_party/closure_compiler/compile_js.gni")
+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") {
+  deps = [
+    ":nearby_account_manager_browser_proxy",
+    ":nearby_share_confirm_page",
+    ":nearby_share_contact_visibility_dialog",
+    ":nearby_share_data_usage_dialog",
+    ":nearby_share_device_name_dialog",
+    ":nearby_share_high_visibility_page",
+    ":nearby_share_receive_dialog",
+    ":nearby_share_receive_manager",
+    ":nearby_share_subpage",
+    ":types",
+  ]
+}
+
+js_library("nearby_share_confirm_page") {
+  deps =
+      [ "//chrome/browser/resources/nearby_share/shared:nearby_page_template" ]
+}
+
+js_library("nearby_account_manager_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr" ]
+}
+
+js_library("nearby_share_contact_visibility_dialog") {
+  deps = [
+    "//chrome/browser/resources/nearby_share/shared:nearby_contact_visibility",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
+  ]
+}
+
+js_library("nearby_share_data_usage_dialog") {
+  deps = [
+    ":types",
+    "../../prefs",
+    "../../prefs:prefs_behavior",
+    "../../prefs:prefs_types",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
+    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button",
+    "//ui/webui/resources/cr_elements/cr_radio_group:cr_radio_group",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+}
+
+js_library("nearby_share_device_name_dialog") {
+  deps = [
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
+    "//ui/webui/resources/cr_elements/cr_input:cr_input",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+}
+
+js_library("nearby_share_high_visibility_page") {
+  deps = [
+    "../localized_link:localized_link",
+    "//chrome/browser/resources/nearby_share/shared:nearby_page_template",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+}
+
+js_library("nearby_share_receive_dialog") {
+  deps = [
+    ":nearby_share_confirm_page",
+    ":nearby_share_high_visibility_page",
+    ":nearby_share_receive_manager",
+    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior",
+    "//chrome/browser/resources/nearby_share/shared:nearby_visibility_page",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
+    "//ui/webui/resources/cr_elements/cr_view_manager:cr_view_manager",
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+}
+
+js_library("nearby_share_receive_manager") {
+  deps = [
+    "//chrome/browser/ui/webui/nearby_share:mojom_js_library_for_compile",
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
+js_library("nearby_share_subpage") {
+  deps = [
+    ":nearby_account_manager_browser_proxy",
+    ":nearby_share_contact_visibility_dialog",
+    ":nearby_share_data_usage_dialog",
+    ":nearby_share_device_name_dialog",
+    ":nearby_share_receive_dialog",
+    ":types",
+    "..:deep_linking_behavior",
+    "..:os_route",
+    "../..:router",
+    "../../prefs",
+    "../../prefs:prefs_behavior",
+    "../../prefs:prefs_types",
+    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior",
+    "//chrome/browser/resources/nearby_share/shared:nearby_visibility_page",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+}
+
+js_library("types") {
+}
+
+group("polymer3_elements") {
+  public_deps = [
+    ":modulize",
+    ":nearby_share_confirm_page_module",
+    ":nearby_share_contact_visibility_dialog_module",
+    ":nearby_share_data_usage_dialog_module",
+    ":nearby_share_device_name_dialog_module",
+    ":nearby_share_high_visibility_page_module",
+    ":nearby_share_receive_dialog_module",
+    ":nearby_share_subpage_module",
+    "../../controls:polymer3_elements",
+    "../../prefs:polymer3_elements",
+    "//chrome/browser/ui/webui/nearby_share:mojom_js",
+  ]
+}
+
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+
+  # TODO(crbug.com/1121865): browser_resolver_prefix_replacements allows path
+  # from ../../shared/* to resolve to ../../../nearby_share/shared/* for closure
+  # purposes.
+  closure_flags = default_closure_args + [ "browser_resolver_prefix_replacements=\"../../shared/=../../../nearby_share/shared/\"" ]
+  deps = [
+    ":nearby_share_confirm_page.m",
+    ":nearby_share_contact_visibility_dialog.m",
+    ":nearby_share_data_usage_dialog.m",
+    ":nearby_share_device_name_dialog.m",
+    ":nearby_share_high_visibility_page.m",
+    ":nearby_share_receive_dialog.m",
+    ":nearby_share_receive_manager.m",
+    ":nearby_share_subpage.m",
+  ]
+}
+
+js_library("nearby_share_confirm_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_confirm_page.m.js" ]
+  deps = [
+    "//chrome/browser/resources/nearby_share/shared:nearby_page_template.m",
+  ]
+  extra_deps = [ ":nearby_share_confirm_page_module" ]
+}
+
+js_library("nearby_share_contact_visibility_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.m.js" ]
+  deps = [
+    "//chrome/browser/resources/nearby_share/shared:nearby_contact_visibility.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+  ]
+  extra_deps = [ ":nearby_share_contact_visibility_dialog_module" ]
+}
+
+js_library("nearby_share_data_usage_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_data_usage_dialog.m.js" ]
+  deps = [
+    ":types.m",
+    "../../prefs:prefs.m",
+    "../../prefs:prefs_behavior.m",
+    "../../prefs:prefs_types.m",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
+    "//ui/webui/resources/cr_elements/cr_radio_group:cr_radio_group.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":nearby_share_data_usage_dialog_module" ]
+}
+
+js_library("nearby_share_device_name_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_device_name_dialog.m.js" ]
+  deps = [
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":nearby_share_device_name_dialog_module" ]
+}
+
+js_library("nearby_share_high_visibility_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_high_visibility_page.m.js" ]
+  deps = [
+    "../localized_link:localized_link.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_page_template.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":nearby_share_high_visibility_page_module" ]
+}
+
+js_library("nearby_share_receive_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_dialog.m.js" ]
+  deps = [
+    ":nearby_share_confirm_page.m",
+    ":nearby_share_high_visibility_page.m",
+    ":nearby_share_receive_manager.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_visibility_page.m",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/cr_elements/cr_view_manager:cr_view_manager.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":nearby_share_receive_dialog_module" ]
+}
+
+js_library("nearby_share_receive_manager.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_manager.m.js" ]
+  deps = [
+    ":nearby_share_confirm_page.m",
+    ":nearby_share_high_visibility_page.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
+    "//chrome/browser/ui/webui/nearby_share:mojom_js_library_for_compile",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/cr_elements/cr_view_manager:cr_view_manager.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("nearby_share_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.m.js" ]
+  deps = [
+    ":nearby_account_manager_browser_proxy.m",
+    ":nearby_share_contact_visibility_dialog.m",
+    ":nearby_share_data_usage_dialog.m",
+    ":nearby_share_device_name_dialog.m",
+    ":nearby_share_receive_dialog.m",
+    ":types.m",
+    "..:deep_linking_behavior.m",
+    "..:os_route.m",
+    "../..:router.m",
+    "../../prefs:prefs.m",
+    "../../prefs:prefs_behavior.m",
+    "../../prefs:prefs_types.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
+    "//chrome/browser/resources/nearby_share/shared:nearby_visibility_page.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":nearby_share_subpage_module" ]
+}
+
+js_library("nearby_account_manager_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_account_manager_browser_proxy.m.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("types.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/types.m.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_modulizer("modulize") {
+  input_files = [
+    "nearby_account_manager_browser_proxy.js",
+    "nearby_share_receive_manager.js",
+    "types.js",
+  ]
+  namespace_rewrites = os_settings_namespace_rewrites
+}
+
+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_share_settings.html|getNearbyShareSettings",
+  "chrome/browser/resources/settings/shared/nearby_share_settings_behavior.html|NearbyShareSettingsBehavior,NearbySettings",
+]
+
+polymer_modulizer("nearby_share_confirm_page") {
+  js_file = "nearby_share_confirm_page.js"
+  html_file = "nearby_share_confirm_page.html"
+  html_type = "dom-module"
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
+}
+
+polymer_modulizer("nearby_share_contact_visibility_dialog") {
+  js_file = "nearby_share_contact_visibility_dialog.js"
+  html_file = "nearby_share_contact_visibility_dialog.html"
+  html_type = "dom-module"
+  namespace_rewrites =
+      os_settings_namespace_rewrites + nearby_shared_namespace_rewrites
+  auto_imports =
+      os_settings_auto_imports + nearby_shared_auto_imports_closure_fix
+}
+
+polymer_modulizer("nearby_share_data_usage_dialog") {
+  js_file = "nearby_share_data_usage_dialog.js"
+  html_file = "nearby_share_data_usage_dialog.html"
+  html_type = "dom-module"
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
+}
+
+polymer_modulizer("nearby_share_device_name_dialog") {
+  js_file = "nearby_share_device_name_dialog.js"
+  html_file = "nearby_share_device_name_dialog.html"
+  html_type = "dom-module"
+  namespace_rewrites =
+      os_settings_namespace_rewrites + nearby_shared_namespace_rewrites
+  auto_imports =
+      os_settings_auto_imports + nearby_shared_auto_imports_closure_fix
+}
+
+polymer_modulizer("nearby_share_high_visibility_page") {
+  js_file = "nearby_share_high_visibility_page.js"
+  html_file = "nearby_share_high_visibility_page.html"
+  html_type = "dom-module"
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
+}
+
+polymer_modulizer("nearby_share_receive_dialog") {
+  js_file = "nearby_share_receive_dialog.js"
+  html_file = "nearby_share_receive_dialog.html"
+  html_type = "dom-module"
+  namespace_rewrites =
+      os_settings_namespace_rewrites + nearby_shared_namespace_rewrites
+  auto_imports =
+      os_settings_auto_imports + nearby_shared_auto_imports_closure_fix
+}
+
+polymer_modulizer("nearby_share_subpage") {
+  js_file = "nearby_share_subpage.js"
+  html_file = "nearby_share_subpage.html"
+  html_type = "dom-module"
+  namespace_rewrites =
+      os_settings_namespace_rewrites + nearby_shared_namespace_rewrites
+  auto_imports =
+      os_settings_auto_imports + nearby_shared_auto_imports_closure_fix +
+      [ "chrome/browser/resources/settings/chromeos/os_route.html|routes" ]
+}
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 1f156d1f628..b24808c6b39 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
@@ -8,17 +8,27 @@ js_type_check("closure_compile") {
   deps = [
     ":externs",
     ":manage_a11y_page",
+    ":manage_a11y_page_browser_proxy",
     ":os_a11y_page",
+    ":os_a11y_page_browser_proxy",
     ":switch_access_constants",
     ":switch_access_subpage",
     ":tts_subpage",
+    ":tts_subpage_browser_proxy",
     "../../a11y_page:captions_subpage",
     "../../appearance_page:fonts_browser_proxy",
   ]
 }
 
+js_library("os_a11y_page_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+}
+
 js_library("os_a11y_page") {
   deps = [
+    ":os_a11y_page_browser_proxy",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../../:router",
     "../../settings_page:settings_animated_pages",
@@ -27,8 +37,15 @@ js_library("os_a11y_page") {
   ]
 }
 
+js_library("manage_a11y_page_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+}
+
 js_library("manage_a11y_page") {
   deps = [
+    ":manage_a11y_page_browser_proxy",
+    "..:deep_linking_behavior",
     "..:os_route",
     "..:route_origin_behavior",
     "../..:router",
@@ -45,6 +62,8 @@ js_library("switch_access_constants") {
 js_library("switch_access_subpage") {
   deps = [
     ":switch_access_constants",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "../..:router",
     "../../prefs:prefs_behavior",
     "//ui/webui/resources/js:i18n_behavior",
@@ -54,9 +73,17 @@ js_library("switch_access_subpage") {
   externs_list = [ "$externs_path/settings_private.js" ]
 }
 
+js_library("tts_subpage_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+}
+
 js_library("tts_subpage") {
   deps = [
     ":externs",
+    ":tts_subpage_browser_proxy",
+    "..:deep_linking_behavior",
+    "..:os_route",
     "../..:router",
     "../../controls:settings_slider",
     "../../languages_page:languages_browser_proxy",
@@ -71,16 +98,21 @@ js_library("externs") {
 }
 
 # TODO: Uncomment as the Polymer3 migration makes progress.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [
-#    ":externs.m",
-#    ":manage_a11y_page.m",
-#    ":os_a11y_page.m",
-#    ":switch_access_subpage.m",
-#    ":tts_subpage.m"
-#  ]
-#}
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [
+    #    ":externs.m",
+    #    ":manage_a11y_page.m",
+    ":manage_a11y_page_browser_proxy.m",
+
+    #    ":os_a11y_page.m",
+    ":os_a11y_page_browser_proxy.m",
+
+    #    ":switch_access_subpage.m",
+    #    ":tts_subpage.m"
+    ":tts_subpage_browser_proxy.m",
+  ]
+}
 
 js_library("externs.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/externs.m.js" ]
@@ -98,6 +130,13 @@ js_library("manage_a11y_page.m") {
   extra_deps = [ ":manage_a11y_page_module" ]
 }
 
+js_library("manage_a11y_page_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page_browser_proxy.m.js" ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
 js_library("os_a11y_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.m.js" ]
   deps = [
@@ -106,6 +145,13 @@ js_library("os_a11y_page.m") {
   extra_deps = [ ":os_a11y_page_module" ]
 }
 
+js_library("os_a11y_page_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page_browser_proxy.m.js" ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
 js_library("switch_access_subpage.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage.m.js" ]
   deps = [
@@ -122,6 +168,13 @@ js_library("tts_subpage.m") {
   extra_deps = [ ":tts_subpage_module" ]
 }
 
+js_library("tts_subpage_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage_browser_proxy.m.js" ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
 import("//tools/polymer/polymer.gni")
 
 group("polymer3_elements") {
@@ -161,5 +214,10 @@ polymer_modulizer("tts_subpage") {
 import("//ui/webui/resources/tools/js_modulizer.gni")
 
 js_modulizer("modulize") {
-  input_files = [ "externs.js" ]
+  input_files = [
+    "externs.js",
+    "manage_a11y_page_browser_proxy.js",
+    "os_a11y_page_browser_proxy.js",
+    "tts_subpage_browser_proxy.js",
+  ]
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_about_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_about_page/BUILD.gn
index e34ecfe812a..0f4336384bd 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
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("../os_settings.gni")
 
 js_type_check("closure_compile") {
   deps = [
@@ -14,14 +15,15 @@ js_type_check("closure_compile") {
 
 js_library("os_about_page") {
   deps = [
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "..:os_route",
     "../..:lifetime_browser_proxy",
     "../..:router",
     "../../about_page:about_page_browser_proxy",
-    "../../settings_page:main_page_behavior",
     "../../settings_page:settings_animated_pages",
     "../localized_link:localized_link",
+    "../os_settings_page:main_page_behavior",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:parse_html_subset",
@@ -31,6 +33,9 @@ js_library("os_about_page") {
 
 js_library("detailed_build_info") {
   deps = [
+    "..:deep_linking_behavior",
+    "..:os_route",
+    "../..:router",
     "../../about_page:about_page_browser_proxy",
     "../localized_link:localized_link",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior",
@@ -47,21 +52,23 @@ js_library("channel_switcher_dialog") {
   ]
 }
 
-# TODO: Uncomment as the Polymer3 migration makes progress.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [
-#    ":channel_switcher_dialog.m",
-#    ":detailed_build_info.m",
-#    ":os_about_page.m",
-#    ":update_warning_dialog.m"
-#  ]
-#}
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [
+    ":channel_switcher_dialog.m",
+    ":detailed_build_info.m",
+    ":os_about_page.m",
+    ":update_warning_dialog.m",
+  ]
+}
 
 js_library("channel_switcher_dialog.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "../../about_page:about_page_browser_proxy.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:load_time_data.m",
   ]
   extra_deps = [ ":channel_switcher_dialog_module" ]
 }
@@ -69,7 +76,13 @@ js_library("channel_switcher_dialog.m") {
 js_library("detailed_build_info.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "..:deep_linking_behavior.m",
+    "..:os_route.m",
+    "../..:router.m",
+    "../../about_page:about_page_browser_proxy.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":detailed_build_info_module" ]
 }
@@ -77,7 +90,18 @@ js_library("detailed_build_info.m") {
 js_library("os_about_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "..:deep_linking_behavior.m",
+    "..:os_route.m",
+    "../..:i18n_setup",
+    "../..:lifetime_browser_proxy.m",
+    "../..:router.m",
+    "../../about_page:about_page_browser_proxy.m",
+    "../os_settings_page:main_page_behavior.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js:parse_html_subset.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
   extra_deps = [ ":os_about_page_module" ]
 }
@@ -85,7 +109,9 @@ js_library("os_about_page.m") {
 js_library("update_warning_dialog.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_about_page/update_warning_dialog.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "../../about_page:about_page_browser_proxy.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:i18n_behavior.m",
   ]
   extra_deps = [ ":update_warning_dialog_module" ]
 }
@@ -105,22 +131,34 @@ polymer_modulizer("channel_switcher_dialog") {
   js_file = "channel_switcher_dialog.js"
   html_file = "channel_switcher_dialog.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("detailed_build_info") {
   js_file = "detailed_build_info.js"
   html_file = "detailed_build_info.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("os_about_page") {
   js_file = "os_about_page.js"
   html_file = "os_about_page.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("update_warning_dialog") {
   js_file = "update_warning_dialog.js"
   html_file = "update_warning_dialog.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
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 f635bdada2b..c1ce423723a 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
@@ -19,6 +19,7 @@ js_library("android_apps_browser_proxy") {
 js_library("android_apps_subpage") {
   deps = [
     ":android_apps_browser_proxy",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "../../prefs:prefs_behavior",
@@ -32,6 +33,7 @@ js_library("os_apps_page") {
   deps = [
     ":android_apps_browser_proxy",
     ":android_apps_subpage",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../../:router",
     "../../prefs:prefs_behavior",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/BUILD.gn
index a3971b9ff9b..0127113b035 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/BUILD.gn
@@ -9,6 +9,7 @@ js_type_check("closure_compile") {
     ":plugin_vm_browser_proxy",
     ":plugin_vm_detail_view",
     ":plugin_vm_shared_paths",
+    ":plugin_vm_shared_usb_devices",
   ]
 }
 
@@ -32,6 +33,15 @@ js_library("plugin_vm_shared_paths") {
   deps = [
     ":plugin_vm_browser_proxy",
     "../../..:metrics_recorder",
+    "//ui/webui/resources/js:i18n_behavior",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
+  ]
+}
+
+js_library("plugin_vm_shared_usb_devices") {
+  deps = [
+    ":plugin_vm_browser_proxy",
+    "../../..:metrics_recorder",
   ]
 }
 
@@ -46,6 +56,7 @@ js_library("plugin_vm_permission_dialog") {
 #    ":plugin_vm_browser_proxy.m",
 #    ":plugin_vm_detail_view.m",
 #    ":plugin_vm_shared_paths.m",
+#    ":plugin_vm_shared_usb_devices.m",
 #  ]
 #}
 
@@ -73,6 +84,14 @@ js_library("plugin_vm_shared_paths.m") {
   extra_deps = [ ":plugin_vm_shared_paths_module" ]
 }
 
+js_library("plugin_vm_shared_usb_devices.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_shared_usb_devices.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":plugin_vm_shared_usb_devices_module" ]
+}
+
 import("//tools/polymer/polymer.gni")
 
 group("polymer3_elements") {
@@ -81,6 +100,7 @@ group("polymer3_elements") {
     ":plugin_vm_detail_view_module",
     ":plugin_vm_permission_dialog_module",
     ":plugin_vm_shared_paths_module",
+    ":plugin_vm_shared_usb_devices_module",
   ]
 }
 
@@ -102,6 +122,12 @@ polymer_modulizer("plugin_vm_shared_paths") {
   html_type = "dom-module"
 }
 
+polymer_modulizer("plugin_vm_shared_usb_devices") {
+  js_file = "plugin_vm_shared_usb_devices.js"
+  html_file = "plugin_vm_shared_usb_devices.html"
+  html_type = "dom-module"
+}
+
 import("//ui/webui/resources/tools/js_modulizer.gni")
 
 js_modulizer("modulize") {
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 a4df43cc0fd..a954f6692aa 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
@@ -23,6 +23,7 @@ js_library("smb_shares_page") {
 
 js_library("os_files_page") {
   deps = [
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
   ]
@@ -39,6 +40,7 @@ js_type_check("closure_compile_module") {
 js_library("os_files_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.m.js" ]
   deps = [
+    "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:router.m",
   ]
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 24422d5eed7..c21c96966b0 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
@@ -8,12 +8,15 @@ import("../os_settings.gni")
 
 js_type_check("closure_compile") {
   deps = [
+    ":add_input_methods_dialog",
+    ":change_device_language_dialog",
     ":input_method_options_page",
     ":input_method_util",
     ":input_page",
     ":languages_metrics_proxy",
     ":manage_input_methods_page",
     ":os_add_languages_dialog",
+    ":os_edit_dictionary_page",
     ":os_languages_page",
     ":os_languages_page_v2",
     ":os_languages_section",
@@ -24,6 +27,19 @@ js_type_check("closure_compile") {
   ]
 }
 
+js_library("add_input_methods_dialog") {
+  deps = [ "//ui/webui/resources/cr_elements:cr_scrollable_behavior" ]
+}
+
+js_library("change_device_language_dialog") {
+  deps = [
+    "../..:lifetime_browser_proxy",
+    "../../languages_page:languages",
+    "//ui/webui/resources/cr_elements:cr_scrollable_behavior",
+    "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field",
+  ]
+}
+
 js_library("input_method_options_page") {
   deps = [
     ":input_method_util",
@@ -40,8 +56,10 @@ js_library("input_method_util") {
 
 js_library("input_page") {
   deps = [
+    ":add_input_methods_dialog",
     ":input_method_util",
     ":languages_metrics_proxy",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "//ui/webui/resources/js:i18n_behavior",
@@ -62,6 +80,16 @@ js_library("manage_input_methods_page") {
   externs_list = [ "$externs_path/language_settings_private.js" ]
 }
 
+js_library("os_edit_dictionary_page") {
+  deps = [
+    "..:os_route",
+    "../..:global_scroll_target_behavior",
+    "../../languages_page:languages_browser_proxy",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button",
+    "//ui/webui/resources/cr_elements/cr_input:cr_input",
+  ]
+}
+
 js_library("os_languages_section") {
   deps = [
     ":input_method_options_page",
@@ -84,6 +112,7 @@ js_library("os_languages_page") {
   deps = [
     ":input_method_util",
     ":languages_metrics_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "..:os_route",
     "../..:lifetime_browser_proxy",
@@ -104,6 +133,7 @@ js_library("os_languages_page") {
 js_library("os_languages_page_v2") {
   deps = [
     ":languages_metrics_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "..:os_route",
     "../..:router",
@@ -124,13 +154,16 @@ js_library("os_add_languages_dialog") {
   deps = [
     "../../languages_page:languages",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field",
-    "//ui/webui/resources/js:find_shortcut_behavior",
   ]
 }
 
 js_library("smart_inputs_page") {
   deps = [
+    "..:deep_linking_behavior",
+    "..:os_route",
+    "../..:router",
     "../../prefs:prefs_behavior",
     "//ui/webui/resources/js:load_time_data",
   ]
@@ -139,12 +172,15 @@ js_library("smart_inputs_page") {
 js_type_check("closure_compile_module") {
   is_polymer3 = true
   deps = [
+    ":add_input_methods_dialog.m",
+    ":change_device_language_dialog.m",
     ":input_method_options_page.m",
     ":input_method_util.m",
     ":input_page.m",
     ":languages_metrics_proxy.m",
     ":manage_input_methods_page.m",
     ":os_add_languages_dialog.m",
+    ":os_edit_dictionary_page.m",
     ":os_languages_page.m",
     ":os_languages_page_v2.m",
     ":os_languages_section.m",
@@ -152,6 +188,24 @@ js_type_check("closure_compile_module") {
   ]
 }
 
+js_library("add_input_methods_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/add_input_methods_dialog.m.js" ]
+  deps = [ "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m" ]
+  extra_deps = [ ":add_input_methods_dialog_module" ]
+}
+
+js_library("change_device_language_dialog.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/change_device_language_dialog.m.js" ]
+  deps = [
+    "../..:lifetime_browser_proxy.m",
+    "../../languages_page:languages.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
+    "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
+  ]
+  extra_deps = [ ":change_device_language_dialog_module" ]
+}
+
 js_library("input_method_util.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.m.js" ]
   deps = [ "//ui/webui/resources/js:cr.m" ]
@@ -171,13 +225,18 @@ js_library("input_method_options_page.m") {
 js_library("input_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/input_page.m.js" ]
   deps = [
+    ":add_input_methods_dialog.m",
     ":input_method_util.m",
     ":languages_metrics_proxy.m",
+    ":os_edit_dictionary_page.m",
+    "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:i18n_setup",
     "../..:router.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 = [ ":input_page_module" ]
 }
@@ -201,17 +260,32 @@ js_library("os_add_languages_dialog.m") {
     "../../languages_page:languages.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
   ]
   extra_deps = [ ":os_add_languages_dialog_module" ]
 }
 
+js_library("os_edit_dictionary_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/os_edit_dictionary_page.m.js" ]
+  deps = [
+    "..:os_route.m",
+    "../..:global_scroll_target_behavior.m",
+    "../../languages_page:languages_browser_proxy.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
+  ]
+  extra_deps = [ ":os_edit_dictionary_page_module" ]
+}
+
 js_library("os_languages_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page.m.js" ]
   deps = [
     ":input_method_util.m",
     ":languages_metrics_proxy.m",
+    "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
     "../..:i18n_setup",
@@ -234,6 +308,7 @@ js_library("os_languages_page_v2.m") {
   deps = [
     ":input_method_util.m",
     ":languages_metrics_proxy.m",
+    "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
     "../..:i18n_setup",
@@ -272,6 +347,9 @@ js_library("os_languages_section.m") {
 js_library("smart_inputs_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.m.js" ]
   deps = [
+    "..:deep_linking_behavior.m",
+    "..:os_route.m",
+    "../..:router.m",
     "../../prefs:prefs_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
@@ -282,20 +360,43 @@ import("//tools/polymer/polymer.gni")
 
 group("polymer3_elements") {
   public_deps = [
+    ":add_input_methods_dialog_module",
+    ":change_device_language_dialog_module",
     ":input_method_options_page_module",
     ":input_page_module",
     ":manage_input_methods_page_module",
     ":modulize",
     ":os_add_languages_dialog_module",
+    ":os_edit_dictionary_page_module",
     ":os_languages_page_module",
     ":os_languages_page_v2_module",
     ":os_languages_section_module",
+    ":shared_style_module",
+    ":shared_vars_module",
     ":smart_inputs_page_module",
     "../../languages_page:languages_module",
     "../../languages_page:modulize",
   ]
 }
 
+polymer_modulizer("add_input_methods_dialog") {
+  js_file = "add_input_methods_dialog.js"
+  html_file = "add_input_methods_dialog.html"
+  html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
+}
+
+polymer_modulizer("change_device_language_dialog") {
+  js_file = "change_device_language_dialog.js"
+  html_file = "change_device_language_dialog.html"
+  html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
+}
+
 polymer_modulizer("manage_input_methods_page") {
   js_file = "manage_input_methods_page.js"
   html_file = "manage_input_methods_page.html"
@@ -314,6 +415,15 @@ polymer_modulizer("os_add_languages_dialog") {
   auto_imports = os_settings_auto_imports
 }
 
+polymer_modulizer("os_edit_dictionary_page") {
+  js_file = "os_edit_dictionary_page.js"
+  html_file = "os_edit_dictionary_page.html"
+  html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
+}
+
 polymer_modulizer("os_languages_page") {
   js_file = "os_languages_page.js"
   html_file = "os_languages_page.html"
@@ -359,6 +469,18 @@ polymer_modulizer("input_page") {
   auto_imports = os_settings_auto_imports
 }
 
+polymer_modulizer("shared_style") {
+  js_file = "shared_style.m.js"
+  html_file = "shared_style.html"
+  html_type = "style-module"
+}
+
+polymer_modulizer("shared_vars") {
+  js_file = "shared_vars.m.js"
+  html_file = "shared_vars.html"
+  html_type = "custom-style"
+}
+
 polymer_modulizer("smart_inputs_page") {
   js_file = "smart_inputs_page.js"
   html_file = "smart_inputs_page.html"
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_people_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_people_page/BUILD.gn
index bd257f78b22..db665d94f6b 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
@@ -33,6 +33,8 @@ js_type_check("closure_compile") {
 
 js_library("account_manager") {
   deps = [
+    "..:deep_linking_behavior",
+    "..:os_route",
     "../..:router",
     "../../people_page:account_manager_browser_proxy",
     "../localized_link:localized_link",
@@ -50,6 +52,7 @@ js_library("fingerprint_browser_proxy") {
 js_library("fingerprint_list") {
   deps = [
     ":fingerprint_browser_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "..:os_route",
     "../..:router",
@@ -66,7 +69,9 @@ js_library("fingerprint_list") {
 js_library("kerberos_accounts") {
   deps = [
     ":kerberos_accounts_browser_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
+    "..:os_route",
     "../..:router",
     "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:i18n_behavior",
@@ -96,6 +101,7 @@ js_library("lock_screen") {
     ":fingerprint_browser_proxy",
     ":lock_screen_password_prompt_dialog",
     ":lock_state_behavior",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "../../controls:settings_dropdown_menu",
@@ -133,14 +139,17 @@ js_library("os_people_page") {
     ":lock_screen",
     ":lock_state_behavior",
     ":os_sync_controls",
+    "..:deep_linking_behavior",
     "..:os_page_visibility",
     "..:os_route",
     "../..:router",
     "../../settings_page:settings_animated_pages",
     "../localized_link:localized_link",
+    "../parental_controls_page:parental_controls_page",
     "//chrome/browser/resources/settings/people_page:profile_info_browser_proxy",
     "//chrome/browser/resources/settings/people_page:signout_dialog",
     "//chrome/browser/resources/settings/people_page:sync_browser_proxy",
+    "//chrome/browser/resources/settings/people_page:sync_page",
     "//ui/webui/resources/cr_components/chromeos/quick_unlock:lock_screen_constants",
     "//ui/webui/resources/cr_elements/chromeos/cr_picture:png",
     "//ui/webui/resources/js:assert",
@@ -162,7 +171,9 @@ js_library("os_sync_browser_proxy") {
 js_library("os_sync_controls") {
   deps = [
     ":os_sync_browser_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
+    "..:os_route",
     "../../:router",
     "../localized_link:localized_link",
     "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle",
@@ -213,6 +224,9 @@ js_library("users_page") {
   deps = [
     ":user_list",
     ":users_add_user_dialog",
+    "..:deep_linking_behavior",
+    "..:os_route",
+    "../..:router",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js/cr/ui:focus_without_ink",
   ]
@@ -244,12 +258,14 @@ js_type_check("closure_compile_module") {
 js_library("account_manager.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/account_manager.m.js" ]
   deps = [
+    "..:deep_linking_behavior.m",
+    "..:os_route.m",
     "../..:router.m",
     "../../people_page:account_manager_browser_proxy.m",
     "../localized_link:localized_link.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
+    "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:icon.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
@@ -270,6 +286,7 @@ js_library("fingerprint_list.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/fingerprint_list.m.js" ]
   deps = [
     ":fingerprint_browser_proxy.m",
+    "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
     "../..:router.m",
@@ -289,7 +306,9 @@ js_library("kerberos_accounts.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/kerberos_accounts.m.js" ]
   deps = [
     ":kerberos_accounts_browser_proxy.m",
+    "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
+    "..:os_route.m",
     "../..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:cr.m",
@@ -331,6 +350,7 @@ js_library("lock_screen.m") {
     ":fingerprint_browser_proxy.m",
     ":lock_screen_password_prompt_dialog.m",
     ":lock_state_behavior.m",
+    "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:router.m",
     "../../controls:settings_dropdown_menu.m",
@@ -377,14 +397,17 @@ js_library("os_people_page.m") {
     ":lock_screen.m",
     ":lock_state_behavior.m",
     ":os_sync_controls.m",
+    "..:deep_linking_behavior.m",
     "..:os_page_visibility.m",
     "..:os_route.m",
     "../..:router.m",
     "../../settings_page:settings_animated_pages.m",
     "../localized_link:localized_link.m",
+    "../parental_controls_page:parental_controls_page.m",
     "//chrome/browser/resources/settings/people_page:profile_info_browser_proxy.m",
     "//chrome/browser/resources/settings/people_page:signout_dialog.m",
     "//chrome/browser/resources/settings/people_page:sync_browser_proxy.m",
+    "//chrome/browser/resources/settings/people_page:sync_page.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/cr_elements/chromeos/cr_picture:png.m",
@@ -412,7 +435,9 @@ js_library("os_sync_controls.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_people_page/os_sync_controls.m.js" ]
   deps = [
     ":os_sync_browser_proxy.m",
+    "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
+    "..:os_route.m",
     "../../:router.m",
     "../localized_link:localized_link.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -481,6 +506,9 @@ js_library("users_page.m") {
   deps = [
     ":user_list.m",
     ":users_add_user_dialog.m",
+    "..:deep_linking_behavior.m",
+    "..:os_route.m",
+    "../..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
@@ -507,9 +535,9 @@ group("polymer3_elements") {
     ":user_list_module",
     ":users_add_user_dialog_module",
     ":users_page_module",
+    "../../:icons_module",
     "../../people_page:polymer3_elements",
     "../../privacy_page:polymer3_elements",
-    "../../:icons_module",
   ]
 }
 
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 cefc7b8cabf..dffba934aeb 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
@@ -108,6 +108,7 @@ js_library("cups_printers") {
     ":cups_printers_browser_proxy",
     ":cups_printers_entry_manager",
     ":cups_saved_printers",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "../localized_link:localized_link",
@@ -165,6 +166,7 @@ js_library("cups_saved_printers") {
 
 js_library("os_printing_page") {
   deps = [
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "../../settings_page:settings_animated_pages",
@@ -285,6 +287,7 @@ js_library("cups_printers.m") {
     ":cups_printer_types.m",
     ":cups_printers_browser_proxy.m",
     ":cups_settings_add_printer_dialog.m",
+    "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:router.m",
     "//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior.m",
@@ -342,6 +345,7 @@ js_library("os_printing_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_printing_page/os_printing_page.m.js" ]
   deps = [
     ":cups_printers_browser_proxy.m",
+    "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_privacy_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_privacy_page/BUILD.gn
index 9cfadf7b298..9c464695899 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
@@ -11,6 +11,9 @@ js_type_check("closure_compile") {
 
 js_library("os_privacy_page") {
   deps = [
+    "..:deep_linking_behavior",
+    "..:os_route",
+    "../..:router",
     "//chrome/browser/resources/settings/controls:settings_toggle_button",
     "//ui/webui/resources/js:load_time_data",
   ]
@@ -24,6 +27,9 @@ js_type_check("closure_compile_module") {
 js_library("os_privacy_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_privacy_page/os_privacy_page.m.js" ]
   deps = [
+    "..:deep_linking_behavior.m",
+    "..:os_route.m",
+    "../..:router.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:load_time_data.m",
   ]
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_search_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_search_page/BUILD.gn
index c48a50c3619..bbeb82c7263 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
@@ -10,6 +10,7 @@ js_type_check("closure_compile") {
 
 js_library("os_search_page") {
   deps = [
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "../../prefs",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
index 8fe43f9c02c..63d59a07f51 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
@@ -11,9 +11,20 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                  cr_components_chromeos_namespace_rewrites +
                                  cr_elements_chromeos_namespace_rewrites + [
                                    "// #polymer3 |",
+                                   "nearby_share.Account|Account",
+                                   "nearby_share.NearbyAccountManagerBrowserProxy|NearbyAccountManagerBrowserProxy",
+                                   "nearby_share.NearbyAccountManagerBrowserProxyImpl|NearbyAccountManagerBrowserProxyImpl",
+                                   "nearby_share.NearbyShareSettingsBehavior|NearbyShareSettingsBehavior",
+                                   "nearby_share.setReceiveManagerForTesting|setReceiveManagerForTesting",
+                                   "nearby_share.getReceiveManager|getReceiveManager",
+                                   "nearby_share.observeReceiveManager|observeReceiveManager",
+                                   "nearby_share.setContactManagerForTesting|setContactManagerForTesting",
+                                   "nearby_share.getContactManager|getContactManager",
+                                   "nearby_share.observeContactManager|observeContactManager",
                                    "parental_controls.ParentalControlsBrowserProxy|ParentalControlsBrowserProxy",
                                    "settings.AccountManagerBrowserProxy|AccountManagerBrowserProxy",
                                    "settings.AmbientModeBrowserProxy|AmbientModeBrowserProxy",
+                                   "settings.CellularSetupSettingsDelegate|CellularSetupSettingsDelegate",
                                    "settings.ChangePictureBrowserProxy|ChangePictureBrowserProxy",
                                    "settings.DefaultImage|DefaultImage",
                                    "settings.FingerprintAttempt|FingerprintAttempt",
@@ -22,6 +33,7 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                    "settings.FingerprintResultType|FingerprintResultType",
                                    "settings.FingerprintScan|FingerprintScan",
                                    "settings.FingerprintSetupStep|FingerprintSetupStep",
+                                   "settings.InternetPageBrowserProxy|InternetPageBrowserProxy",
                                    "settings.input_method_util.generateOptions|generateOptions",
                                    "settings.input_method_util.getFirstPartyInputMethodEngineId|getFirstPartyInputMethodEngineId",
                                    "settings.input_method_util.getOptionLabelName|getOptionLabelName",
@@ -39,6 +51,7 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                    "settings.KerberosConfigErrorCode|KerberosConfigErrorCode",
                                    "settings.KerberosErrorType|KerberosErrorType",
                                    "settings.kMenuCloseDelay|kMenuCloseDelay",
+                                   "settings.LanguagesBrowserProxy|LanguagesBrowserProxy",
                                    "settings.LanguagesMetricsProxy|LanguagesMetricsProxy",
                                    "settings.LanguagesPageInteraction|LanguagesPageInteraction",
                                    "settings.MultiDeviceBrowserProxy|MultiDeviceBrowserProxy",
@@ -74,6 +87,9 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
                                    "settings.printing.isNameAndAddressValid|isNameAndAddressValid",
                                    "settings.printing.isPPDInfoValid|isPPDInfoValid",
                                    "settings.printing.getPrintServerErrorText|getPrintServerErrorText",
+                                   "settings.AboutPageBrowserProxyImpl|AboutPageBrowserProxyImpl",
+                                   "settings.browserChannelToI18nId|browserChannelToI18nId",
+                                   "settings.isTargetChannelMoreStable|isTargetChannelMoreStable",
                                  ]
 
 os_settings_auto_imports = settings_auto_imports +
@@ -81,12 +97,16 @@ os_settings_auto_imports = settings_auto_imports +
                            cr_elements_chromeos_auto_imports + [
                              "chrome/browser/resources/settings/chromeos/ambient_mode_page/ambient_mode_browser_proxy.html|AmbientModeBrowserProxy,AmbientModeBrowserProxyImpl",
                              "chrome/browser/resources/settings/chromeos/ambient_mode_page/constants.html|AmbientModeTopicSource,AmbientModeTemperatureUnit,AmbientModeAlbum,AmbientModeSettings,TopicSourceItem",
+                             "chrome/browser/resources/settings/chromeos/internet_page/cellular_setup_settings_delegate.html|CellularSetupSettingsDelegate",
                              "chrome/browser/resources/settings/chromeos/deep_linking_behavior.html|DeepLinkingBehavior",
                              "chrome/browser/resources/settings/chromeos/metrics_recorder.html|recordSettingChange",
                              "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.html|MultiDeviceBrowserProxy,MultiDeviceBrowserProxyImpl",
                              "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_constants.html|MultiDeviceSettingsMode,MultiDeviceFeature,MultiDeviceFeatureState,MultiDevicePageContentData,SmartLockSignInEnabledState",
                              "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_behavior.html|MultiDeviceFeatureBehavior",
                              "chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.html|MultiDeviceBrowserProxy,MultiDeviceBrowserProxyImpl",
+                             "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_account_manager_browser_proxy.html|NearbyAccountManagerBrowserProxy,NearbyAccountManagerBrowserProxyImpl",
+                             "chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_manager.html|setReceiveManagerForTesting,getReceiveManager,observeReceiveManager",
+                             "chrome/browser/resources/settings/chromeos/nearby_share_page/types.html|NearbyShareDataUsage,dataUsageStringToEnum",
                              "chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.html|generateOptions,getFirstPartyInputMethodEngineId,getOptionLabelName,getOptionMenuItems,getOptionUiType,getOptionUrl,hasOptionsPageInSettings,InputToolCode,isNumberValue,OPTION_DEFAULT,OptionType,UiType",
                              "chrome/browser/resources/settings/chromeos/os_languages_page/languages_metrics_proxy.html|LanguagesMetricsProxy, LanguagesMetricsProxyImpl, LanguagesPageInteraction",
                              "chrome/browser/resources/settings/chromeos/os_people_page/fingerprint_browser_proxy.html|FingerprintInfo,FingerprintBrowserProxy,FingerprintResultType,FingerprintBrowserProxyImpl,FingerprintAttempt,FingerprintScan",
@@ -102,6 +122,7 @@ os_settings_auto_imports = settings_auto_imports +
                              "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/controls/settings_dropdown_menu.html|DropdownMenuOptionList",
+                             "chrome/browser/resources/settings/languages_page/languages_browser_proxy.html|LanguagesBrowserProxy,LanguagesBrowserProxyImpl",
                              "chrome/browser/resources/settings/lifetime_browser_proxy.html|LifetimeBrowserProxy,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",
@@ -112,6 +133,7 @@ os_settings_auto_imports = settings_auto_imports +
                              "ui/webui/resources/html/cr.html|sendWithPromise,removeWebUIListener,addWebUIListener,WebUIListener",
                              "ui/webui/resources/html/icon.html|getImage",
                              "ui/webui/resources/html/polymer.html|afterNextRender,Polymer,html,flush",
+                             "ui/webui/resources/html/util.html|HTMLEscape",
                              "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_browser_proxy.html|CupsPrintersBrowserProxy,CupsPrintersBrowserProxyImpl,CupsPrinterInfo,PrinterSetupResult,CupsPrintersList,PrinterPpdMakeModel,ManufacturersInfo,ModelsInfo,PrintServerResult,PrinterMakeModel",
                              "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry_list_behavior.html|CupsPrintersEntryListBehavior",
                              "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry_manager.html|CupsPrintersEntryManager",
@@ -120,6 +142,9 @@ os_settings_auto_imports = settings_auto_imports +
                              "ui/webui/resources/html/web_ui_listener_behavior.html|WebUIListenerBehavior",
                              "ui/webui/resources/cr_components/chromeos/network/network_listener_behavior.html|NetworkListenerBehavior",
                              "chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_types.html|PrinterListEntry,PrinterType",
+                             "chrome/browser/resources/settings/about_page/about_page_browser_proxy.html|AboutPageBrowserProxyImpl,AboutPageUpdateInfo,AboutPageBrowserProxy,browserChannelToI18nId,VersionInfo,ChannelInfo,BrowserChannel,isTargetChannelMoreStable,UpdateStatus,UpdateStatusChangedEvent,RegulatoryInfo,TPMFirmwareUpdateStatusChangedEvent",
+                             "chrome/browser/resources/settings/chromeos/os_settings_page/main_page_behavior.html|MainPageBehavior",
+                             "ui/webui/resources/html/parse_html_subset.html|parseHtmlSubset",
                            ]
 
 os_settings_migrated_imports = settings_migrated_imports
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp b/chromium/chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp
index cbdc3f43636..f6475e378ae 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp
@@ -30,6 +30,61 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_CELLULAR_SETUP_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/cellular_setup_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_INTERNET_CONFIG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/internet_config.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_INTERNET_DETAIL_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/internet_detail_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_INTERNET_KNOWN_NETWORKS_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/internet_known_networks_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_INTERNET_PAGE_BROWSER_PROXY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_CELLULAR_SETUP_SETTINGS_DELEGATE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/cellular_setup_settings_delegate.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_INTERNET_SHARED_CSS_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/internet_shared_css.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_NETWORK_PROXY_SECTION_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/network_proxy_section.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_NETWORK_SUMMARY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/network_summary.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_NETWORK_SUMMARY_ITEM_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/network_summary_item.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_TETHER_CONNECTION_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/tether_connection_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_PERSONALIZATION_PAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/personalization_page/personalization_page.m.js"
            use_base_dir="false"
@@ -62,6 +117,16 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_CONTROLLED_BUTTON_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/controls/controlled_button.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_EXTENSION_CONTROLLED_INDICATOR_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/controls/extension_controlled_indicator.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_SETTINGS_RADIO_GROUP_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_radio_group.m.js"
            use_base_dir="false"
@@ -77,6 +142,11 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/extension_control_browser_proxy.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_LANGUAGES_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/languages_browser_proxy.m.js"
            use_base_dir="false"
@@ -89,6 +159,16 @@
            compress="false"
            preprocess="true"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_ADD_INPUT_METHODS_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/add_input_methods_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_CHANGE_DEVICE_LANGUAGE_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/change_device_language_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_ADD_LANGUAGES_DIALOG_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/os_add_languages_dialog.m.js"
            use_base_dir="false"
@@ -119,6 +199,11 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_EDIT_DICTIONARY_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/os_edit_dictionary_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_LANGUAGES_PAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/os_languages_page.m.js"
            use_base_dir="false"
@@ -134,6 +219,16 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_SHARED_STYLE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/shared_style.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_SHARED_VARS_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/shared_vars.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_LANGUAGES_PAGE_SMART_INPUTS_PAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_languages_page/smart_inputs_page.m.js"
            use_base_dir="false"
@@ -152,11 +247,13 @@
   <include name="IDR_OS_SETTINGS_PEOPLE_PAGE_SYNC_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_browser_proxy.m.js"
            use_base_dir="false"
+           preprocess="true"
            compress="false"
            type="BINDATA" />
   <include name="IDR_OS_SETTINGS_PEOPLE_PAGE_SYNC_ACCOUNT_CONTROL_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_account_control.m.js"
            use_base_dir="false"
+           preprocess="true"
            compress="false"
            type="BINDATA" />
   <include name="IDR_OS_SETTINGS_PEOPLE_PAGE_SYNC_ENCRYPTION_OPTIONS_M_JS"
@@ -172,11 +269,13 @@
   <include name="IDR_OS_SETTINGS_PEOPLE_PAGE_SYNC_CONTROLS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_controls.m.js"
            use_base_dir="false"
+           preprocess="true"
            compress="false"
            type="BINDATA" />
   <include name="IDR_OS_SETTINGS_PEOPLE_PAGE_SYNC_PAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_page.m.js"
            use_base_dir="false"
+           preprocess="true"
            compress="false"
            type="BINDATA" />
   <include name="IDR_OS_SETTINGS_SETTINGS_PRIVACY_PAGE_M_JS"
@@ -194,6 +293,7 @@
   <include name="IDR_OS_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.m.js"
            use_base_dir="false"
+           preprocess="true"
            compress="false"
            type="BINDATA" />
   <include name="IDR_OS_SETTINGS_PARENTAL_CONTROLS_PAGE_M_JS"
@@ -401,6 +501,49 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_OS_PRINTING_PAGE_OS_ABOUT_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           preprocess="true"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_OS_PRINTING_PAGE_CHANNEL_SWITCHER_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_about_page/channel_switcher_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_OS_PRINTING_PAGE_DETAILED_BUILD_INFO_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_OS_PRINTING_PAGE_UPDATE_WARNING_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_about_page/update_warning_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_OS_SETTINGS_PAGE_MAIN_PAGE_BEHAVIOR_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_settings_page/main_page_behavior.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_SETTINGS_ABOUT_PAGE_ABOUT_PAGE_BROWSER_PROXY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/about_page/about_page_browser_proxy.m.js"
+           use_base_dir="false"
+           compress="false"
+           preprocess="true"
+           type="BINDATA" />
+  <include name="IDR_SETTINGS_SETTINGS_PAGE_SETTINGS_SECTION_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/settings_section.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_SETTINGS_SETTINGS_PAGE_CSS_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_page_css.m.js"
+           use_base_dir="false"
+           compress="false"
+           preprocess="true"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_OS_FILES_PAGE_OS_FILES_PAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.m.js"
            use_base_dir="false"
@@ -455,6 +598,11 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_MULTIDEVICE_NOTIFICATIONS_ACCESS_SETUP_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_notification_access_setup_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_MULTIDEVICE_SUBPAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_subpage.m.js"
            use_base_dir="false"
@@ -539,11 +687,13 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/settings_subpage.m.js"
            use_base_dir="false"
            compress="false"
+           preprocess="true"
            type="BINDATA"/>
   <include name="IDR_OS_SETTINGS_SETTINGS_ANIMATED_PAGES_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/settings_animated_pages.m.js"
            use_base_dir="false"
            compress="false"
+           preprocess="true"
            type="BINDATA"/>
   <include name="IDR_OS_SETTINGS_SETTINGS_TOGGLE_BUTTON_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_toggle_button.m.js"
@@ -570,6 +720,7 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs.m.js"
            use_base_dir="false"
            compress="false"
+           preprocess="true"
            type="BINDATA"/>
   <include name="IDR_OS_SETTINGS_PREFS_PREF_UTIL_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/pref_util.m.js"
@@ -585,23 +736,53 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA"/>
+  <include name="IDR_OS_SETTINGS_NEARBY_SHARE_CONFIRM_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_confirm_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_NEARBY_ACCOUNT_MANAGER_BROWSER_PROXY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_account_manager_browser_proxy.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_NEARBY_SHARE_SUBPAGE_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/nearby_share_page/nearby_share_subpage.m.js"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_NEARBY_SHARE_CONTACT_VISIBILITY_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.m.js"
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
   <include name="IDR_OS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/nearby_share_page/nearby_share_device_name_dialog.m.js"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_device_name_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_NEARBY_SHARE_HIGH_VISIBILITY_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_high_visibility_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_NEARBY_SHARE_RECEIVE_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_NEARBY_SHARE_RECEIVE_MANAGER_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_receive_manager.m.js"
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
   <include name="IDR_OS_SETTINGS_NEARBY_SHARE_DATA_USAGE_DIALOG_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/nearby_share_page/nearby_share_data_usage_dialog.m.js"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_data_usage_dialog.m.js"
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
   <include name="IDR_OS_SETTINGS_NEARBY_SHARE_TYPES_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/nearby_share_page/types.m.js"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/types.m.js"
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
@@ -625,6 +806,11 @@
            use_base_dir="false"
            compress="false"
            type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/global_scroll_target_behavior.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
   <include name="IDR_OS_SETTINGS_I18N_SETUP_JS"
            file="i18n_setup.js"
            compress="false"
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 3a4197151b3..5a3dde0cc71 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
@@ -19,10 +19,10 @@ js_library("os_settings_ui") {
     "../os_settings_main:os_settings_main",
     "../os_toolbar",
     "//ui/webui/resources/cr_elements:cr_container_shadow_behavior",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior",
     "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer",
     "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar_search_field",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior",
-    "//ui/webui/resources/js:find_shortcut_behavior",
   ]
 }
 
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 e423491690e..d4e9f984c6e 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
@@ -19,6 +19,7 @@ js_library("parental_controls_page") {
   deps = [
     ":parental_controls_browser_proxy",
     "../..:router",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button",
     "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:web_ui_listener_behavior",
@@ -43,6 +44,7 @@ js_library("parental_controls_page.m") {
   deps = [
     ":parental_controls_browser_proxy.m",
     "../..:router.m",
+    "//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",
   ]
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 dddafc39f27..e948255f2b4 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
@@ -18,8 +18,10 @@ js_type_check("closure_compile") {
 js_library("change_picture") {
   deps = [
     ":change_picture_browser_proxy",
+    "..:deep_linking_behavior",
     "..:metrics_recorder",
     "..:os_route",
+    "../..:router",
     "//third_party/polymer/v1_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer-extracted",
     "//third_party/polymer/v1_0/components-chromium/iron-selector:iron-selector-extracted",
     "//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_picture_list",
@@ -40,6 +42,7 @@ js_library("change_picture_browser_proxy") {
 js_library("personalization_page") {
   deps = [
     ":wallpaper_browser_proxy",
+    "..:deep_linking_behavior",
     "..:os_route",
     "../..:router",
     "../../prefs",
@@ -68,6 +71,7 @@ js_library("change_picture.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/change_picture.m.js" ]
   deps = [
     ":change_picture_browser_proxy.m",
+    "..:deep_linking_behavior.m",
     "..:metrics_recorder.m",
     "..:os_route.m",
     "../..:router.m",
@@ -96,6 +100,7 @@ js_library("personalization_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/personalization_page/personalization_page.m.js" ]
   deps = [
     ":wallpaper_browser_proxy.m",
+    "..:deep_linking_behavior.m",
     "..:os_route.m",
     "../..:router.m",
     "../../prefs:prefs.m",
@@ -129,7 +134,7 @@ polymer_modulizer("change_picture") {
   namespace_rewrites = os_settings_namespace_rewrites +
                        [ "Polymer.IronA11yAnnouncer|IronA11yAnnouncer" ]
   auto_imports = os_settings_auto_imports + [
-                   "ui/webui/resources/html/assert.html|assertNotReached",
+                   "ui/webui/resources/html/assert.html|assert,assertNotReached",
                    "ui/webui/resources/polymer/v3_0/iron-a11y-announcer/iron-a11y-announcer.html|IronA11yAnnouncer",
                  ]
 }
diff --git a/chromium/chrome/browser/resources/settings/languages_page/BUILD.gn b/chromium/chrome/browser/resources/settings/languages_page/BUILD.gn
index 2ebe0331628..5a839669aea 100644
--- a/chromium/chrome/browser/resources/settings/languages_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/languages_page/BUILD.gn
@@ -73,8 +73,8 @@ js_library("add_languages_dialog") {
     ":languages_types",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
   ]
 }
 
@@ -103,6 +103,7 @@ js_library("languages.m") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:promise_resolver.m",
   ]
   externs_list = [
diff --git a/chromium/chrome/browser/resources/settings/nearby_share_page/BUILD.gn b/chromium/chrome/browser/resources/settings/nearby_share_page/BUILD.gn
deleted file mode 100644
index 1a52410d6da..00000000000
--- a/chromium/chrome/browser/resources/settings/nearby_share_page/BUILD.gn
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//third_party/closure_compiler/compile_js.gni")
-import("//tools/polymer/polymer.gni")
-import("//ui/webui/resources/tools/js_modulizer.gni")
-import("../settings.gni")
-
-js_type_check("closure_compile") {
-  deps = [
-    ":nearby_share_data_usage_dialog",
-    ":nearby_share_device_name_dialog",
-    ":nearby_share_subpage",
-    ":types",
-  ]
-}
-
-js_library("nearby_share_data_usage_dialog") {
-  deps = [
-    ":types",
-    "../prefs",
-    "../prefs:prefs_behavior",
-    "../prefs:prefs_types",
-    "//ui/webui/resources/cr_elements/cr_button:cr_button",
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
-    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button",
-    "//ui/webui/resources/cr_elements/cr_radio_group:cr_radio_group",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-}
-
-js_library("nearby_share_device_name_dialog") {
-  deps = [
-    "../prefs",
-    "../prefs:prefs_behavior",
-    "../prefs:prefs_types",
-    "//ui/webui/resources/cr_elements/cr_button:cr_button",
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
-    "//ui/webui/resources/cr_elements/cr_input:cr_input",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-}
-
-js_library("nearby_share_subpage") {
-  deps = [
-    ":nearby_share_data_usage_dialog",
-    ":nearby_share_device_name_dialog",
-    ":types",
-    "..:router",
-    "../prefs",
-    "../prefs:prefs_behavior",
-    "../prefs:prefs_types",
-    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings",
-    "//ui/webui/resources/js:cr",
-    "//ui/webui/resources/js:i18n_behavior",
-  ]
-}
-
-js_library("types") {
-}
-
-group("polymer3_elements") {
-  public_deps = [
-    ":modulize",
-    ":nearby_share_data_usage_dialog_module",
-    ":nearby_share_device_name_dialog_module",
-    ":nearby_share_subpage_module",
-    "../controls:polymer3_elements",
-    "../prefs:polymer3_elements",
-  ]
-}
-
-js_type_check("closure_compile_module") {
-  is_polymer3 = true
-  deps = [
-    ":nearby_share_data_usage_dialog.m",
-    ":nearby_share_device_name_dialog.m",
-    ":nearby_share_subpage.m",
-  ]
-}
-
-js_library("nearby_share_data_usage_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/nearby_share_page/nearby_share_data_usage_dialog.m.js" ]
-  deps = [
-    ":types.m",
-    "../prefs:prefs.m",
-    "../prefs:prefs_behavior.m",
-    "../prefs:prefs_types.m",
-    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
-    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
-    "//ui/webui/resources/cr_elements/cr_radio_group:cr_radio_group.m",
-    "//ui/webui/resources/js:i18n_behavior.m",
-  ]
-  extra_deps = [ ":nearby_share_data_usage_dialog_module" ]
-}
-
-js_library("nearby_share_device_name_dialog.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/nearby_share_page/nearby_share_device_name_dialog.m.js" ]
-  deps = [
-    "../prefs:prefs.m",
-    "../prefs:prefs_behavior.m",
-    "../prefs:prefs_types.m",
-    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
-    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
-    "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
-    "//ui/webui/resources/js:i18n_behavior.m",
-  ]
-  extra_deps = [ ":nearby_share_device_name_dialog_module" ]
-}
-
-js_library("nearby_share_subpage.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/nearby_share_page/nearby_share_subpage.m.js" ]
-  deps = [
-    ":nearby_share_data_usage_dialog.m",
-    ":nearby_share_device_name_dialog.m",
-    ":types.m",
-    "..:router.m",
-    "../prefs:prefs.m",
-    "../prefs:prefs_behavior.m",
-    "../prefs:prefs_types.m",
-    "//chrome/browser/resources/nearby_share/shared:nearby_share_settings.m",
-    "//ui/webui/resources/js:cr.m",
-    "//ui/webui/resources/js:i18n_behavior.m",
-  ]
-  extra_deps = [ ":nearby_share_subpage_module" ]
-}
-
-js_library("types.m") {
-  sources = [ "$root_gen_dir/chrome/browser/resources/settings/nearby_share_page/types.m.js" ]
-  extra_deps = [ ":modulize" ]
-}
-
-js_modulizer("modulize") {
-  input_files = [ "types.js" ]
-  namespace_rewrites = settings_namespace_rewrites
-}
-
-polymer_modulizer("nearby_share_data_usage_dialog") {
-  js_file = "nearby_share_data_usage_dialog.js"
-  html_file = "nearby_share_data_usage_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports
-}
-
-polymer_modulizer("nearby_share_device_name_dialog") {
-  js_file = "nearby_share_device_name_dialog.js"
-  html_file = "nearby_share_device_name_dialog.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports = settings_auto_imports
-}
-
-polymer_modulizer("nearby_share_subpage") {
-  js_file = "nearby_share_subpage.js"
-  html_file = "nearby_share_subpage.html"
-  html_type = "dom-module"
-  namespace_rewrites = settings_namespace_rewrites
-  auto_imports =
-      settings_auto_imports +
-      [ "chrome/browser/resources/settings/chromeos/os_route.html|routes" ]
-}
diff --git a/chromium/chrome/browser/resources/settings/os_settings_resources.grd b/chromium/chrome/browser/resources/settings/os_settings_resources.grd
index 1c5b05f19b6..14c73af544d 100644
--- a/chromium/chrome/browser/resources/settings/os_settings_resources.grd
+++ b/chromium/chrome/browser/resources/settings/os_settings_resources.grd
@@ -69,6 +69,12 @@
       <structure name="IDR_OS_SETTINGS_A11Y_PAGE_HTML"
                  file="chromeos/os_a11y_page/os_a11y_page.html"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_A11Y_PAGE_BROWSER_PROXY_JS"
+                 file="chromeos/os_a11y_page/os_a11y_page_browser_proxy.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_A11Y_PAGE_BROWSER_PROXY_HTML"
+                 file="chromeos/os_a11y_page/os_a11y_page_browser_proxy.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_JS"
                  file="chromeos/ambient_mode_page/ambient_mode_page.js"
                  compress="false" type="chrome_html" />
@@ -270,6 +276,12 @@
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_SHARED_PATHS_JS"
                 file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_shared_paths.js"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_SHARED_USB_DEVICES_HTML"
+                file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_shared_usb_devices.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_SHARED_USB_DEVICES_JS"
+                file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_shared_usb_devices.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_BROWSER_PROXY_JS"
                 file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_browser_proxy.js"
                  compress="false" type="chrome_html" />
@@ -300,6 +312,12 @@
       <structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_HTML"
                  file="chromeos/os_a11y_page/manage_a11y_page.html"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_BROWSER_PROXY_JS"
+                 file="chromeos/os_a11y_page/manage_a11y_page_browser_proxy.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_BROWSER_PROXY_HTML"
+                 file="chromeos/os_a11y_page/manage_a11y_page_browser_proxy.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SWITCH_ACCESS_CONSTANTS_JS"
                  file="chromeos/os_a11y_page/switch_access_constants.js"
                  compress="false" type="chrome_html" />
@@ -318,6 +336,12 @@
       <structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_HTML"
                  file="chromeos/os_a11y_page/tts_subpage.html"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_BROWSER_PROXY_JS"
+                 file="chromeos/os_a11y_page/tts_subpage_browser_proxy.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_BROWSER_PROXY_HTML"
+                 file="chromeos/os_a11y_page/tts_subpage_browser_proxy.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MANIFEST"
                  file="os_settings_manifest.json"
                  compress="false" type="chrome_html" />
@@ -683,12 +707,24 @@
                  file="languages_page/languages_browser_proxy.js"
                  preprocess="true"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_ADD_INPUT_METHODS_DIALOG_HTML"
+                 file="chromeos/os_languages_page/add_input_methods_dialog.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_ADD_INPUT_METHODS_DIALOG_JS"
+                 file="chromeos/os_languages_page/add_input_methods_dialog.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_HTML"
                  file="chromeos/os_languages_page/os_add_languages_dialog.html"
                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_JS"
                  file="chromeos/os_languages_page/os_add_languages_dialog.js"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_CHANGE_DEVICE_LANGUAGE_DIALOG_HTML"
+                 file="chromeos/os_languages_page/change_device_language_dialog.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_CHANGE_DEVICE_LANGUAGE_DIALOG_JS"
+                 file="chromeos/os_languages_page/change_device_language_dialog.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_METRICS_PROXY_HTML"
                  file="chromeos/os_languages_page/languages_metrics_proxy.html"
                  compress="false" type="chrome_html" />
@@ -707,6 +743,12 @@
       <structure name="IDR_OS_SETTINGS_LANGUAGES_PAGE_INPUT_PAGE_JS"
                  file="chromeos/os_languages_page/input_page.js"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_EDIT_DICTIONARY_PAGE_HTML"
+                 file="chromeos/os_languages_page/os_edit_dictionary_page.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_EDIT_DICTIONARY_PAGE_JS"
+                 file="chromeos/os_languages_page/os_edit_dictionary_page.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_PAGE_OS_LANGUAGES_PAGE_V2_HTML"
                  file="chromeos/os_languages_page/os_languages_page_v2.html"
                  compress="false" type="chrome_html" />
@@ -737,6 +779,12 @@
       <structure name="IDR_OS_SETTINGS_LANGUAGES_INPUT_METHOD_UTIL_JS"
                  file="chromeos/os_languages_page/input_method_util.js"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_SHARED_STYLE_HTML"
+                 file="chromeos/os_languages_page/shared_style.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_SHARED_VARS_HTML"
+                 file="chromeos/os_languages_page/shared_vars.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_SMART_INPUTS_PAGE_HTML"
                  file="chromeos/os_languages_page/smart_inputs_page.html"
                  compress="false" type="chrome_html" />
@@ -1223,6 +1271,12 @@
       <structure name="IDR_OS_SETTINGS_INTERNET_PAGE_BROWSER_PROXY_JS"
                  file="chromeos/internet_page/internet_page_browser_proxy.js"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CELLULAR_SETUP_SETTINGS_DELEGATE_HTML"
+                 file="chromeos/internet_page/cellular_setup_settings_delegate.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_CELLULAR_SETUP_SETTINGS_DELEGATE_JS"
+                 file="chromeos/internet_page/cellular_setup_settings_delegate.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_INTERNET_PAGE_HTML"
                  file="chromeos/internet_page/internet_page.html"
                  compress="false" type="chrome_html" />
@@ -1274,6 +1328,12 @@
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_PAGE_JS"
                  file="chromeos/multidevice_page/multidevice_page.js"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_MULTIDEVICE_NOTIFICATIONS_ACCESS_SETUP_DIALOG_HTML"
+                 file="chromeos/multidevice_page/multidevice_notification_access_setup_dialog.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_MULTIDEVICE_NOTIFICATIONS_ACCESS_SETUP_DIALOG_JS"
+                 file="chromeos/multidevice_page/multidevice_notification_access_setup_dialog.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_RADIO_BUTTON_HTML"
                  file="chromeos/multidevice_page/multidevice_radio_button.html"
                  compress="false" type="chrome_html" />
@@ -1298,29 +1358,65 @@
       <structure name="IDR_OS_SETTINGS_MULTIDEVICE_TETHER_ITEM_JS"
                  file="chromeos/multidevice_page/multidevice_tether_item.js"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_CONFIRM_PAGE_HTML"
+                 file="chromeos/nearby_share_page/nearby_share_confirm_page.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_CONFIRM_PAGE_JS"
+                 file="chromeos/nearby_share_page/nearby_share_confirm_page.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_CONTACT_VISIBILITY_DIALOG_HTML"
+                 file="chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_CONTACT_VISIBILITY_DIALOG_JS"
+                 file="chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_ACCOUNT_MANAGER_BROWSER_PROXY_HTML"
+                 file="chromeos/nearby_share_page/nearby_account_manager_browser_proxy.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_ACCOUNT_MANAGER_BROWSER_PROXY_JS"
+                 file="chromeos/nearby_share_page/nearby_account_manager_browser_proxy.js"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_DIALOG_HTML"
-                 file="nearby_share_page/nearby_share_device_name_dialog.html"
+                 file="chromeos/nearby_share_page/nearby_share_device_name_dialog.html"
                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_DIALOG_JS"
-                 file="nearby_share_page/nearby_share_device_name_dialog.js"
+                 file="chromeos/nearby_share_page/nearby_share_device_name_dialog.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_HIGH_VISIBILITY_PAGE_HTML"
+                 file="chromeos/nearby_share_page/nearby_share_high_visibility_page.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_HIGH_VISIBILITY_PAGE_JS"
+                 file="chromeos/nearby_share_page/nearby_share_high_visibility_page.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_RECEIVE_DIALOG_HTML"
+                 file="chromeos/nearby_share_page/nearby_share_receive_dialog.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_RECEIVE_DIALOG_JS"
+                 file="chromeos/nearby_share_page/nearby_share_receive_dialog.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_RECEIVE_MANAGER_HTML"
+                 file="chromeos/nearby_share_page/nearby_share_receive_manager.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_RECEIVE_MANAGER_JS"
+                 file="chromeos/nearby_share_page/nearby_share_receive_manager.js"
                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_DATA_USAGE_DIALOG_HTML"
-                 file="nearby_share_page/nearby_share_data_usage_dialog.html"
+                 file="chromeos/nearby_share_page/nearby_share_data_usage_dialog.html"
                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_DATA_USAGE_DIALOG_JS"
-                 file="nearby_share_page/nearby_share_data_usage_dialog.js"
+                 file="chromeos/nearby_share_page/nearby_share_data_usage_dialog.js"
                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_TYPES_HTML"
-                 file="nearby_share_page/types.html"
+                 file="chromeos/nearby_share_page/types.html"
                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_TYPES_JS"
-                 file="nearby_share_page/types.js"
+                 file="chromeos/nearby_share_page/types.js"
                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_SUBPAGE_HTML"
-                 file="nearby_share_page/nearby_share_subpage.html"
+                 file="chromeos/nearby_share_page/nearby_share_subpage.html"
                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NEARBY_SHARE_SUBPAGE_JS"
-                 file="nearby_share_page/nearby_share_subpage.js"
+                 file="chromeos/nearby_share_page/nearby_share_subpage.js"
                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NETWORK_PROXY_SECTION_HTML"
                  file="chromeos/internet_page/network_proxy_section.html"
diff --git a/chromium/chrome/browser/resources/settings/os_settings_resources_vulcanized.grd b/chromium/chrome/browser/resources/settings/os_settings_resources_vulcanized.grd
index 07f8b8d5b7f..71a2e4d07d3 100644
--- a/chromium/chrome/browser/resources/settings/os_settings_resources_vulcanized.grd
+++ b/chromium/chrome/browser/resources/settings/os_settings_resources_vulcanized.grd
@@ -85,19 +85,16 @@
       <include name="IDR_OS_SETTINGS_OS_SETTINGS_ROLLUP_JS"
                file="${root_gen_dir}\chrome\browser\resources\settings\chromeos\os_settings.rollup.js"
                use_base_dir="false"
-               preprocess="true"
                type="BINDATA" />
       <include name="IDR_OS_SETTINGS_OS_SETTINGS_V3_HTML"
                file="chromeos/os_settings_v3.html"
                type="BINDATA" />
       <include name="IDR_OS_SETTINGS_LAZY_LOAD_ROLLUP_JS"
                file="${root_gen_dir}\chrome\browser\resources\settings\chromeos\lazy_load.rollup.js"
-               preprocess="true"
                type="BINDATA"
                use_base_dir="false" />
       <include name="IDR_OS_SETTINGS_SHARED_ROLLUP_JS"
                file="${root_gen_dir}\chrome\browser\resources\settings\chromeos\shared.rollup.js"
-               preprocess="true"
                type="BINDATA"
                use_base_dir="false" />
     </includes>
diff --git a/chromium/chrome/browser/resources/settings/people_page/BUILD.gn b/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
index efc53f2116e..0359f48c21f 100644
--- a/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/people_page/BUILD.gn
@@ -50,6 +50,7 @@ js_library("sync_page") {
     ":sync_account_control",
     ":sync_browser_proxy",
     ":sync_encryption_options",
+    "../privacy_page:personalization_options",
     "../settings_page:settings_animated_pages",
     "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button",
     "//ui/webui/resources/cr_elements/cr_input:cr_input",
@@ -152,6 +153,7 @@ if (!is_chromeos) {
       "..:route",
       "..:router.m",
       "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+      "//ui/webui/resources/cr_components/customize_themes",
     ]
   }
 
@@ -240,6 +242,7 @@ js_library("sync_encryption_options.m") {
   deps = [
     ":sync_browser_proxy.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_radio_group:cr_radio_group.m",
     "//ui/webui/resources/js:assert.m",
   ]
   extra_deps = [ ":sync_encryption_options_module" ]
@@ -249,8 +252,10 @@ js_library("sync_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/people_page/sync_page.m.js" ]
   deps = [
     ":sync_browser_proxy.m",
+    ":sync_encryption_options.m",
     "..:i18n_setup",
     "..:router.m",
+    "../privacy_page:personalization_options.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
     "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
diff --git a/chromium/chrome/browser/resources/settings/privacy_page/BUILD.gn b/chromium/chrome/browser/resources/settings/privacy_page/BUILD.gn
index c73a7c4c545..3ff1d13579b 100644
--- a/chromium/chrome/browser/resources/settings/privacy_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/privacy_page/BUILD.gn
@@ -45,7 +45,6 @@ js_type_check("closure_compile_module") {
     ":cookies_page",
     ":disable_safebrowsing_dialog",
     ":do_not_track_toggle",
-    ":passwords_leak_detection_toggle",
     ":personalization_options.m",
     ":privacy_page",
     ":privacy_page_browser_proxy.m",
@@ -120,17 +119,6 @@ js_library("do_not_track_toggle") {
   ]
 }
 
-js_library("passwords_leak_detection_toggle") {
-  deps = [
-    "..:metrics_browser_proxy",
-    "../people_page:sync_browser_proxy.m",
-    "../prefs:prefs_behavior.m",
-    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/js:i18n_behavior.m",
-    "//ui/webui/resources/js:web_ui_listener_behavior.m",
-  ]
-}
-
 js_library("personalization_options.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/personalization_options.m.js" ]
   deps = [
@@ -267,7 +255,6 @@ html_to_js("v3_ready_elements") {
     "cookies_page.js",
     "disable_safebrowsing_dialog.js",
     "do_not_track_toggle.js",
-    "passwords_leak_detection_toggle.js",
     "privacy_page.js",
     "secure_dns.js",
     "secure_dns_input.js",
diff --git a/chromium/chrome/browser/resources/settings/safety_check_page/BUILD.gn b/chromium/chrome/browser/resources/settings/safety_check_page/BUILD.gn
index 9e29620f968..cb944579003 100644
--- a/chromium/chrome/browser/resources/settings/safety_check_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/safety_check_page/BUILD.gn
@@ -31,6 +31,7 @@ js_library("safety_check_browser_proxy") {
 js_library("safety_check_child") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
diff --git a/chromium/chrome/browser/resources/settings/settings.gni b/chromium/chrome/browser/resources/settings/settings.gni
index daf863bcc5c..91865136e81 100644
--- a/chromium/chrome/browser/resources/settings/settings.gni
+++ b/chromium/chrome/browser/resources/settings/settings.gni
@@ -116,8 +116,6 @@ settings_namespace_rewrites = [
   "settings.SystemPageBrowserProxy|SystemPageBrowserProxy",
   "settings.RouteObserverBehavior|RouteObserverBehavior",
   "settings.WebsiteUsageBrowserProxy|WebsiteUsageBrowserProxy",
-  "nearby_share.NearbyShareSettingsBehavior|NearbyShareSettingsBehavior",
-
   "action_link.m.js|action_link.js",
 
   # TODO(1026426): Add more entries above as needed.
@@ -134,7 +132,6 @@ settings_auto_imports = [
   "chrome/browser/resources/settings/extension_control_browser_proxy.html|ExtensionControlBrowserProxyImpl,ExtensionControlBrowserProxy",
   "chrome/browser/resources/settings/global_scroll_target_behavior.html|GlobalScrollTargetBehavior",
   "chrome/browser/resources/settings/i18n_setup.html|loadTimeData",
-  "chrome/browser/resources/settings/nearby_share_page/types.html|NearbyShareDataUsage,dataUsageStringToEnum",
   "chrome/browser/resources/settings/prefs/prefs_behavior.html|PrefsBehavior",
   "chrome/browser/resources/settings/prefs/prefs_types.html|CrSettingsPrefs",
   "chrome/browser/resources/settings/printing_page/printing_browser_proxy.html|PrintingBrowserProxyImpl",
diff --git a/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn b/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
index 413ff291627..c58fd5c170e 100644
--- a/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
@@ -34,9 +34,9 @@ js_library("settings_subpage") {
     "..:router",
     "..:setting_id_param_util",
     "//third_party/polymer/v1_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior-extracted",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field",
     "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:find_shortcut_behavior",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:load_time_data",
     "//ui/webui/resources/js:util",
@@ -94,9 +94,9 @@ js_library("settings_subpage.m") {
     "..:setting_id_param_util.m",
     "//third_party/polymer/v3_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
     "//ui/webui/resources/js:assert.m",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:util.m",
diff --git a/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp b/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp
index 222968300ca..ab5f774e81b 100644
--- a/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp
+++ b/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp
@@ -4,856 +4,858 @@
   <include name="IDR_SETTINGS_A11Y_PAGE_A11Y_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/a11y_page/a11y_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <if expr="not is_macosx and not chromeos">
     <include name="IDR_SETTINGS_A11Y_PAGE_CAPTIONS_SUBPAGE_M_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/a11y_page/captions_subpage.m.js"
              use_base_dir="false"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <if expr="is_win or is_macosx">
     <include name="IDR_SETTINGS_A11Y_PAGE_CAPTIONS_BROWSER_PROXY_JS"
              file="a11y_page/captions_browser_proxy.js"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_ABOUT_PAGE_ABOUT_PAGE_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/about_page/about_page_browser_proxy.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_ABOUT_PAGE_ABOUT_PAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/about_page/about_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_BROWSER_PROXY_JS"
            file="appearance_page/appearance_browser_proxy.js"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_FONTS_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_page.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_APPEARANCE_PAGE_FONTS_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_APPEARANCE_PAGE_HOME_URL_INPUT_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/home_url_input.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_AUTOFILL_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/autofill_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_AVATAR_ICON_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/avatar_icon.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PAYMENTS_LIST_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/payments_list.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_CREDIT_CARD_LIST_ENTRY_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_UPI_ID_LIST_ENTRY_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/upi_id_list_entry.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_SHARED_CSS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_shared_css.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_CREDIT_CARD_EDIT_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/credit_card_edit_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_AUTOFILL_SECTION_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/autofill_section.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_ADDRESS_EDIT_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/address_edit_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <if expr="chromeos">
     <include name="IDR_SETTINGS_AUTOFILL_PAGE_BLOCKING_REQUEST_MANAGER_JS"
              file="autofill_page/blocking_request_manager.js"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_MERGE_EXCEPTIONS_STORE_COPIES_BEHAVIOR_JS"
            file="autofill_page/merge_exceptions_store_copies_behavior.js"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_MERGE_PASSWORDS_STORE_COPIES_BEHAVIOR_JS"
            file="autofill_page/merge_passwords_store_copies_behavior.js"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_MULTI_STORE_EXCEPTION_ENTRY_JS"
            file="autofill_page/multi_store_exception_entry.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_MULTI_STORE_ID_HANDLER_JS"
            file="autofill_page/multi_store_id_handler.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_MULTI_STORE_PASSWORD_UI_ENTRY_JS"
            file="autofill_page/multi_store_password_ui_entry.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_BEHAVIOR_JS"
            file="autofill_page/password_check_behavior.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_EDIT_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check_edit_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_EDIT_DISCLAIMER_DIALOG_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check_edit_disclaimer_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_LIST_ITEM_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check_list_item.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true"/>
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_LIST_ITEM_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_list_item.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true"/>
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_LIST_HANDLER_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_list_handler.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true"/>
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_MANAGER_PROXY_JS"
            file="autofill_page/password_manager_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
  <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_REMOVE_CONFIRMATION_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_remove_confirmation_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_SECTION_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_section.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_DEVICE_SECTION_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_device_section.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_EDIT_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_edit_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_move_to_account_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_REMOVE_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_remove_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_EXPORT_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PAYMENTS_SECTION_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/payments_section.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_SHOW_PASSWORD_BEHAVIOR_JS"
            file="autofill_page/show_password_behavior.js"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_BASIC_PAGE_BASIC_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/basic_page/basic_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <if expr="is_win">
     <include name="IDR_SETTINGS_CHROME_CLEANUP_PROXY_JS"
              file="chrome_cleanup_page/chrome_cleanup_proxy.js"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
     <include name="IDR_SETTINGS_CHROME_CLEANUP_PAGE_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/chrome_cleanup_page.js"
              use_base_dir="false"
-             compress="false" type="BINDATA"
+             type="BINDATA"
              preprocess="true" />
     <include name="IDR_SETTINGS_CHROME_CLEANUP_ITEMS_TO_REMOVE_LIST_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.js"
              use_base_dir="false"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_CLEAR_BROWSING_DATA_BROWSER_PROXY_M_JS"
            file="clear_browsing_data_dialog/clear_browsing_data_browser_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_CLEAR_BROWSING_DATA_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_HISTORY_DELETION_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/history_deletion_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_INSTALLED_APP_CHECKBOX_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/installed_app_checkbox.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CLEAR_BROWSING_DATA_DIALOG_PASSWORDS_DELETION_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/clear_browsing_data_dialog/passwords_deletion_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_CONTROLLED_BUTTON_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/controlled_button.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_CONTROLLED_RADIO_BUTTON_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/controlled_radio_button.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_EXTENSION_CONTROLLED_INDICATOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/extension_controlled_indicator.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_PASSWORD_PROMPT_DIALOG_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/password_prompt_dialog.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_boolean_control_behavior.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_CHECKBOX_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_checkbox.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_DROPDOWN_MENU_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_dropdown_menu.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_IDLE_LOAD_JS"
            file="controls/settings_idle_load.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_PREF_CONTROL_BEHAVIOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/pref_control_behavior.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_RADIO_GROUP_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_radio_group.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_SLIDER_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_slider.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_TEXTAREA_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_textarea.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_CONTROLS_SETTINGS_TOGGLE_BUTTON_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/controls/settings_toggle_button.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <if expr="not chromeos">
     <include name="IDR_SETTINGS_DEFAULT_BROWSER_BROWSER_PROXY_JS"
              file="default_browser_page/default_browser_browser_proxy.js"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
     <include name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/default_browser_page/default_browser_page.js"
              use_base_dir="false"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_DOWNLOADS_PAGE_DOWNLOADS_BROWSER_PROXY_JS"
            file="downloads_page/downloads_browser_proxy.js"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_DOWNLOADS_PAGE_DOWNLOADS_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/downloads_page/downloads_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_ENSURE_LAZY_LOADED_JS"
            file="ensure_lazy_loaded.js"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/extension_control_browser_proxy.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/global_scroll_target_behavior.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_HATS_BROWSER_PROXY_JS"
            file="hats_browser_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_I18N_SETUP_JS"
            file="i18n_setup.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ICONS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/icons.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <if expr="is_win and _google_chrome">
     <include name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_PAGE_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/incompatible_applications_page/incompatible_applications_page.js"
              use_base_dir="false"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
     <include name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_BROWSER_PROXY_JS"
              file="incompatible_applications_page/incompatible_applications_browser_proxy.js"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
     <include name="IDR_SETTINGS_INCOMPATIBLE_APPLICATIONS_INCOMPATIBLE_APPLICATION_ITEM_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/incompatible_applications_page/incompatible_application_item.js"
              use_base_dir="false"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_LANGUAGES_PAGE_LANGUAGES_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/languages.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_LANGUAGES_PAGE_LANGUAGES_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/languages_browser_proxy.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_LANGUAGES_PAGE_ADD_LANGUAGES_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/add_languages_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <if expr="chromeos">
     <include name="IDR_SETTINGS_LANGUAGES_PAGE_LANGUAGES_METRICS_PROXY_JS"
             file="languages_page/languages_metrics_proxy.js"
-            compress="false" type="BINDATA" />
+            type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_LANGUAGES_PAGE_LANGUAGES_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/languages_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <if expr="not is_macosx">
     <include name="IDR_SETTINGS_LANGUAGES_PAGE_EDIT_DICTIONARY_PAGE_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/languages_page/edit_dictionary_page.js"
              use_base_dir="false"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_LAZY_LOAD_V3_JS"
            file="lazy_load.js"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_LIFETIME_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/lifetime_browser_proxy.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_MENU_SETTINGS_MENU_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_menu/settings_menu.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_METRICS_BROWSER_PROXY_JS"
            file="metrics_browser_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_BROWSER_PROXY_JS"
            file="on_startup_page/on_startup_browser_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/on_startup_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URL_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_url_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URL_ENTRY_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_url_entry.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URLS_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_urls_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ON_STARTUP_PAGE_STARTUP_URLS_PAGE_BROWSER_PROXY_JS"
            file="on_startup_page/startup_urls_page_browser_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_OPEN_WINDOW_PROXY_JS"
            file="open_window_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PAGE_VISIBILITY_JS"
            file="page_visibility.js"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <if expr="not chromeos">
     <include name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_DIALOG_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/people_page/import_data_dialog.js"
              use_base_dir="false"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
     <include name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_BROWSER_PROXY_JS"
              file="people_page/import_data_browser_proxy.js"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
     <include name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/people_page/manage_profile.js"
              use_base_dir="false"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
     <include name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_BROWSER_PROXY_JS"
              file="people_page/manage_profile_browser_proxy.js"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <if expr="chromeos">
     <include name="IDR_SETTINGS_PEOPLE_PAGE_ACCOUNT_MANAGER_BROWSER_PROXY_M_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/people_page/account_manager_browser_proxy.m.js"
              use_base_dir="false"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_ACCOUNT_CONTROL_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_account_control.m.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_browser_proxy.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_ENCRYPTION_OPTIONS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_encryption_options.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_PEOPLE_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/people_page.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_PROFILE_INFO_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/profile_info_browser_proxy.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SIGNOUT_DIALOG_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/signout_dialog.m.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_CONTROLS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_controls.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           preprocess="true"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_PAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/people_page/sync_page.m.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PREFS_PREFS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           preprocess="true"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PREFS_PREFS_BEHAVIOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs_behavior.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PREFS_PREFS_TYPES_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs_types.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PREFS_PREF_UTIL_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/pref_util.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRINTING_PAGE_CLOUD_PRINTERS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/cloud_printers.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/printing_page.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_COLLAPSE_RADIO_BUTTON_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/collapse_radio_button.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_COOKIES_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/cookies_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_DO_NOT_TRACK_TOGGLE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/do_not_track_toggle.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_PRIVACY_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/privacy_page.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
-  <include name="IDR_SETTINGS_PRIVACY_PAGE_PASSWORDS_LEAK_DETECTION_TOGGLE_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/passwords_leak_detection_toggle.js"
-           use_base_dir="false"
-           preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_PERSONALIZATION_OPTIONS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/personalization_options.m.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.m.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURE_DNS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/secure_dns.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURE_DNS_INPUT_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/secure_dns_input.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_page.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_DISABLE_SAFEBROWSING_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/disable_safebrowsing_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_BIO_ENROLL_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_bio_enroll_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_BROWSER_PROXY_JS"
            file="privacy_page/security_keys_browser_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_CREDENTIAL_MANAGEMENT_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_credential_management_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_PIN_FIELD_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_pin_field.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_RESET_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_reset_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_SET_PIN_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_set_pin_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_SECURITY_KEYS_SUBPAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/security_keys_subpage.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_RESET_PAGE_RESET_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/reset_page/reset_page.js"
            use_base_dir="false"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_RESET_PAGE_RESET_PROFILE_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/reset_page/reset_profile_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_RESET_PAGE_RESET_PROFILE_BANNER_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/reset_page/reset_profile_banner.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"/>
+           type="BINDATA"/>
   <include name="IDR_SETTINGS_RESET_PAGE_RESET_BROWSER_PROXY_JS"
            file="reset_page/reset_browser_proxy.js"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ROUTE_JS"
            file="route.js"
            preprocess="true"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ROUTER_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/router.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_BROWSER_PROXY_JS"
            file="safety_check_page/safety_check_browser_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_CHILD_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_child.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <if expr="is_win">
     <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_CHROME_CLEANER_CHILD_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_chrome_cleaner_child.js"
              use_base_dir="false"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_EXTENSIONS_CHILD_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_extensions_child.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_PAGE_JS"
            preprocess="true"
            file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_PASSWORDS_CHILD_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_passwords_child.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_SAFE_BROWSING_CHILD_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_safe_browsing_child.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_UPDATES_CHILD_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_updates_child.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_ENGINES_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_OMNIBOX_EXTENSION_ENTRY_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/omnibox_extension_entry.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_CSS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engine_entry_css.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engine_entry.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_LIST_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_list.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_page/search_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_SETTINGS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_settings.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_MAIN_SETTINGS_MAIN_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_main/settings_main.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_MAIN_PAGE_BEHAVIOR_JS"
            file="settings_page/main_page_behavior.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_SETTINGS_ANIMATED_PAGES_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/settings_animated_pages.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           preprocess="true"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_SETTINGS_SECTION_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/settings_section.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_SETTINGS_SUBPAGE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/settings_subpage.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SETTINGS_UI_SETTINGS_UI_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_ui/settings_ui.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SETTING_ID_PARAM_UTIL_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/setting_id_param_util.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_ROUTES_JS"
            file="settings_routes.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_CSS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page_css.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_SHARED_CSS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_shared_css.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SETTINGS_VARS_CSS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_vars_css.m.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SETTINGS_V3_HTML"
            file="settings_v3.html"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_V3_JS"
            file="settings.js"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SITE_FAVICON_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_favicon.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_ADD_SITE_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/add_site_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_ALL_SITES_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/all_sites.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_ALL_SITES_ICONS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/all_sites_icons.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <if expr="chromeos">
     <include name="IDR_SETTINGS_SITE_SETTINGS_ANDROID_INFO_BROWSER_PROXY_JS"
              file="site_settings/android_info_browser_proxy.js"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
   </if>
   <include name="IDR_SETTINGS_SITE_SETTINGS_CATEGORY_DEFAULT_SETTING_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/category_default_setting.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_CATEGORY_SETTING_EXCEPTIONS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/category_setting_exceptions.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_CHOOSER_EXCEPTION_LIST_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/chooser_exception_list.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_CHOOSER_EXCEPTION_LIST_ENTRY_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/chooser_exception_list_entry.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_CLEAR_STORAGE_DIALOG_CSS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/clear_storage_dialog_css.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_CONSTANTS_JS"
            file="site_settings/constants.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_COOKIE_INFO_JS"
            file="site_settings/cookie_info.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_EDIT_EXCEPTION_DIALOG_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/edit_exception_dialog.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_LOCAL_DATA_BROWSER_PROXY_JS"
            file="site_settings/local_data_browser_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_MEDIA_PICKER_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/media_picker.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_PDF_DOCUMENTS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/pdf_documents.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_PROTOCOL_HANDLERS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/protocol_handlers.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SETTINGS_CATEGORY_DEFAULT_RADIO_GROUP_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_DETAILS_SUBPAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data_details_subpage.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_ENTRY_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data_entry.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DETAILS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_details.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DETAILS_PERMISSION_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_details_permission.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_ENTRY_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_entry.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_LIST_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_list.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_LIST_ENTRY_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_list_entry.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_SETTINGS_BEHAVIOR_JS"
            file="site_settings/site_settings_behavior.js"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_JS"
            file="site_settings/site_settings_prefs_browser_proxy.js"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_WEBSITE_USAGE_BROWSER_PROXY_JS"
            file="site_settings/website_usage_browser_proxy.js"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/zoom_levels.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_PAGE_RECENT_SITE_PERMISSIONS_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings_page/recent_site_permissions.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_PAGE_SITE_SETTINGS_LIST_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings_page/site_settings_list.js"
            use_base_dir="false"
-           compress="false" type="BINDATA" />
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_PAGE_SITE_SETTINGS_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings_page/site_settings_page.js"
            use_base_dir="false"
-           compress="false" type="BINDATA"
+           type="BINDATA"
            preprocess="true" />
   <if expr="not chromeos">
     <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_BROWSER_PROXY_JS"
              file="printing_page/printing_browser_proxy.js"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
     <include name="IDR_SETTINGS_SYSTEM_PAGE_BROWSER_PROXY_JS"
              file="system_page/system_page_browser_proxy.js"
-             compress="false" type="BINDATA" />
+             type="BINDATA" />
     <include name="IDR_SETTINGS_SYSTEM_PAGE_JS"
              file="${root_gen_dir}/chrome/browser/resources/settings/system_page/system_page.js"
              use_base_dir="false"
-             compress="false" type="BINDATA"
+             type="BINDATA"
              preprocess="true" />
   </if>
 </grit-part>
diff --git a/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd b/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd
index aa1881dbc5d..2cdda10523e 100644
--- a/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd
+++ b/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd
@@ -55,16 +55,13 @@
       <include name="IDR_SETTINGS_SETTINGS_ROLLUP_JS"
                file="${root_gen_dir}\chrome\browser\resources\settings\settings.rollup.js"
                use_base_dir="false"
-               preprocess="true"
                type="BINDATA" />
       <include name="IDR_SETTINGS_LAZY_LOAD_ROLLUP_JS"
                file="${root_gen_dir}\chrome\browser\resources\settings\lazy_load.rollup.js"
-               preprocess="true"
                type="BINDATA"
                use_base_dir="false" />
       <include name="IDR_SETTINGS_SHARED_ROLLUP_JS"
                file="${root_gen_dir}\chrome\browser\resources\settings\shared.rollup.js"
-               preprocess="true"
                type="BINDATA"
                use_base_dir="false" />
     </includes>
diff --git a/chromium/chrome/browser/resources/settings/settings_ui/BUILD.gn b/chromium/chrome/browser/resources/settings/settings_ui/BUILD.gn
index a4f02adff5c..fa5b565c4e8 100644
--- a/chromium/chrome/browser/resources/settings/settings_ui/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/settings_ui/BUILD.gn
@@ -24,13 +24,13 @@ js_library("settings_ui") {
     "../settings_menu:settings_menu",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_container_shadow_behavior.m",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer.m",
     "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar.m",
     "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar_search_field.m",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:cr.m",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
     "//ui/webui/resources/js:util.m",
   ]
 }
diff --git a/chromium/chrome/browser/resources/settings/site_settings/BUILD.gn b/chromium/chrome/browser/resources/settings/site_settings/BUILD.gn
index 6099176e819..80edfed7013 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/site_settings/BUILD.gn
@@ -24,6 +24,7 @@ js_type_check("closure_compile_module") {
     ":media_picker",
     ":pdf_documents",
     ":protocol_handlers",
+    ":settings_category_default_radio_group",
     ":site_data",
     ":site_data_details_subpage",
     ":site_data_entry",
@@ -170,6 +171,19 @@ js_library("protocol_handlers") {
   ]
 }
 
+js_library("settings_category_default_radio_group") {
+  deps = [
+    ":constants",
+    ":site_settings_behavior",
+    "../controls:settings_radio_group.m",
+    "../privacy_page:collapse_radio_button",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
+  externs_list = [ "$externs_path/settings_private.js" ]
+}
+
 js_library("site_data") {
   deps = [
     ":local_data_browser_proxy",
@@ -332,6 +346,7 @@ html_to_js("web_components") {
     "media_picker.js",
     "pdf_documents.js",
     "protocol_handlers.js",
+    "settings_category_default_radio_group.js",
     "site_data.js",
     "site_data_details_subpage.js",
     "site_data_entry.js",