BASELINE: Update Chromium to 85.0.4183.14085-based

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

27 files changed, 867 insertions, 225 deletions

diff --git a/chromium/chrome/browser/resources/settings/BUILD.gn b/chromium/chrome/browser/resources/settings/BUILD.gn
index 4250f4fa750..a0a669d3b12 100644
--- a/chromium/chrome/browser/resources/settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/BUILD.gn
@@ -71,6 +71,7 @@ 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",
@@ -148,6 +149,7 @@ 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",
@@ -196,7 +198,6 @@ js_type_check("closure_compile_local_module") {
     ":metrics_browser_proxy",
     ":open_window_proxy",
     ":page_visibility",
-    ":plural_string_proxy",
     ":route",
     ":router.m",
     ":search_settings.m",
@@ -213,6 +214,8 @@ js_library("settings") {
     ":metrics_browser_proxy",
     ":open_window_proxy",
     "about_page:about_page_browser_proxy.m",
+    "autofill_page:multi_store_exception_entry",
+    "autofill_page:multi_store_password_ui_entry",
     "autofill_page:password_manager_proxy",
     "people_page:sync_browser_proxy.m",
     "privacy_page:privacy_page_browser_proxy.m",
@@ -278,10 +281,6 @@ js_library("page_visibility") {
   deps = [ "//ui/webui/resources/js:load_time_data.m" ]
 }
 
-js_library("plural_string_proxy") {
-  deps = [ "//ui/webui/resources/js:cr.m" ]
-}
-
 js_library("route") {
   deps = [
     ":page_visibility",
diff --git a/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn b/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn
index f48d5203d74..f74ab14757f 100644
--- a/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/autofill_page/BUILD.gn
@@ -16,6 +16,11 @@ js_type_check("closure_compile_module") {
     ":blocking_request_manager",
     ":credit_card_edit_dialog",
     ":credit_card_list_entry",
+    ":merge_exceptions_store_copies_behavior",
+    ":merge_passwords_store_copies_behavior",
+    ":multi_store_exception_entry",
+    ":multi_store_id_handler",
+    ":multi_store_password_ui_entry",
     ":password_check",
     ":password_check_behavior",
     ":password_check_edit_dialog",
@@ -24,8 +29,12 @@ js_type_check("closure_compile_module") {
     ":password_edit_dialog",
     ":password_list_item",
     ":password_manager_proxy",
+    ":password_move_to_account_dialog",
     ":password_remove_confirmation_dialog",
+    ":password_remove_dialog",
+    ":passwords_device_section",
     ":passwords_export_dialog",
+    ":passwords_list_handler",
     ":passwords_section",
     ":payments_list",
     ":payments_section",
@@ -100,9 +109,8 @@ js_library("password_check") {
     ":blocking_request_manager",
     ":password_check_behavior",
     ":password_manager_proxy",
-    "..:plural_string_proxy",
-    "../prefs:prefs_behavior.m",
     "..:route",
+    "../prefs:prefs_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
@@ -112,7 +120,7 @@ js_library("password_check") {
 js_library("password_check_behavior") {
   deps = [
     ":password_manager_proxy",
-    "..:plural_string_proxy",
+    "//ui/webui/resources/js:plural_string_proxy",
   ]
   externs_list = [ "$externs_path/passwords_private.js" ]
 }
@@ -152,6 +160,29 @@ js_library("password_edit_dialog") {
   ]
 }
 
+js_library("multi_store_password_ui_entry") {
+  sources = [ "multi_store_password_ui_entry.js" ]
+  deps = [
+    ":multi_store_id_handler",
+    ":password_manager_proxy",
+    "//ui/webui/resources/js:assert.m",
+  ]
+}
+
+js_library("multi_store_exception_entry") {
+  sources = [ "multi_store_exception_entry.js" ]
+  deps = [
+    ":multi_store_id_handler",
+    ":password_manager_proxy",
+    "//ui/webui/resources/js:assert.m",
+  ]
+}
+
+js_library("multi_store_id_handler") {
+  sources = [ "multi_store_id_handler.js" ]
+  deps = [ "//ui/webui/resources/js:assert.m" ]
+}
+
 js_library("password_remove_confirmation_dialog") {
   deps = [
     ":password_manager_proxy",
@@ -171,9 +202,50 @@ js_library("password_list_item") {
   ]
 }
 
+js_library("passwords_list_handler") {
+  deps = [
+    ":blocking_request_manager",
+    ":password_edit_dialog",
+    ":password_manager_proxy",
+    ":password_move_to_account_dialog",
+    ":password_remove_dialog",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
+    "//ui/webui/resources/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/cr/ui:focus_without_ink.m",
+  ]
+}
+
+js_library("password_move_to_account_dialog") {
+  deps = [
+    ":multi_store_password_ui_entry",
+    ":password_manager_proxy",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+}
+
 js_library("password_manager_proxy") {
   deps = [ "//ui/webui/resources/js:cr.m" ]
-  externs_list = [ "$externs_path/passwords_private.js" ]
+  externs_list =
+      chrome_extension_public_externs + [ "$externs_path/passwords_private.js" ]
+}
+
+js_library("password_remove_dialog") {
+  deps = [
+    ":multi_store_password_ui_entry",
+    "//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_checkbox:cr_checkbox.m",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+    "//ui/webui/resources/js:assert.m",
+  ]
 }
 
 js_library("passwords_export_dialog") {
@@ -185,21 +257,23 @@ js_library("passwords_export_dialog") {
 
 js_library("passwords_section") {
   deps = [
-    ":password_edit_dialog",
+    ":merge_exceptions_store_copies_behavior",
+    ":merge_passwords_store_copies_behavior",
+    ":multi_store_exception_entry",
+    ":multi_store_password_ui_entry",
     ":password_list_item",
     ":password_manager_proxy",
+    ":passwords_list_handler",
     "..:global_scroll_target_behavior.m",
-    "..:plural_string_proxy",
     "..:route",
+    "../people_page:profile_info_browser_proxy.m",
     "../people_page:sync_browser_proxy.m",
     "../prefs:prefs_behavior.m",
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
-    "//ui/webui/resources/cr_elements/cr_toast:cr_toast_manager.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:i18n_behavior.m",
-    "//ui/webui/resources/js:list_property_update_behavior.m",
     "//ui/webui/resources/js:util.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
@@ -210,6 +284,25 @@ js_library("passwords_section") {
   ]
 }
 
+js_library("passwords_device_section") {
+  deps = [
+    ":merge_passwords_store_copies_behavior",
+    ":multi_store_password_ui_entry",
+    ":password_list_item",
+    ":password_manager_proxy",
+    ":passwords_list_handler",
+    "..:i18n_setup",
+    "..:open_window_proxy",
+    "..:route",
+    "../people_page:profile_info_browser_proxy.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:icon.m",
+    "//ui/webui/resources/js:util.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
+  ]
+}
+
 js_library("payments_list") {
   deps = [
     ":credit_card_list_entry",
@@ -240,11 +333,29 @@ js_library("payments_section") {
 js_library("show_password_behavior") {
   deps = [
     ":blocking_request_manager",
+    ":multi_store_password_ui_entry",
     ":password_manager_proxy",
   ]
   externs_list = [ "$externs_path/passwords_private.js" ]
 }
 
+js_library("merge_passwords_store_copies_behavior") {
+  deps = [
+    ":multi_store_password_ui_entry",
+    ":password_manager_proxy",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:list_property_update_behavior.m",
+  ]
+}
+
+js_library("merge_exceptions_store_copies_behavior") {
+  deps = [
+    ":multi_store_exception_entry",
+    ":password_manager_proxy",
+    "//ui/webui/resources/js:assert.m",
+  ]
+}
+
 js_library("upi_id_list_entry") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -257,6 +368,7 @@ html_to_js("web_components") {
     "address_edit_dialog.js",
     "autofill_page.js",
     "autofill_section.js",
+    "passwords_list_handler.js",
     "credit_card_edit_dialog.js",
     "credit_card_list_entry.js",
     "password_check_edit_dialog.js",
@@ -264,10 +376,13 @@ html_to_js("web_components") {
     "password_check_list_item.js",
     "password_check.js",
     "password_edit_dialog.js",
+    "password_remove_dialog.js",
     "password_list_item.js",
+    "password_move_to_account_dialog.js",
     "password_remove_confirmation_dialog.js",
     "passwords_export_dialog.js",
     "passwords_section.js",
+    "passwords_device_section.js",
     "passwords_shared_css.js",
     "payments_list.js",
     "payments_section.js",
diff --git a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
index 2e345985162..9a49bb22976 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
@@ -8,11 +8,16 @@ import("//tools/grit/grit_rule.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("//ui/webui/webui_features.gni")
 import("../../optimize_webui.gni")
+import("./os_settings.gni")
 
 if (optimize_webui) {
   settings_pak_file = "os_settings_resources.pak"
   unpak_folder = "os_settings_resources.unpak"
 
+  # Put v3 unpacked files in a separate folder, to avoid a possible race
+  # between v2 and v3 build targets writing files to the same location.
+  unpak_folder_v3 = "os_settings_resources_v3.unpak"
+
   optimize_webui("build") {
     host = "os-settings"
     html_in_files = [
@@ -34,9 +39,7 @@ if (optimize_webui) {
       "chrome://resources/css/cros_colors.generated.css",
       "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html",
       "chrome://os-settings/app-management/app_management.mojom-lite.js",
-      "chrome://os-settings/app-management/bitmap.mojom-lite.js",
       "chrome://os-settings/app-management/file_path.mojom-lite.js",
-      "chrome://os-settings/app-management/image_info.mojom-lite.js",
       "chrome://os-settings/app-management/image.mojom-lite.js",
       "chrome://os-settings/app-management/types.mojom-lite.js",
       "chrome://os-settings/constants/routes.mojom-lite.js",
@@ -47,14 +50,70 @@ if (optimize_webui) {
       "chrome://resources/mojo/mojo/public/mojom/base/big_buffer.mojom.html",
       "chrome://resources/mojo/mojo/public/mojom/base/string16.mojom.html",
       "chrome://resources/mojo/mojo/public/mojom/base/time.mojom.html",
+      "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",
     ]
 
     deps = [ ":unpak" ]
   }
 
+  optimize_webui("build_polymer3") {
+    host = "os-settings"
+    input = rebase_path("$target_gen_dir/$unpak_folder_v3", root_build_dir)
+    js_out_files = [ "os_settings.rollup.js" ]
+    js_module_in_files = [ "chromeos/os_settings.js" ]
+
+    deps = [
+      ":unpak_v3",
+      "../../../../../ui/webui/resources:modulize",
+    ]
+    excludes = [
+      "chrome://resources/js/cr.m.js",
+      "chrome://resources/css/cros_colors.generated.css",
+      "chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js",
+      "chrome://resources/mojo/url/mojom/url.mojom-lite.js",
+      "app-management/app_management.mojom-lite.js",
+      "app-management/bitmap.mojom-lite.js",
+      "app-management/file_path.mojom-lite.js",
+      "app-management/image_info.mojom-lite.js",
+      "app-management/image.mojom-lite.js",
+      "app-management/types.mojom-lite.js",
+      "constants/routes.mojom-lite.js",
+      "constants/setting.mojom-lite.js",
+      "search/search.mojom-lite.js",
+      "search/search_result_icon.mojom-lite.js",
+      "search/user_action_recorder.mojom-lite.js",
+    ]
+  }
+
+  unpak_excludes = [
+    "../../ui/webui/settings/chromeos/constants/routes.mojom-lite.js",
+    "../../ui/webui/settings/chromeos/constants/setting.mojom-lite.js",
+    "../../../../mojo/public/mojom/base/file_path.mojom-lite.js",
+    "../../../../ui/gfx/image/mojom/image.mojom-lite.js",
+    "../../../../url/mojom/url.mojom-lite.js",
+    "../../ui/webui/app_management/app_management.mojom-lite.js",
+    "../../../../components/services/app_service/public/mojom/types.mojom-lite.js",
+    "../../ui/webui/settings/chromeos/search/search.mojom-lite.js",
+    "../../ui/webui/settings/chromeos/search/search_result_icon.mojom-lite.js",
+    "../../ui/webui/settings/chromeos/search/user_action_recorder.mojom-lite.js",
+  ]
+
+  unpak("unpak_v3") {
+    pak_file = settings_pak_file
+    out_folder = unpak_folder_v3
+    pak_base_dir = "../"
+    excludes = unpak_excludes
+
+    deps = [ ":flattened_resources" ]
+  }
+
   unpak("unpak") {
     pak_file = settings_pak_file
     out_folder = unpak_folder
+    pak_base_dir = "../"
+    excludes = unpak_excludes
 
     deps = [ ":flattened_resources" ]
   }
@@ -174,13 +233,15 @@ group("closure_compile_module") {
     # TODO: Uncomment as the Polymer3 migration makes progress.
     #":closure_compile_local_module",
     #"ambient_mode_page:closure_compile_module",
-    #"bluetooth_page:closure_compile_module",
+    "bluetooth_page:closure_compile_module",
+
     #"crostini_page:closure_compile_module",
     #"date_time_page:closure_compile_module",
     #"device_page:closure_compile_module",
     #"google_assistant_page:closure_compile_module",
     #"internet_page:closure_compile_module",
-    #"localized_link:closure_compile_module",
+    "localized_link:closure_compile_module",
+
     #"multidevice_page:closure_compile_module",
     #"os_a11y_page:closure_compile_module",
     #"os_about_page:closure_compile_module",
@@ -191,7 +252,8 @@ group("closure_compile_module") {
     #"os_people_page:closure_compile_module",
     #"os_printing_page:closure_compile_module",
     #"os_privacy_page:closure_compile_module",
-    #"os_reset_page:closure_compile_module",
+    "os_reset_page:closure_compile_module",
+
     #"os_search_page:closure_compile_module",
     #"os_settings_main:closure_compile_module",
     #"os_settings_menu:closure_compile_module",
@@ -204,28 +266,28 @@ group("closure_compile_module") {
   ]
 }
 
-# TODO: Uncomment as the Polymer3 migration makes progress.
-#js_type_check("closure_compile_local_module") {
-#  is_polymer3 = true
-#  deps = [
-#    ":metrics_recorder.m",
-#    ":os_icons.m",
-#    ":os_page_visibility.m",
-#    ":os_route.m",
-#    ":os_settings.m",
-#    ":os_settings_icons_css.m",
-#    ":os_settings_routes.m",
-#    ":route_origin_behavior.m",
-#    ":search_handler.m",
-#  ]
-#}
+js_type_check("closure_compile_local_module") {
+  is_polymer3 = true
+  deps = [
+    ":metrics_recorder.m",
+
+    #  ":os_icons.m",
+    #  ":os_page_visibility.m",
+    ":os_route.m",
+
+    #  ":os_settings.m",
+    #  ":os_settings_icons_css.m",
+    ":os_settings_routes.m",
+
+    #  ":route_origin_behavior.m",
+    #  ":search_handler.m",
+  ]
+}
 
 js_library("metrics_recorder.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/metrics_recorder.m.js" ]
-  deps = [
-    # TODO: Fill those in.
-  ]
-  extra_deps = [ ":metrics_recorder_module" ]
+  deps = [ "//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings_js_library_for_compile" ]
+  extra_deps = [ ":modulize" ]
 }
 
 js_library("os_icons.m") {
@@ -251,9 +313,13 @@ js_library("os_route.m") {
     "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_route.m.js",
   ]
   deps = [
-    # TODO: Fill those in.
+    ":os_settings_routes.m",
+    "..:router.m",
+    "//chrome/browser/ui/webui/settings/chromeos/constants:mojom_js_library_for_compile",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:load_time_data.m",
   ]
-  extra_deps = [ ":os_route_module" ]
+  extra_deps = [ ":modulize" ]
 }
 
 js_library("os_settings_icons_css.m") {
@@ -266,9 +332,7 @@ js_library("os_settings_icons_css.m") {
 
 js_library("os_settings_routes.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_settings_routes.m.js" ]
-  deps = [
-    # TODO: Fill those in.
-  ]
+  deps = [ "//ui/webui/resources/js:load_time_data.m" ]
   extra_deps = [ ":modulize" ]
 }
 
@@ -323,19 +387,21 @@ group("polymer3_elements") {
     "personalization_page:polymer3_elements",
 
     # Local targets
-    ":metrics_recorder_module",
     ":modulize",
     ":os_icons_module",
     ":os_page_visibility_module",
-    ":os_route_module",
     ":os_settings_icons_css_module",
-  ]
-}
 
-polymer_modulizer("metrics_recorder") {
-  js_file = "metrics_recorder.js"
-  html_file = "metrics_recorder.html"
-  html_type = "dom-module"
+    # Shared with browser settings
+    "..:modulize",
+    "..:settings_shared_css_module",
+    "..:settings_vars_css_module",
+    "../nearby_share_page:polymer3_elements",
+    "../prefs:modulize",
+    "../prefs:prefs_module",
+    "../settings_page:settings_animated_pages_module",
+    "../settings_page:settings_subpage_module",
+  ]
 }
 
 polymer_modulizer("os_icons") {
@@ -350,12 +416,6 @@ polymer_modulizer("os_page_visibility") {
   html_type = "dom-module"
 }
 
-polymer_modulizer("os_route") {
-  js_file = "os_route.js"
-  html_file = "os_route.html"
-  html_type = "dom-module"
-}
-
 polymer_modulizer("os_settings_icons_css") {
   js_file = "os_settings_icons_css.m.js"
   html_file = "os_settings_icons_css.html"
@@ -364,8 +424,11 @@ polymer_modulizer("os_settings_icons_css") {
 
 js_modulizer("modulize") {
   input_files = [
+    "metrics_recorder.js",
     "os_settings_routes.js",
     "route_origin_behavior.js",
     "search_handler.js",
+    "os_route.js",
   ]
+  namespace_rewrites = os_settings_namespace_rewrites
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/ambient_mode_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/ambient_mode_page/BUILD.gn
index 3e19c60857f..71795b20191 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
@@ -8,31 +8,54 @@ js_type_check("closure_compile") {
   deps = [
     ":ambient_mode_browser_proxy",
     ":ambient_mode_page",
+    ":ambient_mode_photos_page",
+    ":constants",
   ]
 }
 
 js_library("ambient_mode_browser_proxy") {
-  deps = [ "//ui/webui/resources/js:cr" ]
+  deps = [
+    ":constants",
+    "//ui/webui/resources/js:cr",
+  ]
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
 
 js_library("ambient_mode_page") {
   deps = [
     ":ambient_mode_browser_proxy",
+    ":constants",
+    "..:os_route",
+    "../..:router",
     "../../prefs:prefs_behavior",
     "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:i18n_behavior",
-    "//ui/webui/resources/js:load_time_data",
     "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
 }
 
+js_library("ambient_mode_photos_page") {
+  deps = [
+    ":ambient_mode_browser_proxy",
+    ":constants",
+    "..:os_route",
+    "../..:router",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:i18n_behavior",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
+  ]
+}
+
+js_library("constants") {
+}
+
 # TODO: Uncomment as the Polymer3 migration makes progress.
 #js_type_check("closure_compile_module") {
 #  is_polymer3 = true
 #  deps = [
 #    ":ambient_mode_browser_proxy.m",
-#    ":ambient_mode_page.m"
+#    ":ambient_mode_page.m",
+#    ":ambient_mode_photos_page.m",
 #  ]
 #}
 
@@ -52,11 +75,20 @@ js_library("ambient_mode_page.m") {
   extra_deps = [ ":ambient_mode_page_module" ]
 }
 
+js_library("ambient_mode_photos_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/ambient_mode_page/ambient_mode_photos_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":ambient_mode_photos_page_module" ]
+}
+
 import("//tools/polymer/polymer.gni")
 
 group("polymer3_elements") {
   public_deps = [
     ":ambient_mode_page_module",
+    ":ambient_mode_photos_page_module",
     ":modulize",
   ]
 }
@@ -67,8 +99,17 @@ polymer_modulizer("ambient_mode_page") {
   html_type = "dom-module"
 }
 
+polymer_modulizer("ambient_mode_photos_page") {
+  js_file = "ambient_mode_photos_page.js"
+  html_file = "ambient_mode_photos_page.html"
+  html_type = "dom-module"
+}
+
 import("//ui/webui/resources/tools/js_modulizer.gni")
 
 js_modulizer("modulize") {
-  input_files = [ "ambient_mode_browser_proxy.js" ]
+  input_files = [
+    "ambient_mode_browser_proxy.js",
+    "constants.js",
+  ]
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
index a3432524ed1..9d36108f851 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/bluetooth_page/BUILD.gn
@@ -3,6 +3,8 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+import("../os_settings.gni")
 
 js_type_check("closure_compile") {
   deps = [
@@ -14,11 +16,11 @@ js_type_check("closure_compile") {
 
 js_library("bluetooth_page") {
   deps = [
-    ":bluetooth_system_on_extensions",
     "..:os_route",
     "../..:router",
     "../../prefs:prefs_behavior",
     "../../settings_page:settings_animated_pages",
+    "//services/device/public/mojom:mojom_js_library_for_compile",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:i18n_behavior",
   ]
@@ -34,20 +36,20 @@ js_library("bluetooth_page") {
 
 js_library("bluetooth_subpage") {
   deps = [
-    ":bluetooth_system_on_extensions",
     "..:metrics_recorder",
     "..:os_route",
     "../..:router",
-    "//ui/webui/resources/cr_components/chromeos:bluetooth_dialog",
+    "//services/device/public/mojom:mojom_js_library_for_compile",
+    "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_dialog",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior",
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:list_property_update_behavior",
   ]
-  externs_list = [
-    "$externs_path/bluetooth.js",
-    "$externs_path/bluetooth_private.js",
-  ]
+  externs_list = chrome_extension_public_externs + [
+                   "$externs_path/bluetooth.js",
+                   "$externs_path/bluetooth_private.js",
+                 ]
   extra_sources = [
     "$interfaces_path/bluetooth_interface.js",
     "$interfaces_path/bluetooth_private_interface.js",
@@ -56,7 +58,7 @@ js_library("bluetooth_subpage") {
 
 js_library("bluetooth_device_list_item") {
   deps = [
-    ":bluetooth_system_on_extensions",
+    "//services/device/public/mojom:mojom_js_library_for_compile",
     "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior",
@@ -64,33 +66,42 @@ js_library("bluetooth_device_list_item") {
   externs_list = [ "$externs_path/bluetooth.js" ]
 }
 
-js_library("bluetooth_system_on_extensions") {
-  sources = []
-  deps = [ "//services/device/public/mojom:mojom_js_library_for_compile" ]
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [
+    ":bluetooth_device_list_item.m",
+    ":bluetooth_page.m",
+    ":bluetooth_subpage.m",
+  ]
 }
 
-# TODO: Uncomment as the Polymer3 migration makes progress.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [
-#    ":bluetooth_device_list_item.m",
-#    ":bluetooth_page.m",
-#    ":bluetooth_subpage.m"
-#  ]
-#}
-
 js_library("bluetooth_device_list_item.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_device_list_item.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "//services/device/public/mojom:mojom_js_library_for_compile",
+    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
+  externs_list = [ "$externs_path/bluetooth.js" ]
   extra_deps = [ ":bluetooth_device_list_item_module" ]
 }
 
 js_library("bluetooth_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_page.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":bluetooth_subpage.m",
+    "..:os_route.m",
+    "../..:router.m",
+    "../../prefs:prefs_behavior.m",
+    "../../settings_page:settings_animated_pages.m",
+    "//services/device/public/mojom:mojom_js_library_for_compile",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  externs_list = [
+    "$externs_path/bluetooth.js",
+    "$externs_path/bluetooth_private.js",
   ]
   extra_deps = [ ":bluetooth_page_module" ]
 }
@@ -98,13 +109,24 @@ js_library("bluetooth_page.m") {
 js_library("bluetooth_subpage.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_subpage.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "..:metrics_recorder.m",
+    "..:os_route.m",
+    "../..:router.m",
+    "//services/device/public/mojom:mojom_js_library_for_compile",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_dialog.m",
+    "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:list_property_update_behavior.m",
+  ]
+  externs_list = [
+    "$externs_path/bluetooth.js",
+    "$externs_path/bluetooth_private.js",
   ]
   extra_deps = [ ":bluetooth_subpage_module" ]
 }
 
-import("//tools/polymer/polymer.gni")
-
 group("polymer3_elements") {
   public_deps = [
     ":bluetooth_device_list_item_module",
@@ -117,16 +139,25 @@ polymer_modulizer("bluetooth_device_list_item") {
   js_file = "bluetooth_device_list_item.js"
   html_file = "bluetooth_device_list_item.html"
   html_type = "dom-module"
+  migrated_imports = os_settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("bluetooth_page") {
   js_file = "bluetooth_page.js"
   html_file = "bluetooth_page.html"
   html_type = "dom-module"
+  migrated_imports = os_settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("bluetooth_subpage") {
   js_file = "bluetooth_subpage.js"
   html_file = "bluetooth_subpage.html"
   html_type = "dom-module"
+  migrated_imports = os_settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
index 8da221484d9..abf46959d3f 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
@@ -12,6 +12,7 @@ js_type_check("closure_compile") {
     ":crostini_export_import",
     ":crostini_page",
     ":crostini_port_forwarding",
+    ":crostini_port_forwarding_add_port_dialog",
     ":crostini_shared_paths",
     ":crostini_shared_usb_devices",
     ":crostini_subpage",
@@ -92,6 +93,14 @@ js_library("crostini_port_forwarding") {
   ]
 }
 
+js_library("crostini_port_forwarding_add_port_dialog") {
+  deps = [
+    ":crostini_browser_proxy",
+    "..:metrics_recorder",
+    "//ui/webui/resources/js:cr",
+  ]
+}
+
 js_library("crostini_subpage") {
   deps = [
     ":crostini_browser_proxy",
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 4d73c447751..3bfa5759c96 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
@@ -8,6 +8,7 @@ js_type_check("closure_compile") {
   deps = [
     ":date_time_page",
     ":date_time_types",
+    ":timezone_browser_proxy",
     ":timezone_selector",
     ":timezone_subpage",
   ]
@@ -17,7 +18,6 @@ js_library("date_time_page") {
   deps = [
     ":date_time_types",
     ":timezone_selector",
-    ":timezone_subpage",
     "..:os_route",
     "../..:router",
     "../../prefs:prefs_behavior",
@@ -33,6 +33,10 @@ js_library("date_time_types") {
   deps = [ "//ui/webui/resources/js:cr" ]
 }
 
+js_library("timezone_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr" ]
+}
+
 js_library("timezone_selector") {
   deps = [
     ":date_time_types",
@@ -46,6 +50,7 @@ js_library("timezone_selector") {
 js_library("timezone_subpage") {
   deps = [
     ":date_time_types",
+    ":timezone_browser_proxy",
     ":timezone_selector",
     "../../prefs:prefs_behavior",
     "//ui/webui/resources/js:cr",
@@ -58,6 +63,7 @@ js_library("timezone_subpage") {
 #  deps = [
 #    ":date_time_page.m",
 #    ":date_time_types.m",
+#    ":timezone_browser_proxy.m",
 #    ":timezone_selector.m",
 #    ":timezone_subpage.m"
 #  ]
@@ -79,6 +85,14 @@ js_library("date_time_types.m") {
   extra_deps = [ ":date_time_types_module" ]
 }
 
+js_library("timezone_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/date_time_page/timezone_browser_proxy.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
 js_library("timezone_selector.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/date_time_page/timezone_selector.m.js" ]
   deps = [
@@ -101,6 +115,7 @@ group("polymer3_elements") {
   public_deps = [
     ":date_time_page_module",
     ":date_time_types_module",
+    ":modulize",
     ":timezone_selector_module",
     ":timezone_subpage_module",
   ]
@@ -129,3 +144,9 @@ polymer_modulizer("timezone_subpage") {
   html_file = "timezone_subpage.html"
   html_type = "dom-module"
 }
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [ "timezone_browser_proxy.js" ]
+}
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 a9273bb0410..56c8f9e9eab 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
@@ -82,10 +82,10 @@ js_library("display") {
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js/cr/ui:focus_without_ink",
   ]
-  externs_list = [
-    "$externs_path/settings_private.js",
-    "$externs_path/system_display.js",
-  ]
+  externs_list = chrome_extension_public_externs + [
+                   "$externs_path/settings_private.js",
+                   "$externs_path/system_display.js",
+                 ]
   extra_sources = [ "$interfaces_path/system_display_interface.js" ]
 }
 
diff --git a/chromium/chrome/browser/resources/settings/chromeos/localized_link/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/localized_link/BUILD.gn
index 7bd578dc434..2f90cb59d16 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/localized_link/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/localized_link/BUILD.gn
@@ -3,6 +3,9 @@
 # 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("../os_settings.gni")
 
 js_type_check("closure_compile") {
   deps = [ ":localized_link" ]
@@ -12,24 +15,20 @@ js_library("localized_link") {
   deps = [ "//ui/webui/resources/js:assert" ]
 }
 
-# TODO: Uncomment as the Polymer3 migration makes progress.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [
-#    ":localized_link.m"
-#  ]
-#}
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [ ":localized_link.m" ]
+}
 
 js_library("localized_link.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/localized_link/localized_link.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
   ]
   extra_deps = [ ":localized_link_module" ]
 }
 
-import("//tools/polymer/polymer.gni")
-
 group("polymer3_elements") {
   public_deps = [ ":localized_link_module" ]
 }
@@ -38,4 +37,8 @@ polymer_modulizer("localized_link") {
   js_file = "localized_link.js"
   html_file = "localized_link.html"
   html_type = "dom-module"
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports =
+      os_settings_auto_imports +
+      [ "ui/webui/resources/html/assert.html|assert,assertNotReached" ]
 }
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 238c338b802..fb41281d966 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/multidevice_page/BUILD.gn
@@ -63,6 +63,7 @@ js_library("multidevice_page") {
     "..:os_route",
     "../..:router",
     "../../controls:password_prompt_dialog",
+    "../../prefs:prefs_behavior",
     "../localized_link:localized_link",
     "//ui/webui/resources/js:cr",
     "//ui/webui/resources/js:web_ui_listener_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 3c63e8b8004..a3971b9ff9b 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
@@ -18,9 +18,13 @@ js_library("plugin_vm_browser_proxy") {
 
 js_library("plugin_vm_detail_view") {
   deps = [
+    ":plugin_vm_browser_proxy",
+    ":plugin_vm_permission_dialog",
     "../:constants",
+    "../:permission_item",
     "../:store_client",
     "../:util",
+    "//ui/webui/resources/js:web_ui_listener_behavior",
   ]
 }
 
@@ -31,6 +35,10 @@ js_library("plugin_vm_shared_paths") {
   ]
 }
 
+js_library("plugin_vm_permission_dialog") {
+  deps = [ ":plugin_vm_browser_proxy" ]
+}
+
 # TODO: Uncomment as the Polymer3 migration makes progress.
 #js_type_check("closure_compile_module") {
 #  is_polymer3 = true
@@ -71,6 +79,7 @@ group("polymer3_elements") {
   public_deps = [
     ":modulize",
     ":plugin_vm_detail_view_module",
+    ":plugin_vm_permission_dialog_module",
     ":plugin_vm_shared_paths_module",
   ]
 }
@@ -81,6 +90,12 @@ polymer_modulizer("plugin_vm_detail_view") {
   html_type = "dom-module"
 }
 
+polymer_modulizer("plugin_vm_permission_dialog") {
+  js_file = "plugin_vm_permission_dialog.js"
+  html_file = "plugin_vm_permission_dialog.html"
+  html_type = "dom-module"
+}
+
 polymer_modulizer("plugin_vm_shared_paths") {
   js_file = "plugin_vm_shared_paths.js"
   html_file = "plugin_vm_shared_paths.html"
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 1af53f2340e..6f55d8d266b 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
@@ -3,9 +3,13 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//ui/webui/resources/tools/js_modulizer.gni")
+import("../os_settings.gni")
 
 js_type_check("closure_compile") {
   deps = [
+    ":input_method_options_page",
+    ":input_method_util",
     ":manage_input_methods_page",
     ":os_add_languages_dialog",
     ":os_languages_page",
@@ -16,6 +20,20 @@ js_type_check("closure_compile") {
   ]
 }
 
+js_library("input_method_options_page") {
+  deps = [
+    ":input_method_util",
+    "../..:router",
+    "../../languages_page:languages_types",
+    "../../prefs",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+}
+
+js_library("input_method_util") {
+  deps = [ "//ui/webui/resources/js:cr" ]
+}
+
 js_library("manage_input_methods_page") {
   deps = [
     "../../languages_page:languages_types",
@@ -26,6 +44,7 @@ js_library("manage_input_methods_page") {
 
 js_library("os_languages_section") {
   deps = [
+    ":input_method_options_page",
     ":manage_input_methods_page",
     ":os_languages_page",
     "..:os_route",
@@ -43,6 +62,7 @@ js_library("os_languages_section") {
 
 js_library("os_languages_page") {
   deps = [
+    ":input_method_util",
     "..:metrics_recorder",
     "..:os_route",
     "../..:lifetime_browser_proxy",
@@ -73,6 +93,8 @@ js_library("os_add_languages_dialog") {
 #js_type_check("closure_compile_module") {
 #  is_polymer3 = true
 #  deps = [
+#    ":input_method_options_page.m",
+#    ":input_method_util.m",
 #    ":manage_input_methods_page.m",
 #    ":os_add_languages_dialog.m",
 #    ":os_languages_page.m",
@@ -80,6 +102,22 @@ js_library("os_add_languages_dialog") {
 #  ]
 #}
 
+js_library("input_method_util.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("input_method_options_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_options_page.m.js" ]
+  deps = [
+    # TODO: Fill those in.
+  ]
+  extra_deps = [ ":input_method_options_page_module" ]
+}
+
 js_library("manage_input_methods_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_languages_page/manage_input_methods_page.m.js" ]
   deps = [
@@ -116,7 +154,9 @@ import("//tools/polymer/polymer.gni")
 
 group("polymer3_elements") {
   public_deps = [
+    ":input_method_options_page_module",
     ":manage_input_methods_page_module",
+    ":modulize",
     ":os_add_languages_dialog_module",
     ":os_languages_page_module",
     ":os_languages_section_module",
@@ -146,3 +186,14 @@ polymer_modulizer("os_languages_section") {
   html_file = "os_languages_section.html"
   html_type = "dom-module"
 }
+
+polymer_modulizer("input_method_options_page") {
+  js_file = "input_method_options_page.js"
+  html_file = "input_method_options_page.html"
+  html_type = "dom-module"
+}
+
+js_modulizer("modulize") {
+  input_files = [ "input_method_util.js" ]
+  namespace_rewrites = os_settings_namespace_rewrites
+}
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 f89ff3750c3..32e7bbe7959 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
@@ -9,8 +9,10 @@ js_type_check("closure_compile") {
 }
 
 js_library("os_privacy_page") {
-  deps =
-      [ "//chrome/browser/resources/settings/controls:settings_toggle_button" ]
+  deps = [
+    "//chrome/browser/resources/settings/controls:settings_toggle_button",
+    "//ui/webui/resources/js:load_time_data",
+  ]
 }
 
 # TODO: Uncomment as the Polymer3 migration makes progress.
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_reset_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_reset_page/BUILD.gn
index cf97405216f..e05a9896a07 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_reset_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_reset_page/BUILD.gn
@@ -3,6 +3,9 @@
 # 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("../os_settings.gni")
 
 js_type_check("closure_compile") {
   deps = [
@@ -25,6 +28,7 @@ js_library("os_reset_page") {
   deps = [
     "//ui/webui/resources/js:assert",
     "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:load_time_data",
     "//ui/webui/resources/js/cr/ui:focus_without_ink",
   ]
 }
@@ -34,20 +38,23 @@ js_library("os_reset_browser_proxy") {
   externs_list = [ "$externs_path/chrome_send.js" ]
 }
 
-# TODO: Uncomment as the Polymer3 migration makes progress.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [
-#    ":os_powerwash_dialog.m",
-#    ":os_reset_browser_proxy.m",
-#    ":os_reset_page.m"
-#  ]
-#}
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [
+    ":os_powerwash_dialog.m",
+    ":os_reset_browser_proxy.m",
+    ":os_reset_page.m",
+  ]
+}
 
 js_library("os_powerwash_dialog.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_reset_page/os_powerwash_dialog.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":os_reset_browser_proxy.m",
+    "..:metrics_recorder.m",
+    "../..:lifetime_browser_proxy.m",
+    "../localized_link:localized_link.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   extra_deps = [ ":os_powerwash_dialog_module" ]
 }
@@ -55,7 +62,8 @@ js_library("os_powerwash_dialog.m") {
 js_library("os_reset_browser_proxy.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_browser_proxy.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:cr.m",
   ]
   extra_deps = [ ":modulize" ]
 }
@@ -63,13 +71,14 @@ js_library("os_reset_browser_proxy.m") {
 js_library("os_reset_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_page.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
   extra_deps = [ ":os_reset_page_module" ]
 }
 
-import("//tools/polymer/polymer.gni")
-
 group("polymer3_elements") {
   public_deps = [
     ":modulize",
@@ -82,16 +91,21 @@ polymer_modulizer("os_powerwash_dialog") {
   js_file = "os_powerwash_dialog.js"
   html_file = "os_powerwash_dialog.html"
   html_type = "dom-module"
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports
 }
 
 polymer_modulizer("os_reset_page") {
   js_file = "os_reset_page.js"
   html_file = "os_reset_page.html"
   html_type = "dom-module"
+  migrated_imports = settings_migrated_imports
+  namespace_rewrites = os_settings_namespace_rewrites
+  auto_imports = os_settings_auto_imports +
+                 [ "ui/webui/resources/html/assert.html|assert" ]
 }
 
-import("//ui/webui/resources/tools/js_modulizer.gni")
-
 js_modulizer("modulize") {
   input_files = [ "os_reset_browser_proxy.js" ]
+  namespace_rewrites = os_settings_namespace_rewrites
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
new file mode 100644
index 00000000000..400b8e0059e
--- /dev/null
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
@@ -0,0 +1,24 @@
+# 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("../settings.gni")
+
+os_settings_namespace_rewrites =
+    settings_namespace_rewrites + [
+      "settings.OsResetBrowserProxy|OsResetBrowserProxy",
+      "settings.recordSettingChange|recordSettingChange",
+    ]
+
+os_settings_auto_imports = settings_auto_imports + [
+                             "chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_browser_proxy.html|OsResetBrowserProxy,OsResetBrowserProxyImpl",
+                             "chrome/browser/resources/settings/chromeos/metrics_recorder.html|recordSettingChange",
+                             "chrome/browser/resources/settings/lifetime_browser_proxy.html|LifetimeBrowserProxy,LifetimeBrowserProxyImpl",
+                             "chrome/browser/resources/settings/chromeos/os_route.html|routes",
+                             "chrome/browser/resources/settings/route.html|routes",
+                             "chrome/browser/resources/settings/router.html|Router,Route,RouteObserverBehavior",
+                             "ui/webui/resources/html/polymer.html|Polymer,html,flush",
+                           ]
+
+os_settings_migrated_imports = settings_migrated_imports
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings_page/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_settings_page/BUILD.gn
index f9e55626477..7afa56ffe1d 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings_page/BUILD.gn
@@ -14,7 +14,6 @@ js_library("os_settings_page") {
     "..:os_route",
     "../..:router",
     "../..:search_settings",
-    "../../prefs:prefs_behavior",
     "../../settings_page:main_page_behavior",
     "../os_apps_page:android_apps_browser_proxy",
     "//ui/webui/resources/js:load_time_data",
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 db555e9d3a1..c764effbb47 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
@@ -1,13 +1,137 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
- <include name="IDR_OS_SETTINGS_SEARCH_HANDLER_M_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/search_handler.m.js"
+  <include name="IDR_OS_SETTINGS_RESET_BROWSER_PROXY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_browser_proxy.m.js"
            use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_RESET_POWERWASH_DIALOG_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_reset_page/os_powerwash_dialog.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_RESET_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_BLUETOOTH_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_page.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_BLUETOOTH_SUBPAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_subpage.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/bluetooth_page/bluetooth_device_list_item.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_LOCALIZED_LINK_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/localized_link/localized_link.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_METRIC_RECORDER_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/metrics_recorder.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+ <include name="IDR_OS_SETTINGS_OS_ICONS_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_icons.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_SETTINGS_OS_ROUTE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_route.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+   <include name="IDR_OS_SETTINGS_SETTINGS_OS_SETTINGS_ROUTE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/os_settings_routes.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_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"/>
+  <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"
+           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"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_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" />
+  <include name="IDR_OS_SETTINGS_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" />
+  <include name="IDR_OS_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"
+           preprocess="true"
+           type="BINDATA"/>
+  <include name="IDR_OS_SETTINGS_PREFS_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA"/>
+  <include name="IDR_OS_SETTINGS_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"/>
+  <include name="IDR_OS_SETTINGS_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"/>
+  <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"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_ROUTER_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/router.m.js"
+           use_base_dir="false"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_SETTINGS_SETTINGS_SHARED_CSS_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_shared_css.m.js"
+           use_base_dir="false"
+           preprocess="true"
+           compress="false"
+           type="BINDATA" />
+  <include name="IDR_OS_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" />
+  <include name="IDR_OS_SETTINGS_I18N_SETUP_JS"
+           file="i18n_setup.js"
+           compress="false"
            type="BINDATA" />
   <include name="IDR_OS_SETTINGS_SETTINGS_V3_HTML"
            file="chromeos/os_settings_v3.html"
+           compress="false"
            type="BINDATA" />
   <include name="IDR_OS_SETTINGS_SETTINGS_V3_JS"
            file="chromeos/os_settings.js"
+           compress="false"
            type="BINDATA" />
-</grit-part>
\ No newline at end of file
+</grit-part>
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings_search_box/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/os_settings_search_box/BUILD.gn
index a206a3b623f..71f87b6c7d0 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings_search_box/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings_search_box/BUILD.gn
@@ -22,6 +22,7 @@ js_library("os_settings_search_box") {
     "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar_search_field",
     "//ui/webui/resources/js:assert",
   ]
+  externs_list = [ "$externs_path/metrics_private.js" ]
 }
 
 js_library("os_search_result_row") {
@@ -34,6 +35,7 @@ js_library("os_search_result_row") {
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js/cr/ui:focus_row_behavior",
   ]
+  externs_list = [ "$externs_path/metrics_private.js" ]
 }
 
 # TODO: Uncomment as the Polymer3 migration makes progress.
@@ -51,6 +53,7 @@ js_library("os_search_result_row.m") {
     # TODO: Fill those in.
   ]
   extra_deps = [ ":os_search_result_row_module" ]
+  externs_list = [ "$externs_path/metrics_private.js" ]
 }
 
 js_library("os_settings_search_box.m") {
@@ -59,6 +62,7 @@ js_library("os_settings_search_box.m") {
     # TODO: Fill those in.
   ]
   extra_deps = [ ":os_settings_search_box_module" ]
+  externs_list = [ "$externs_path/metrics_private.js" ]
 }
 
 import("//tools/polymer/polymer.gni")
diff --git a/chromium/chrome/browser/resources/settings/controls/BUILD.gn b/chromium/chrome/browser/resources/settings/controls/BUILD.gn
index 69216da31e1..506ca163505 100644
--- a/chromium/chrome/browser/resources/settings/controls/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/controls/BUILD.gn
@@ -57,7 +57,8 @@ js_library("password_prompt_dialog") {
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
     "//ui/webui/resources/cr_elements/cr_input:cr_input",
   ]
-  externs_list = [ "$externs_path/quick_unlock_private.js" ]
+  externs_list = chrome_extension_public_externs +
+                 [ "$externs_path/quick_unlock_private.js" ]
   extra_sources = [ "$interfaces_path/quick_unlock_private_interface.js" ]
 }
 
@@ -183,7 +184,8 @@ js_library("password_prompt_dialog.m") {
     "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
     "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
   ]
-  externs_list = [ "$externs_path/quick_unlock_private.js" ]
+  externs_list = chrome_extension_public_externs +
+                 [ "$externs_path/quick_unlock_private.js" ]
   extra_deps = [ ":password_prompt_dialog_module" ]
 }
 
diff --git a/chromium/chrome/browser/resources/settings/nearby_share_page/BUILD.gn b/chromium/chrome/browser/resources/settings/nearby_share_page/BUILD.gn
new file mode 100644
index 00000000000..81c2a5030f6
--- /dev/null
+++ b/chromium/chrome/browser/resources/settings/nearby_share_page/BUILD.gn
@@ -0,0 +1,54 @@
+# 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("../settings.gni")
+
+js_type_check("closure_compile") {
+  deps = [ ":nearby_share_subpage" ]
+}
+
+js_library("nearby_share_subpage") {
+  deps = [
+    "../prefs",
+    "../prefs:prefs_behavior",
+    "../prefs:prefs_types",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:i18n_behavior",
+  ]
+}
+
+group("polymer3_elements") {
+  public_deps = [
+    "../controls:polymer3_elements",
+    "../prefs:polymer3_elements",
+    ":nearby_share_subpage_module",
+  ]
+}
+
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [ ":nearby_share_subpage.m" ]
+}
+
+js_library("nearby_share_subpage.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/nearby_share_page/nearby_share_subpage.m.js" ]
+  deps = [
+    "../prefs:prefs.m",
+    "../prefs:prefs_behavior.m",
+    "../prefs:prefs_types.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+  ]
+  extra_deps = [ ":nearby_share_subpage_module" ]
+}
+
+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
+}
diff --git a/chromium/chrome/browser/resources/settings/os_settings_resources.grd b/chromium/chrome/browser/resources/settings/os_settings_resources.grd
index cf80563c962..4e4138f4717 100644
--- a/chromium/chrome/browser/resources/settings/os_settings_resources.grd
+++ b/chromium/chrome/browser/resources/settings/os_settings_resources.grd
@@ -25,18 +25,10 @@
                compress="false" type="BINDATA" />
 
       <!-- App Management -->
-      <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_BITMAP_MOJO_LITE_JS"
-               file="${root_gen_dir}\skia\public\mojom\bitmap.mojom-lite.js"
-               use_base_dir="false"
-               compress="false" type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_FILE_PATH_MOJO_LITE_JS"
                file="${root_gen_dir}\mojo\public\mojom\base\file_path.mojom-lite.js"
                use_base_dir="false"
                compress="false" type="BINDATA" />
-      <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_IMAGE_INFO_MOJO_LITE_JS"
-               file="${root_gen_dir}\skia\public\mojom\image_info.mojom-lite.js"
-               use_base_dir="false"
-               compress="false" type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_IMAGE_MOJO_LITE_JS"
                file="${root_gen_dir}\ui\gfx\image\mojom\image.mojom-lite.js"
                use_base_dir="false"
@@ -46,7 +38,7 @@
                use_base_dir="false"
                compress="false" type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_TYPES_MOJO_LITE_JS"
-               file="${root_gen_dir}\chrome\services\app_service\public\mojom\types.mojom-lite.js"
+               file="${root_gen_dir}\components\services\app_service\public\mojom\types.mojom-lite.js"
                use_base_dir="false"
                compress="false" type="BINDATA" />
 
@@ -77,18 +69,30 @@
       <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_AMBIENT_MODE_PAGE_AMBIENT_MODE_PAGE_JS"
+      <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_JS"
                  file="chromeos/ambient_mode_page/ambient_mode_page.js"
                  compress="false" type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_AMBIENT_MODE_PAGE_HTML"
+      <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_HTML"
                  file="chromeos/ambient_mode_page/ambient_mode_page.html"
                  compress="false" type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_AMBIENT_MODE_BROWSER_PROXY_JS"
+      <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PHOTOS_PAGE_JS"
+                 file="chromeos/ambient_mode_page/ambient_mode_photos_page.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PHOTOS_PAGE_HTML"
+                 file="chromeos/ambient_mode_page/ambient_mode_photos_page.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_BROWSER_PROXY_JS"
                  file="chromeos/ambient_mode_page/ambient_mode_browser_proxy.js"
                  compress="false" type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_AMBIENT_MODE_BROWSER_PROXY_HTML"
+      <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_BROWSER_PROXY_HTML"
                  file="chromeos/ambient_mode_page/ambient_mode_browser_proxy.html"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_AMBIENT_CONSTANTS_JS"
+                 file="chromeos/ambient_mode_page/constants.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_AMBIENT_CONSTANTS_HTML"
+                 file="chromeos/ambient_mode_page/constants.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_APPS_PAGE_JS"
                  file="chromeos/os_apps_page/os_apps_page.js"
                  compress="false" type="chrome_html" />
@@ -248,6 +252,12 @@
       <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_BROWSER_PROXY_HTML"
                 file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_browser_proxy.html"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_PERMISSION_DIALOG_JS"
+                file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_permission_dialog.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PLUGIN_VM_PERMISSION_DIALOG_HTML"
+                file="chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_permission_dialog.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CAPTIONS_SUBPAGE_JS"
                  file="a11y_page/captions_subpage.js"
                  compress="false" type="chrome_html" />
@@ -349,6 +359,9 @@
                  file="lifetime_browser_proxy.js"
                  compress="false" type="chrome_html"
                  preprocess="true" />
+      <structure name="IDR_OS_SETTINGS_SEARCH_SETTINGS_HTML"
+                 file="search_settings.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SEARCH_SETTINGS_JS"
                  file="search_settings.js"
                  compress="false" type="chrome_html" />
@@ -375,7 +388,8 @@
                  compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_CR_SETTINGS_SUBPAGE_JS"
                  file="settings_page/settings_subpage.js"
-                 compress="false" type="chrome_html" />
+                 compress="false" type="chrome_html"
+                 preprocess="true" />
       <structure name="IDR_OS_SETTINGS_CR_SETTINGS_PAGE_CSS_HTML"
                  file="settings_page_css.html"
                  compress="false" type="chrome_html" />
@@ -657,6 +671,18 @@
       <structure name="IDR_OS_SETTINGS_LANGUAGES_MANAGE_INPUT_METHODS_PAGE_JS"
                  file="chromeos/os_languages_page/manage_input_methods_page.js"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_INPUT_METHOD_OPTIONS_PAGE_HTML"
+                 file="chromeos/os_languages_page/input_method_options_page.html"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_INPUT_METHOD_OPTIONS_PAGE_JS"
+                 file="chromeos/os_languages_page/input_method_options_page.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_LANGUAGES_INPUT_METHOD_UTIL_HTML"
+                 file="chromeos/os_languages_page/input_method_util.html"
+                 compress="false" type="chrome_html" />
+      <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_SMART_INPUTS_PAGE_HTML"
                  file="chromeos/os_languages_page/smart_inputs_page.html"
                  compress="false" type="chrome_html" />
@@ -1095,6 +1121,12 @@
       <structure name="IDR_OS_SETTINGS_DATE_TIME_TYPES_JS"
                  file="chromeos/date_time_page/date_time_types.js"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_TIMEZONE_BROWSER_PROXY_JS"
+                 file="chromeos/date_time_page/timezone_browser_proxy.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_TIMEZONE_BROWSER_PROXY_HTML"
+                 file="chromeos/date_time_page/timezone_browser_proxy.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_TIMEZONE_SELECTOR_HTML"
                  file="chromeos/date_time_page/timezone_selector.html"
                  compress="false" type="chrome_html" />
@@ -1206,6 +1238,12 @@
       <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_SUBPAGE_HTML"
+                 file="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"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_NETWORK_PROXY_SECTION_HTML"
                  file="chromeos/internet_page/network_proxy_section.html"
                  compress="false" type="chrome_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 88da13ccd00..a6e99635d9f 100644
--- a/chromium/chrome/browser/resources/settings/os_settings_resources_vulcanized.grd
+++ b/chromium/chrome/browser/resources/settings/os_settings_resources_vulcanized.grd
@@ -17,27 +17,23 @@
                use_base_dir="false"
                flattenhtml="true"
                allowexternalscript="true"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_OS_SETTINGS_CRISPER_JS"
                file="${root_gen_dir}\chrome\browser\resources\settings\chromeos\crisper.js"
                use_base_dir="false"
                flattenhtml="true"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_OS_SETTINGS_LAZY_LOAD_VULCANIZED_HTML"
                file="${root_gen_dir}\chrome\browser\resources\settings\chromeos\lazy_load.vulcanized.html"
                use_base_dir="false"
                flattenhtml="true"
                allowexternalscript="true"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_OS_SETTINGS_LAZY_LOAD_CRISPER_JS"
                file="${root_gen_dir}\chrome\browser\resources\settings\chromeos\lazy_load.crisper.js"
                use_base_dir="false"
                flattenhtml="true"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_OS_SETTINGS_MANIFEST"
                file="os_settings_manifest.json"
                type="BINDATA"
@@ -54,53 +50,46 @@
                type="BINDATA" />
 
       <!-- App Management -->
-      <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_BITMAP_MOJO_LITE_JS"
-               file="${root_gen_dir}\skia\public\mojom\bitmap.mojom-lite.js"
-               compress="gzip"
-               use_base_dir="false"
-               type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_FILE_PATH_MOJO_LITE_JS"
                file="${root_gen_dir}\mojo\public\mojom\base\file_path.mojom-lite.js"
-               compress="gzip"
-               use_base_dir="false"
-               type="BINDATA" />
-      <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_IMAGE_INFO_MOJO_LITE_JS"
-               file="${root_gen_dir}\skia\public\mojom\image_info.mojom-lite.js"
-               compress="gzip"
                use_base_dir="false"
                type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_IMAGE_MOJO_LITE_JS"
                file="${root_gen_dir}\ui\gfx\image\mojom\image.mojom-lite.js"
-               compress="gzip"
                use_base_dir="false"
                type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_MOJO_LITE_JS"
                file="${root_gen_dir}\chrome\browser\ui\webui\app_management\app_management.mojom-lite.js"
-               compress="gzip"
                use_base_dir="false"
                type="BINDATA" />
       <include name="IDR_OS_SETTINGS_APP_MANAGEMENT_TYPES_MOJO_LITE_JS"
-               file="${root_gen_dir}\chrome\services\app_service\public\mojom\types.mojom-lite.js"
-               compress="gzip"
+               file="${root_gen_dir}\components\services\app_service\public\mojom\types.mojom-lite.js"
                use_base_dir="false"
                type="BINDATA" />
 
       <!-- Search -->
       <include name="IDR_OS_SETTINGS_SEARCH_MOJOM_LITE_JS"
                file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\search\search.mojom-lite.js"
-               compress="gzip"
                use_base_dir="false"
                type="BINDATA" />
       <include name="IDR_OS_SETTINGS_SEARCH_RESULT_ICON_MOJOM_LITE_JS"
                file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\search\search_result_icon.mojom-lite.js"
-               compress="gzip"
                use_base_dir="false"
                type="BINDATA" />
       <include name="IDR_OS_SETTINGS_USER_ACTION_RECORDER_MOJOM_LITE_JS"
                file="${root_gen_dir}\chrome\browser\ui\webui\settings\chromeos\search\user_action_recorder.mojom-lite.js"
-               compress="gzip"
                use_base_dir="false"
                type="BINDATA" />
+
+      <!-- Polymer3 related files-->
+      <include name="IDR_OS_SETTINGS_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" />
     </includes>
   </release>
 </grit>
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 bbe3b9a0e4d..bf337dd7635 100644
--- a/chromium/chrome/browser/resources/settings/safety_check_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/safety_check_page/BUILD.gn
@@ -12,11 +12,12 @@ js_type_check("closure_compile_module") {
   deps = [
     ":safety_check_browser_proxy",
     ":safety_check_child",
-    ":safety_check_extensions_element",
+    ":safety_check_chrome_cleaner_child",
+    ":safety_check_extensions_child",
     ":safety_check_page",
-    ":safety_check_passwords_element",
-    ":safety_check_safe_browsing_element",
-    ":safety_check_updates_element",
+    ":safety_check_passwords_child",
+    ":safety_check_safe_browsing_child",
+    ":safety_check_updates_child",
   ]
 }
 
@@ -32,7 +33,19 @@ js_library("safety_check_child") {
   ]
 }
 
-js_library("safety_check_extensions_element") {
+js_library("safety_check_chrome_cleaner_child") {
+  deps = [
+    ":safety_check_child",
+    "..:metrics_browser_proxy",
+    "..:route",
+    "..:router.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",
+  ]
+}
+
+js_library("safety_check_extensions_child") {
   deps = [
     ":safety_check_child",
     "..:metrics_browser_proxy",
@@ -46,10 +59,11 @@ js_library("safety_check_extensions_element") {
 js_library("safety_check_page") {
   deps = [
     ":safety_check_browser_proxy",
-    ":safety_check_extensions_element",
-    ":safety_check_passwords_element",
-    ":safety_check_safe_browsing_element",
-    ":safety_check_updates_element",
+    ":safety_check_chrome_cleaner_child",
+    ":safety_check_extensions_child",
+    ":safety_check_passwords_child",
+    ":safety_check_safe_browsing_child",
+    ":safety_check_updates_child",
     "..:hats_browser_proxy",
     "..:metrics_browser_proxy",
     "../autofill_page:password_manager_proxy",
@@ -62,7 +76,7 @@ js_library("safety_check_page") {
   ]
 }
 
-js_library("safety_check_passwords_element") {
+js_library("safety_check_passwords_child") {
   deps = [
     ":safety_check_child",
     "..:metrics_browser_proxy",
@@ -75,7 +89,7 @@ js_library("safety_check_passwords_element") {
   ]
 }
 
-js_library("safety_check_safe_browsing_element") {
+js_library("safety_check_safe_browsing_child") {
   deps = [
     ":safety_check_child",
     "..:metrics_browser_proxy",
@@ -88,7 +102,7 @@ js_library("safety_check_safe_browsing_element") {
   ]
 }
 
-js_library("safety_check_updates_element") {
+js_library("safety_check_updates_child") {
   deps = [
     ":safety_check_child",
     "..:lifetime_browser_proxy.m",
@@ -102,10 +116,11 @@ js_library("safety_check_updates_element") {
 html_to_js("web_components") {
   js_files = [
     "safety_check_child.js",
-    "safety_check_extensions_element.js",
+    "safety_check_chrome_cleaner_child.js",
+    "safety_check_extensions_child.js",
     "safety_check_page.js",
-    "safety_check_passwords_element.js",
-    "safety_check_safe_browsing_element.js",
-    "safety_check_updates_element.js",
+    "safety_check_passwords_child.js",
+    "safety_check_safe_browsing_child.js",
+    "safety_check_updates_child.js",
   ]
 }
diff --git a/chromium/chrome/browser/resources/settings/settings.gni b/chromium/chrome/browser/resources/settings/settings.gni
index 48e79e57b99..0c82dda4fd4 100644
--- a/chromium/chrome/browser/resources/settings/settings.gni
+++ b/chromium/chrome/browser/resources/settings/settings.gni
@@ -14,7 +14,6 @@ settings_namespace_rewrites = [
   "settings.AccountManagerBrowserProxy|AccountManagerBrowserProxy",
   "settings.Account|Account",
   "settings.ALL_SITES_DIALOG|ALL_SITES_DIALOG",
-  "settings.AllSitesAction|AllSitesAction",
   "settings.AllSitesAction2|AllSitesAction2",
   "settings.AndroidInfoBrowserProxy|AndroidInfoBrowserProxy",
   "settings.AndroidSmsInfo|AndroidSmsInfo",
@@ -97,6 +96,7 @@ settings_namespace_rewrites = [
   "settings.MetricsReporting|MetricsReporting",
   "settings.SafetyCheckBrowserProxy|SafetyCheckBrowserProxy",
   "settings.SafetyCheckCallbackConstants|SafetyCheckCallbackConstants",
+  "settings.SafetyCheckChromeCleanerStatus|SafetyCheckChromeCleanerStatus",
   "settings.SafetyCheckExtensionsStatus|SafetyCheckExtensionsStatus",
   "settings.SafetyCheckIconStatus|SafetyCheckIconStatus",
   "settings.SafetyCheckParentStatus|SafetyCheckParentStatus",
diff --git a/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn b/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
index fda50ecb1e5..c7432bfa778 100644
--- a/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/settings_page/BUILD.gn
@@ -46,7 +46,9 @@ js_library("settings_subpage") {
     "//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",
     "//ui/webui/resources/js/cr/ui:focus_without_ink",
   ]
 }
@@ -102,7 +104,9 @@ js_library("settings_subpage.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",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
   extra_deps = [ ":settings_subpage_module" ]
@@ -150,6 +154,7 @@ polymer_modulizer("settings_subpage") {
                    "third_party/polymer/v1_0/components-chromium/iron-resizable-behavior/iron-resizable-behavior.html|IronResizableBehavior",
                    "ui/webui/resources/html/assert.html|assert",
                    "ui/webui/resources/html/polymer.html|html, Polymer, afterNextRender",
+                   "ui/webui/resources/html/util.html|listenOnce",
                  ]
   namespace_rewrites = settings_namespace_rewrites +
                        [ "Polymer.IronResizableBehavior|IronResizableBehavior" ]
diff --git a/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp b/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp
index 4953d88930c..72c22ccadf5 100644
--- a/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp
+++ b/chromium/chrome/browser/resources/settings/settings_resources_v3.grdp
@@ -86,10 +86,23 @@
              file="autofill_page/blocking_request_manager.js"
              compress="false" type="BINDATA" />
   </if>
-  <include name="IDR_SETTINGS_AUTOFILL_PAGE_SHOW_PASSWORD_BEHAVIOR_JS"
-           file="autofill_page/show_password_behavior.js"
+  <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"
+           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"
            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" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_MULTI_STORE_ID_HANDLER_JS"
+           file="autofill_page/multi_store_id_handler.js"
+           compress="false" 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" />
   <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"
@@ -115,6 +128,11 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_list_item.js"
            use_base_dir="false"
            compress="false" type="BINDATA" />
+  <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"
+           preprocess="true"/>
   <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_MANAGER_PROXY_JS"
            file="autofill_page/password_manager_proxy.js"
            compress="false" type="BINDATA" />
@@ -127,11 +145,26 @@
            use_base_dir="false"
            compress="false" 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"
+           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"
            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"
+           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"
+           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"
@@ -141,6 +174,10 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/payments_section.js"
            use_base_dir="false"
            compress="false" type="BINDATA" />
+  <include name="IDR_SETTINGS_AUTOFILL_PAGE_SHOW_PASSWORD_BEHAVIOR_JS"
+           file="autofill_page/show_password_behavior.js"
+           compress="false" type="BINDATA"
+           preprocess="true" />
   <include name="IDR_SETTINGS_BASIC_PAGE_BASIC_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/basic_page/basic_page.js"
            use_base_dir="false"
@@ -412,9 +449,6 @@
            use_base_dir="false"
            preprocess="true"
            compress="false" type="BINDATA" />
-  <include name="IDR_SETTINGS_PLURAL_STRING_PROXY_JS"
-           file="plural_string_proxy.js"
-           compress="false" type="BINDATA" />
   <include name="IDR_SETTINGS_PREFS_PREFS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs.m.js"
            use_base_dir="false"
@@ -551,24 +585,28 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_child.js"
            use_base_dir="false"
            compress="false" type="BINDATA" />
-  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_EXTENSIONS_ELEMENT_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_extensions_element.js"
+  <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" />
+  <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" />
   <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_PAGE_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_page.js"
            use_base_dir="false"
            compress="false" type="BINDATA" />
-  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_PASSWORDS_ELEMENT_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_passwords_element.js"
+  <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" />
-  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_SAFE_BROWSING_ELEMENT_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_safe_browsing_element.js"
+  <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" />
-  <include name="IDR_SETTINGS_SAFETY_CHECK_PAGE_SAFETY_CHECK_UPDATES_ELEMENT_JS"
-           file="${root_gen_dir}/chrome/browser/resources/settings/safety_check_page/safety_check_updates_element.js"
+  <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" />
   <include name="IDR_SETTINGS_SEARCH_ENGINES_BROWSER_PROXY_M_JS"
@@ -627,7 +665,8 @@
   <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" />
+           compress="false" 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"
diff --git a/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd b/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd
index 51e23355bdf..aa1881dbc5d 100644
--- a/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd
+++ b/chromium/chrome/browser/resources/settings/settings_resources_vulcanized.grd
@@ -14,74 +14,58 @@
     <includes>
       <include name="IDR_SETTINGS_IMAGES_COOKIES_BANNER_SVG"
                file="images/cookies_banner.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_COOKIES_BANNER_DARK_SVG"
                file="images/cookies_banner_dark.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_PERMISSIONS_BANNER_SVG"
                file="images/permissions_banner.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_PERMISSIONS_BANNER_DARK_SVG"
                file="images/permissions_banner_dark.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_SAFE_BROWSING_BANNER_SVG"
                file="images/safe_browsing_banner.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_SAFE_BROWSING_BANNER_DARK_SVG"
                file="images/safe_browsing_banner_dark.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_SYNC_BANNER_SVG"
                file="images/sync_banner.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_SYNC_BANNER_DARK_SVG"
                file="images/sync_banner_dark.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_NEUTRAL_SVG"
                file="images/password_check_neutral.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_NEUTRAL_DARK_SVG"
                file="images/password_check_neutral_dark.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_POSITIVE_SVG"
                file="images/password_check_positive.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_IMAGES_PASSWORD_CHECK_POSITIVE_DARK_SVG"
                file="images/password_check_positive_dark.svg"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <!-- Polymer 3 related files -->
       <include name="IDR_SETTINGS_SETTINGS_V3_HTML"
                file="settings_v3.html"
-               type="BINDATA"
-               compress="gzip" />
+               type="BINDATA" />
       <include name="IDR_SETTINGS_SETTINGS_ROLLUP_JS"
                file="${root_gen_dir}\chrome\browser\resources\settings\settings.rollup.js"
                use_base_dir="false"
                preprocess="true"
-               compress="gzip"
                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"
-               compress="gzip"
                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"
-               compress="gzip"
                use_base_dir="false" />
     </includes>
   </release>