BASELINE: Update Chromium to 118.0.5993.24

Change-Id: I8373334b8ea8225ab4d934dc676aabc6a85a7efa

3 files changed, 24 insertions, 617 deletions

diff --git a/chromium/chrome/browser/resources/settings/BUILD.gn b/chromium/chrome/browser/resources/settings/BUILD.gn
index d86fe848ade..6b484992fb3 100644
--- a/chromium/chrome/browser/resources/settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/BUILD.gn
@@ -44,20 +44,22 @@ build_webui("build") {
     "images/privacy_guide/horizon_graphic.svg",
     "images/privacy_guide/msbb_graphic_dark_v2.svg",
     "images/privacy_guide/msbb_graphic_v2.svg",
+    "images/privacy_guide/preload_graphic.svg",
+    "images/privacy_guide/preload_graphic_dark.svg",
     "images/privacy_guide/privacy_sandbox_graphic_dark.svg",
     "images/privacy_guide/privacy_sandbox_graphic.svg",
     "images/privacy_guide/promo_banner_dark.svg",
     "images/privacy_guide/promo_banner.svg",
     "images/privacy_guide/safe_browsing_graphic_dark_v2.svg",
     "images/privacy_guide/safe_browsing_graphic_v2.svg",
+    "images/privacy_guide/search_suggestions_graphic.svg",
+    "images/privacy_guide/search_suggestions_graphic_dark.svg",
     "images/privacy_guide/waa_graphic_dark.svg",
     "images/privacy_guide/waa_graphic.svg",
     "images/privacy_guide/welcome_banner_dark.svg",
     "images/privacy_guide/welcome_banner.svg",
     "images/privacy_sandbox_banner_v3_dark.svg",
     "images/privacy_sandbox_banner_v3.svg",
-    "images/privacy_sandbox_floc_banner_dark.svg",
-    "images/privacy_sandbox_floc_banner.svg",
     "images/safe_browsing_banner_dark.svg",
     "images/safe_browsing_banner.svg",
     "images/sync_banner_dark.svg",
@@ -77,29 +79,12 @@ build_webui("build") {
     "autofill_page/address_remove_confirmation_dialog.ts",
     "autofill_page/autofill_page.ts",
     "autofill_page/autofill_section.ts",
-    "autofill_page/avatar_icon.ts",
     "autofill_page/credit_card_edit_dialog.ts",
     "autofill_page/credit_card_list_entry.ts",
     "autofill_page/iban_edit_dialog.ts",
     "autofill_page/iban_list_entry.ts",
-    "autofill_page/password_check_edit_disclaimer_dialog.ts",
-    "autofill_page/password_check_list_item.ts",
-    "autofill_page/password_check.ts",
-    "autofill_page/password_edit_dialog.ts",
-    "autofill_page/password_list_item.ts",
-    "autofill_page/password_preview_item.ts",
-    "autofill_page/password_move_multiple_passwords_to_account_dialog.ts",
-    "autofill_page/password_remove_confirmation_dialog.ts",
-    "autofill_page/password_remove_dialog.ts",
-    "autofill_page/password_view.ts",
-    "autofill_page/passwords_device_section.ts",
-    "autofill_page/passwords_export_dialog.ts",
-    "autofill_page/passwords_import_dialog.ts",
-    "autofill_page/passwords_list_handler.ts",
-    "autofill_page/passwords_section.ts",
     "autofill_page/payments_list.ts",
     "autofill_page/payments_section.ts",
-    "autofill_page/upi_id_list_entry.ts",
     "autofill_page/virtual_card_unenroll_dialog.ts",
     "basic_page/basic_page.ts",
     "clear_browsing_data_dialog/clear_browsing_data_dialog.ts",
@@ -143,7 +128,9 @@ build_webui("build") {
     "privacy_page/privacy_guide/privacy_guide_msbb_fragment.ts",
     "privacy_page/privacy_guide/privacy_guide_page.ts",
     "privacy_page/privacy_guide/privacy_guide_promo.ts",
+    "privacy_page/privacy_guide/privacy_guide_preload_fragment.ts",
     "privacy_page/privacy_guide/privacy_guide_safe_browsing_fragment.ts",
+    "privacy_page/privacy_guide/privacy_guide_search_suggestions_fragment.ts",
     "privacy_page/privacy_guide/privacy_guide_welcome_fragment.ts",
     "privacy_page/privacy_guide/step_indicator.ts",
     "privacy_page/privacy_page.ts",
@@ -176,7 +163,11 @@ build_webui("build") {
     "safety_check_page/safety_check_safe_browsing_child.ts",
     "safety_check_page/safety_check_unused_site_permissions.ts",
     "safety_check_page/safety_check_updates_child.ts",
+    "safety_hub/safety_hub_card.ts",
+    "safety_hub/safety_hub_entry_point.ts",
+    "safety_hub/safety_hub_module.ts",
     "safety_hub/safety_hub_page.ts",
+    "safety_hub/unused_site_permissions_module.ts",
     "search_engines_page/omnibox_extension_entry.ts",
     "search_engines_page/search_engine_edit_dialog.ts",
     "search_engines_page/search_engine_entry.ts",
@@ -216,6 +207,9 @@ build_webui("build") {
     "site_settings/site_entry.ts",
     "site_settings/site_list_entry.ts",
     "site_settings/site_list.ts",
+    "site_settings/storage_access_static_site_list_entry.ts",
+    "site_settings/storage_access_site_list_entry.ts",
+    "site_settings/storage_access_site_list.ts",
     "site_settings/zoom_levels.ts",
   ]
 
@@ -274,14 +268,8 @@ build_webui("build") {
     "appearance_page/appearance_browser_proxy.ts",
     "autofill_page/address_edit_dialog_components.ts",
     "autofill_page/autofill_manager_proxy.ts",
-    "autofill_page/merge_passwords_store_copies_mixin.ts",
-    "autofill_page/user_util_mixin.ts",
-    "autofill_page/password_check_mixin.ts",
     "autofill_page/password_manager_proxy.ts",
-    "autofill_page/password_removal_mixin.ts",
-    "autofill_page/password_requestor_mixin.ts",
     "autofill_page/payments_manager_proxy.ts",
-    "autofill_page/show_password_mixin.ts",
     "base_mixin.ts",
     "clear_browsing_data_dialog/clear_browsing_data_browser_proxy.ts",
     "controls/settings_idle_load.ts",
@@ -296,6 +284,7 @@ build_webui("build") {
     "on_startup_page/on_startup_browser_proxy.ts",
     "on_startup_page/startup_urls_page_browser_proxy.ts",
     "page_visibility.ts",
+    "performance_page/constants.ts",
     "performance_page/discard_timer_options.ts",
     "performance_page/performance_browser_proxy.ts",
     "performance_page/performance_metrics_proxy.ts",
@@ -325,10 +314,6 @@ build_webui("build") {
     "tooltip_mixin.ts",
   ]
 
-  if (is_chromeos) {
-    non_web_component_files += [ "autofill_page/blocking_request_manager.ts" ]
-  }
-
   if (is_chromeos_ash) {
     non_web_component_files += [
       "people_page/account_manager_browser_proxy.ts",
@@ -358,6 +343,11 @@ build_webui("build") {
     non_web_component_files += [ "autofill_page/passkeys_browser_proxy.ts" ]
   }
 
+  if (is_mac) {
+    non_web_component_files +=
+        [ "a11y_page/mac_system_settings_browser_proxy.ts" ]
+  }
+
   # -----------------non_web_component_files end -------------------------------
 
   icons_html_files = [
@@ -397,6 +387,7 @@ build_webui("build") {
   ts_deps = [
     "//chrome/browser/resources/settings_shared:build_ts",
     "//third_party/polymer/v3_0:library",
+    "//ui/webui/resources/cr_components/customize_color_scheme_mode:build_ts",
     "//ui/webui/resources/cr_components/help_bubble:build_ts",
     "//ui/webui/resources/cr_components/localized_link:build_ts",
     "//ui/webui/resources/cr_components/managed_dialog:build_ts",
@@ -407,8 +398,10 @@ build_webui("build") {
   ]
 
   if (!is_chromeos_ash) {
-    ts_deps +=
-        [ "//ui/webui/resources/cr_components/customize_themes:build_ts" ]
+    ts_deps += [
+      "//ui/webui/resources/cr_components/customize_themes:build_ts",
+      "//ui/webui/resources/cr_components/theme_color_picker:build_ts",
+    ]
   } else {
     ts_deps += [ "//ash/webui/common/resources:build_ts" ]
   }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
deleted file mode 100644
index c8bc0b92f2d..00000000000
--- a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ /dev/null
@@ -1,567 +0,0 @@
-# Copyright 2019 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//chrome/common/features.gni")
-import("//ui/webui/resources/tools/build_webui.gni")
-import("//ui/webui/resources/tools/generate_grd.gni")
-import("//ui/webui/webui_features.gni")
-import("./os_settings.gni")
-
-assert(is_chromeos_ash, "ChromeOS Settings is ChromeOS only")
-
-nearby_share_tsc_dir =
-    "$root_gen_dir/chrome/browser/resources/nearby_share/shared/tsc"
-
-build_webui("build") {
-  grd_prefix = "os_settings"
-
-  static_files = [
-    "css/base.css",
-
-    "images/error_badge_dark.svg",
-    "images/error_badge.svg",
-    "images/icon_add_cellular.svg",
-    "images/icon_add_circle.svg",
-    "images/icon_add_wifi.svg",
-    "images/icon_pair_bluetooth.svg",
-    "images/keyboard_shortcut_dark.svg",
-    "images/keyboard_shortcut.svg",
-    "images/multidevice_permission_setup_connecting.svg",
-    "images/multidevice_permission_setup_connecting_dark.svg",
-    "images/notification_access_connecting_dark.svg",
-    "images/notification_access_connecting.svg",
-    "images/notification_access_error_dark.svg",
-    "images/notification_access_error.svg",
-    "images/notification_access_finished_dark.svg",
-    "images/notification_access_finished.svg",
-    "images/notification_access_setup.svg",
-    "images/notification_access_setup_dark.svg",
-    "images/smart_privacy.svg",
-    "images/smart_privacy_dark.svg",
-    "images/switch_access_setup_guide_assign_next.svg",
-    "images/switch_access_setup_guide_assign_next_dark.svg",
-    "images/switch_access_setup_guide_assign_previous.svg",
-    "images/switch_access_setup_guide_assign_previous_dark.svg",
-    "images/switch_access_setup_guide_assign_select.svg",
-    "images/switch_access_setup_guide_assign_select_dark.svg",
-    "images/switch_access_setup_guide_auto_scan_enabled.svg",
-    "images/switch_access_setup_guide_auto_scan_enabled_dark.svg",
-    "images/switch_access_setup_guide_choose_one_switch.svg",
-    "images/switch_access_setup_guide_choose_one_switch_dark.svg",
-    "images/switch_access_setup_guide_choose_three_switches.svg",
-    "images/switch_access_setup_guide_choose_three_switches_dark.svg",
-    "images/switch_access_setup_guide_choose_two_switches.svg",
-    "images/switch_access_setup_guide_choose_two_switches_dark.svg",
-    "images/switch_access_setup_guide_closing.svg",
-    "images/switch_access_setup_guide_closing_dark.svg",
-    "images/switch_access_setup_guide_start_pairing.svg",
-    "images/switch_access_setup_guide_start_pairing_dark.svg",
-
-    "os_settings.html",
-  ]
-
-  web_component_files = [
-    "crostini_page/bruschetta_subpage.ts",
-    "crostini_page/crostini_arc_adb.ts",
-    "crostini_page/crostini_arc_adb_confirmation_dialog.ts",
-    "crostini_page/crostini_confirmation_dialog.ts",
-    "crostini_page/crostini_disk_resize_confirmation_dialog.ts",
-    "crostini_page/crostini_disk_resize_dialog.ts",
-    "crostini_page/crostini_export_import.ts",
-    "crostini_page/crostini_extra_containers.ts",
-    "crostini_page/crostini_extra_containers_create_dialog.ts",
-    "crostini_page/crostini_import_confirmation_dialog.ts",
-    "crostini_page/crostini_page.ts",
-    "crostini_page/crostini_port_forwarding.ts",
-    "crostini_page/crostini_port_forwarding_add_port_dialog.ts",
-    "crostini_page/crostini_subpage.ts",
-    "date_time_page/date_time_page.ts",
-    "date_time_page/system_geolocation_dialog.ts",
-    "date_time_page/timezone_selector.ts",
-    "date_time_page/timezone_subpage.ts",
-    "device_page/audio.ts",
-    "device_page/device_page.ts",
-    "device_page/display.ts",
-    "device_page/display_layout.ts",
-    "device_page/display_overscan_dialog.ts",
-    "device_page/graphics_tablet_subpage.ts",
-    "device_page/keyboard.ts",
-    "device_page/per_device_keyboard.ts",
-    "device_page/per_device_keyboard_remap_keys.ts",
-    "device_page/per_device_keyboard_subsection.ts",
-    "device_page/per_device_mouse.ts",
-    "device_page/per_device_mouse_subsection.ts",
-    "device_page/per_device_pointing_stick.ts",
-    "device_page/per_device_pointing_stick_subsection.ts",
-    "device_page/per_device_touchpad.ts",
-    "device_page/per_device_touchpad_subsection.ts",
-    "device_page/pointers.ts",
-    "device_page/power.ts",
-    "device_page/keyboard_remap_modifier_key_row.ts",
-    "device_page/keyboard_six_pack_key_row.ts",
-    "device_page/storage.ts",
-    "device_page/storage_external.ts",
-    "device_page/storage_external_entry.ts",
-    "device_page/stylus.ts",
-    "guest_os/guest_os_container_select.ts",
-    "guest_os/guest_os_shared_paths.ts",
-    "guest_os/guest_os_shared_usb_devices.ts",
-    "guest_os/guest_os_shared_usb_devices_add_dialog.ts",
-    "internet_page/apn_subpage.ts",
-    "internet_page/cellular_networks_list.ts",
-    "internet_page/cellular_roaming_toggle_button.ts",
-    "internet_page/cellular_setup_dialog.ts",
-    "internet_page/esim_install_error_dialog.ts",
-    "internet_page/esim_remove_profile_dialog.ts",
-    "internet_page/esim_rename_dialog.ts",
-    "internet_page/hotspot_config_dialog.ts",
-    "internet_page/hotspot_subpage.ts",
-    "internet_page/hotspot_summary_item.ts",
-    "internet_page/internet_config.ts",
-    "internet_page/internet_detail_menu.ts",
-    "internet_page/internet_detail_subpage.ts",
-    "internet_page/internet_known_networks_subpage.ts",
-    "internet_page/internet_page.ts",
-    "internet_page/internet_subpage.ts",
-    "internet_page/internet_subpage_menu.ts",
-    "internet_page/network_always_on_vpn.ts",
-    "internet_page/network_device_info_dialog.ts",
-    "internet_page/network_proxy_section.ts",
-    "internet_page/network_summary_item.ts",
-    "internet_page/network_summary.ts",
-    "internet_page/passpoint_subpage.ts",
-    "internet_page/passpoint_remove_dialog.ts",
-    "internet_page/settings_traffic_counters.ts",
-    "internet_page/tether_connection_dialog.ts",
-    "kerberos_page/kerberos_accounts_subpage.ts",
-    "kerberos_page/kerberos_add_account_dialog.ts",
-    "kerberos_page/kerberos_page.ts",
-    "keyboard_shortcut_banner/keyboard_shortcut_banner.ts",
-    "main_page_container/main_page_container.ts",
-    "main_page_container/page_displayer.ts",
-    "multidevice_page/multidevice_combined_setup_item.ts",
-    "multidevice_page/multidevice_feature_item.ts",
-    "multidevice_page/multidevice_feature_toggle.ts",
-    "multidevice_page/multidevice_notification_access_setup_dialog.ts",
-    "multidevice_page/multidevice_page.ts",
-    "multidevice_page/multidevice_permissions_setup_dialog.ts",
-    "multidevice_page/multidevice_radio_button.ts",
-    "multidevice_page/multidevice_screen_lock_subpage.ts",
-    "multidevice_page/multidevice_smartlock_item.ts",
-    "multidevice_page/multidevice_subpage.ts",
-    "multidevice_page/multidevice_task_continuation_disabled_link.ts",
-    "multidevice_page/multidevice_task_continuation_item.ts",
-    "multidevice_page/multidevice_task_continuation_item_lacros.ts",
-    "multidevice_page/multidevice_tether_item.ts",
-    "multidevice_page/multidevice_wifi_sync_disabled_link.ts",
-    "multidevice_page/multidevice_wifi_sync_item.ts",
-    "nearby_share_page/nearby_share_confirm_page.ts",
-    "nearby_share_page/nearby_share_contact_visibility_dialog.ts",
-    "nearby_share_page/nearby_share_data_usage_dialog.ts",
-    "nearby_share_page/nearby_share_device_name_dialog.ts",
-    "nearby_share_page/nearby_share_high_visibility_page.ts",
-    "nearby_share_page/nearby_share_receive_dialog.ts",
-    "nearby_share_page/nearby_share_subpage.ts",
-    "os_a11y_page/audio_and_captions_page.ts",
-    "os_a11y_page/bluetooth_braille_display_ui.ts",
-    "os_a11y_page/captions_subpage.ts",
-    "os_a11y_page/change_dictation_locale_dialog.ts",
-    "os_a11y_page/chromevox_subpage.ts",
-    "os_a11y_page/cursor_and_touchpad_page.ts",
-    "os_a11y_page/display_and_magnification_subpage.ts",
-    "os_a11y_page/keyboard_and_text_input_page.ts",
-    "os_a11y_page/live_caption_section.ts",
-    "os_a11y_page/manage_a11y_subpage.ts",
-    "os_a11y_page/os_a11y_page.ts",
-    "os_a11y_page/select_to_speak_subpage.ts",
-    "os_a11y_page/switch_access_action_assignment_dialog.ts",
-    "os_a11y_page/switch_access_action_assignment_pane.ts",
-    "os_a11y_page/switch_access_setup_guide_dialog.ts",
-    "os_a11y_page/switch_access_setup_guide_warning_dialog.ts",
-    "os_a11y_page/switch_access_subpage.ts",
-    "os_a11y_page/text_to_speech_subpage.ts",
-    "os_a11y_page/tts_voice_subpage.ts",
-    "os_about_page/channel_switcher_dialog.ts",
-    "os_about_page/consumer_auto_update_toggle_dialog.ts",
-    "os_about_page/detailed_build_info_subpage.ts",
-    "os_about_page/eol_offer_section.ts",
-    "os_about_page/edit_hostname_dialog.ts",
-    "os_about_page/os_about_page.ts",
-    "os_about_page/update_warning_dialog.ts",
-    "os_apps_page/android_apps_subpage.ts",
-    "os_apps_page/app_management_page/app_detail_view.ts",
-    "os_apps_page/app_management_page/app_details_item.ts",
-    "os_apps_page/app_management_page/app_item.ts",
-    "os_apps_page/app_management_page/app_management_page.ts",
-    "os_apps_page/app_management_page/arc_detail_view.ts",
-    "os_apps_page/app_management_page/chrome_app_detail_view.ts",
-    "os_apps_page/app_management_page/dom_switch.ts",
-    "os_apps_page/app_management_page/main_view.ts",
-    "os_apps_page/app_management_page/pin_to_shelf_item.ts",
-    "os_apps_page/app_management_page/pwa_detail_view.ts",
-    "os_apps_page/app_management_page/read_only_permission_item.ts",
-    "os_apps_page/app_management_page/resize_lock_item.ts",
-    "os_apps_page/app_management_page/sub_apps_item.ts",
-    "os_apps_page/app_management_page/supported_links_dialog.ts",
-    "os_apps_page/app_management_page/supported_links_item.ts",
-    "os_apps_page/app_management_page/supported_links_overlapping_apps_dialog.ts",
-    "os_apps_page/app_management_page/borealis_page/borealis_detail_view.ts",
-    "os_apps_page/app_management_page/plugin_vm_page/plugin_vm_detail_view.ts",
-    "os_apps_page/app_notifications_page/app_notification_row.ts",
-    "os_apps_page/app_notifications_page/app_notifications_subpage.ts",
-    "os_apps_page/os_apps_page.ts",
-    "os_bluetooth_page/os_bluetooth_change_device_name_dialog.ts",
-    "os_bluetooth_page/os_bluetooth_device_detail_subpage.ts",
-    "os_bluetooth_page/os_bluetooth_forget_device_dialog.ts",
-    "os_bluetooth_page/os_bluetooth_pairing_dialog.ts",
-    "os_bluetooth_page/os_bluetooth_devices_subpage.ts",
-    "os_bluetooth_page/os_bluetooth_page.ts",
-    "os_bluetooth_page/os_bluetooth_saved_devices_subpage.ts",
-    "os_bluetooth_page/os_bluetooth_summary.ts",
-    "os_bluetooth_page/os_bluetooth_true_wireless_images.ts",
-    "os_bluetooth_page/os_paired_bluetooth_list.ts",
-    "os_bluetooth_page/os_paired_bluetooth_list_item.ts",
-    "os_bluetooth_page/os_remove_saved_device_dialog.ts",
-    "os_bluetooth_page/os_saved_devices_list.ts",
-    "os_bluetooth_page/os_saved_devices_list_item.ts",
-    "os_bluetooth_page/settings_fast_pair_toggle.ts",
-    "os_files_page/office_page.ts",
-    "os_files_page/os_files_page.ts",
-    "os_files_page/smb_shares_page.ts",
-    "os_files_page/google_drive_subpage.ts",
-    "os_files_page/one_drive_subpage.ts",
-    "os_files_page/google_drive_confirmation_dialog.ts",
-    "os_languages_page/add_input_methods_dialog.ts",
-    "os_languages_page/add_items_dialog.ts",
-    "os_languages_page/add_spellcheck_languages_dialog.ts",
-    "os_languages_page/change_device_language_dialog.ts",
-    "os_languages_page/cr_checkbox_with_policy.ts",
-    "os_languages_page/input_method_options_page.ts",
-    "os_languages_page/input_page.ts",
-    "os_languages_page/os_add_languages_dialog.ts",
-    "os_languages_page/os_edit_dictionary_page.ts",
-    "os_languages_page/os_japanese_clear_ime_data_dialog.ts",
-    "os_languages_page/os_japanese_manage_user_dictionary_page.ts",
-    "os_languages_page/os_languages_page_v2.ts",
-    "os_languages_page/os_languages_section.ts",
-    "os_languages_page/smart_inputs_page.ts",
-    "os_people_page/account_manager_subpage.ts",
-    "os_people_page/add_user_dialog.ts",
-    "os_people_page/fingerprint_list_subpage.ts",
-    "os_people_page/local_data_recovery_dialog.ts",
-    "os_people_page/lock_screen_subpage.ts",
-    "os_people_page/lock_screen_password_prompt_dialog.ts",
-    "os_people_page/os_people_page.ts",
-    "os_people_page/os_personalization_options.ts",
-    "os_people_page/os_sync_controls_subpage.ts",
-    "os_people_page/os_sync_encryption_options.ts",
-    "os_people_page/os_sync_subpage.ts",
-    "os_people_page/pin_autosubmit_dialog.ts",
-    "os_people_page/setup_fingerprint_dialog.ts",
-    "os_people_page/setup_pin_dialog.ts",
-    "os_people_page/user_list.ts",
-    "os_printing_page/cups_add_print_server_dialog.ts",
-    "os_printing_page/cups_add_printer_dialog.ts",
-    "os_printing_page/cups_add_printer_manually_dialog.ts",
-    "os_printing_page/cups_add_printer_manufacturer_model_dialog.ts",
-    "os_printing_page/cups_edit_printer_dialog.ts",
-    "os_printing_page/cups_enterprise_printers.ts",
-    "os_printing_page/cups_nearby_printers.ts",
-    "os_printing_page/cups_printer_dialog_error.ts",
-    "os_printing_page/cups_printers.ts",
-    "os_printing_page/cups_printers_entry.ts",
-    "os_printing_page/cups_saved_printers.ts",
-    "os_printing_page/cups_settings_add_printer_dialog.ts",
-    "os_printing_page/os_printing_page.ts",
-    "os_privacy_page/manage_users_subpage.ts",
-    "os_privacy_page/metrics_consent_toggle_button.ts",
-    "os_privacy_page/os_privacy_page.ts",
-    "os_privacy_page/peripheral_data_access_protection_dialog.ts",
-    "os_privacy_page/privacy_hub_subpage.ts",
-    "os_privacy_page/smart_privacy_subpage.ts",
-    "os_reset_page/os_powerwash_dialog.ts",
-    "os_reset_page/os_powerwash_dialog_esim_item.ts",
-    "os_reset_page/os_reset_page.ts",
-    "os_search_page/google_assistant_subpage.ts",
-    "os_search_page/os_search_page.ts",
-    "os_search_page/os_search_selection_dialog.ts",
-    "os_search_page/search_engine.ts",
-    "os_search_page/search_subpage.ts",
-    "os_settings_main/os_settings_main.ts",
-    "os_settings_menu/os_settings_menu.ts",
-    "os_settings_page/os_settings_animated_pages.ts",
-    "os_settings_page/os_settings_section.ts",
-    "os_settings_page/os_settings_subpage.ts",
-    "os_settings_page/settings_idle_load.ts",
-    "os_settings_search_box/os_search_result_row.ts",
-    "os_settings_search_box/os_settings_search_box.ts",
-    "os_settings_ui/os_settings_ui.ts",
-    "os_toolbar/os_toolbar.ts",
-    "parental_controls_page/parental_controls_page.ts",
-    "personalization_page/personalization_page.ts",
-    "settings_scheduler_slider/settings_scheduler_slider.ts",
-  ]
-
-  non_web_component_files = [
-    "assert_extras.ts",
-    "common/global_scroll_target_mixin.ts",
-    "common/load_time_booleans.ts",
-    "common/setting_id_param_util.ts",
-    "common/types.ts",
-    "os_files_page/google_drive_browser_proxy.ts",
-    "os_files_page/one_drive_browser_proxy.ts",
-    "crostini_page/crostini_browser_proxy.ts",
-    "crostini_page/crostini_shared_usb_devices.ts",
-    "date_time_page/date_time_types.ts",
-    "date_time_page/timezone_browser_proxy.ts",
-    "deep_linking_mixin.ts",
-    "device_page/cros_audio_config.ts",
-    "device_page/device_page_browser_proxy.ts",
-    "device_page/drag_mixin.ts",
-    "device_page/fake_cros_audio_config.ts",
-    "device_page/layout_mixin.ts",
-    "device_page/fake_input_device_data.ts",
-    "device_page/fake_input_device_settings_provider.ts",
-    "device_page/input_device_mojo_interface_provider.ts",
-    "device_page/input_device_settings_types.ts",
-    "device_page/input_device_settings_utils.ts",
-    "ensure_lazy_loaded.ts",
-    "focus_config.ts",
-    "guest_os/guest_os_browser_proxy.ts",
-    "internet_page/cellular_setup_settings_delegate.ts",
-    "internet_page/internet_page_browser_proxy.ts",
-    "internet_page/passpoint_listener_mixin.ts",
-    "kerberos_page/kerberos_accounts_browser_proxy.ts",
-    "lazy_load.ts",
-    "lock_state_mixin.ts",
-    "main_page_mixin.ts",
-    "metrics_recorder.ts",
-    "metrics_utils.ts",
-    "multidevice_page/multidevice_browser_proxy.ts",
-    "multidevice_page/multidevice_constants.ts",
-    "multidevice_page/multidevice_feature_mixin.ts",
-    "multidevice_page/multidevice_metrics_logger.ts",
-    "nearby_share_page/nearby_account_manager_browser_proxy.ts",
-    "nearby_share_page/nearby_share_receive_manager.ts",
-    "nearby_share_page/types.ts",
-    "os_a11y_page/audio_and_captions_page_browser_proxy.ts",
-    "os_a11y_page/cursor_and_touchpad_page_browser_proxy.ts",
-    "os_a11y_page/keyboard_and_text_input_page_browser_proxy.ts",
-    "os_a11y_page/manage_a11y_subpage_browser_proxy.ts",
-    "os_a11y_page/os_a11y_page_browser_proxy.ts",
-    "os_a11y_page/switch_access_constants.ts",
-    "os_a11y_page/switch_access_subpage_browser_proxy.ts",
-    "os_a11y_page/switch_access_types.ts",
-    "os_a11y_page/text_to_speech_subpage_browser_proxy.ts",
-    "os_a11y_page/tts_voice_subpage_browser_proxy.ts",
-    "os_a11y_page/chromevox_subpage_browser_proxy.ts",
-    "os_a11y_page/bluetooth_braille_display_manager.ts",
-    "os_a11y_page/select_to_speak_subpage_browser_proxy.ts",
-    "os_about_page/about_page_browser_proxy.ts",
-    "os_about_page/device_name_browser_proxy.ts",
-    "os_about_page/device_name_util.ts",
-    "os_apps_page/android_apps_browser_proxy.ts",
-    "os_apps_page/app_management_page/actions.ts",
-    "os_apps_page/app_management_page/api_listener.ts",
-    "os_apps_page/app_management_page/browser_proxy.ts",
-    "os_apps_page/app_management_page/plugin_vm_page/plugin_vm_browser_proxy.ts",
-    "os_apps_page/app_management_page/reducers.ts",
-    "os_apps_page/app_management_page/store.ts",
-    "os_apps_page/app_management_page/store_mixin.ts",
-    "os_apps_page/app_management_page/util.ts",
-    "os_apps_page/app_notifications_page/mojo_interface_provider.ts",
-    "os_bluetooth_page/os_bluetooth_devices_subpage_browser_proxy.ts",
-    "os_bluetooth_page/settings_fast_pair_constants.ts",
-    "os_languages_page/input_method_settings.ts",
-    "os_languages_page/input_method_types.ts",
-    "os_languages_page/input_method_util.ts",
-    "os_languages_page/languages.ts",
-    "os_languages_page/languages_browser_proxy.ts",
-    "os_languages_page/languages_metrics_proxy.ts",
-    "os_languages_page/languages_types.ts",
-    "os_page_availability.ts",
-    "os_people_page/account_manager_browser_proxy.ts",
-    "os_people_page/fingerprint_browser_proxy.ts",
-    "os_people_page/os_sync_browser_proxy.ts",
-    "os_printing_page/cups_printer_dialog_util.ts",
-    "os_printing_page/cups_printer_types.ts",
-    "os_printing_page/cups_printers_browser_proxy.ts",
-    "os_printing_page/cups_printers_entry_list_mixin.ts",
-    "os_printing_page/cups_printers_entry_manager.ts",
-    "os_printing_page/printer_status.ts",
-    "os_privacy_page/media_devices_proxy.ts",
-    "os_privacy_page/metrics_consent_browser_proxy.ts",
-    "os_privacy_page/peripheral_data_access_browser_proxy.ts",
-    "os_privacy_page/privacy_hub_browser_proxy.ts",
-    "os_reset_page/os_reset_browser_proxy.ts",
-    "os_search_page/google_assistant_browser_proxy.ts",
-    "os_search_page/search_engines_browser_proxy.ts",
-    "os_settings_routes.ts",
-    "os_settings_search_box/os_settings_search_box_browser_proxy.ts",
-    "os_settings.ts",
-    "os_settings_ui/os_settings_hats_browser_proxy.ts",
-    "parental_controls_page/parental_controls_browser_proxy.ts",
-    "personalization_page/personalization_hub_browser_proxy.ts",
-    "route_observer_mixin.ts",
-    "route_origin_mixin.ts",
-    "router.ts",
-    "search/combined_search_handler.ts",
-    "search/personalization_search_handler.ts",
-    "search/settings_search_handler.ts",
-  ]
-
-  icons_html_files = [
-    "icons.html",
-    "os_settings_icons.html",
-  ]
-
-  css_files = [
-    "device_page/input_device_settings_shared.css",
-    "internet_page/internet_shared.css",
-    "main_page_container/main_page_container_styles.css",
-    "os_apps_page/app_management_page/app_management_cros_shared_style.css",
-    "os_apps_page/app_management_page/app_management_cros_shared_vars.css",
-    "os_languages_page/shared_style.css",
-    "os_languages_page/shared_vars.css",
-    "os_printing_page/cups_printer_shared.css",
-    "os_settings_icons.css",
-    "settings_shared.css",
-    "settings_vars.css",
-  ]
-
-  mojo_files_deps = [
-    ":rename_personalization_search_mojom",
-    "//ash/public/mojom:input_device_settings_ts__generator",
-    "//chrome/browser/ui/webui/settings/ash/files_page/mojom:mojom_ts__generator",
-    "//chrome/browser/ui/webui/settings/ash/input_device_settings:mojom_ts__generator",
-    "//chrome/browser/ui/webui/settings/ash/os_apps_page/mojom:mojom_ts__generator",
-    "//chrome/browser/ui/webui/settings/ash/search:mojo_bindings_ts__generator",
-    "//chrome/browser/ui/webui/settings/chromeos/constants:mojom_ts__generator",
-    "//chromeos/ash/components/audio/public/mojom:mojom_ts__generator",
-    "//chromeos/ash/components/drivefs/mojom:pin_manager_types_ts__generator",
-    "//ui/events/ash/mojom:mojom_ts__generator",
-  ]
-  mojo_files = [
-    "$root_gen_dir/ash/public/mojom/input_device_settings.mojom-webui.ts",
-    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/files_page/mojom/google_drive_handler.mojom-webui.ts",
-    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/files_page/mojom/one_drive_handler.mojom-webui.ts",
-    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/input_device_settings/input_device_settings_provider.mojom-webui.ts",
-    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/os_apps_page/mojom/app_notification_handler.mojom-webui.ts",
-    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/search/search.mojom-webui.ts",
-    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/search/search_result_icon.mojom-webui.ts",
-    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/search/user_action_recorder.mojom-webui.ts",
-    "$root_gen_dir/chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom-webui.ts",
-    "$root_gen_dir/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom-webui.ts",
-    "$root_gen_dir/chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom-webui.ts",
-    "$root_gen_dir/chromeos/ash/components/drivefs/mojom/pin_manager_types.mojom-webui.ts",
-    "$root_gen_dir/ui/events/ash/mojom/modifier_key.mojom-webui.ts",
-    "$root_gen_dir/ui/events/ash/mojom/simulate_right_click_modifier.mojom-webui.ts",
-    "$root_gen_dir/ui/events/ash/mojom/six_pack_shortcut_modifier.mojom-webui.ts",
-    "$target_gen_dir/personalization_search.mojom-webui.ts",
-  ]
-  mojo_base_path = "mojom-webui"
-
-  ts_composite = true
-  ts_definitions = ts_definition_files  # Defined in os_settings.gni
-  ts_deps = [
-    "//ash/webui/common/resources:build_ts",
-    "//chrome/browser/resources/nearby_share/shared:build_ts",
-    "//chrome/browser/resources/settings_shared:build_ts",
-    "//third_party/polymer/v3_0:library",
-    "//ui/webui/resources/cr_components/app_management:build_ts",
-    "//ui/webui/resources/cr_components/color_change_listener:build_ts",
-    "//ui/webui/resources/cr_components/localized_link:build_ts",
-    "//ui/webui/resources/cr_components/managed_footnote:build_ts",
-    "//ui/webui/resources/cr_components/settings_prefs:build_ts",
-    "//ui/webui/resources/cr_elements:build_ts",
-    "//ui/webui/resources/js:build_ts",
-    "//ui/webui/resources/mojo:build_ts",
-  ]
-  ts_path_mappings = [
-    "/shared/settings/*|" + rebase_path(
-            "$root_gen_dir/chrome/browser/resources/settings_shared/tsc/*",
-            target_gen_dir),
-
-    # Additional path mappings for Nearby share code
-    "/shared/*|" + rebase_path("$nearby_share_tsc_dir/*", target_gen_dir),
-  ]
-
-  extra_grdp_deps = [
-    "//chrome/browser/resources/nearby_share/shared:build_json_grdp",
-    "//third_party/liblouis:build_grdp",
-  ]
-  extra_grdp_files = [
-    "$root_gen_dir/chrome/browser/resources/nearby_share/shared/nearby_share_json_resources.grdp",
-    "$root_gen_dir/third_party/liblouis/liblouis_resources.grdp",
-  ]
-
-  if (!optimize_webui) {
-    # Add shared Nearby Share resources as part of CrOS Settings resources, only
-    # when !optimize_webui, because otherwise those are included as part of the
-    # bundle and don't need to be included separately.
-    extra_grdp_deps +=
-        [ "//chrome/browser/resources/nearby_share/shared:build_grdp" ]
-    extra_grdp_files += [ "$root_gen_dir/chrome/browser/resources/nearby_share/shared/resources.grdp" ]
-  }
-
-  optimize = optimize_webui
-  if (optimize) {
-    optimize_webui_host = "os-settings"
-    optimize_webui_in_files = [
-      "lazy_load.js",
-      "os_settings.js",
-    ]
-    optimize_webui_excludes = [
-      "chrome://resources/cr_components/app_management/app_management.mojom-webui.js",
-      "chrome://resources/ash/common/bluetooth/cros_bluetooth_config.js",
-      "chrome://resources/ash/common/cellular_setup/mojo_interface_provider.js",
-      "chrome://resources/ash/common/connectivity/mojo_connectivity_provider.js",
-      "chrome://resources/ash/common/connectivity/passpoint.mojom-webui.js",
-      "chrome://resources/ash/common/hotspot/cros_hotspot_config.js",
-      "chrome://resources/ash/common/hotspot/cros_hotspot_config.mojom-webui.js",
-      "chrome://resources/ash/common/network/mojo_interface_provider.js",
-      "chrome://resources/mojo/chromeos/ash/services/cellular_setup/public/mojom/cellular_setup.mojom-webui.js",
-      "chrome://resources/mojo/chromeos/ash/services/cellular_setup/public/mojom/esim_manager.mojom-webui.js",
-      "chrome://resources/mojo/chromeos/ash/services/auth_factor_config/public/mojom/auth_factor_config.mojom-webui.js",
-      "chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js",
-      "chrome://resources/mojo/chromeos/ash/services/nearby/public/mojom/nearby_share_settings.mojom-webui.js",
-      "chrome://resources/mojo/chromeos/ash/services/nearby/public/mojom/nearby_share_target_types.mojom-webui.js",
-      "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-webui.js",
-      "chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-webui.js",
-      "chrome://resources/mojo/mojo/public/mojom/base/string16.mojom-webui.js",
-      "chrome://resources/mojo/mojo/public/mojom/base/time.mojom-webui.js",
-      "chrome://resources/mojo/services/network/public/mojom/ip_address.mojom-webui.js",
-      "chrome://resources/mojo/skia/public/mojom/skcolor.mojom-webui.js",
-    ]
-
-    optimize_webui_external_paths = [
-      "/shared/settings|" + rebase_path(
-              "$root_gen_dir/chrome/browser/resources/settings_shared/tsc",
-              root_build_dir),
-      "/shared/|" + rebase_path(nearby_share_tsc_dir, root_build_dir),
-    ]
-  }
-}
-
-# Need to rename gen/ash/webui/personalization_app/search/search.mojom-webui.ts
-# to personalization_search.mojom-webui.ts to avoid a naming collision with
-# gen/chrome/browser/ui/webui/settings/ash/search/search.mojom-webui.ts", before
-# passing it to build_webui(), since the latter places all Mojo files in the
-# same folder, and expects all Mojo files to have unique names.
-copy("rename_personalization_search_mojom") {
-  deps =
-      [ "//ash/webui/personalization_app/search:mojo_bindings_ts__generator" ]
-  sources = [
-    "$root_gen_dir/ash/webui/personalization_app/search/search.mojom-webui.ts",
-  ]
-  outputs = [ "$target_gen_dir/personalization_search.mojom-webui.ts" ]
-}
-
-# grdp for OS Settings files that are needed by OOBE.
-generate_grd("build_oobe_grdp") {
-  grd_prefix = "os_settings_oobe"
-  out_grd = "$target_gen_dir/os_settings_oobe_resources.grdp"
-  input_files_base_dir = rebase_path(".", "//")
-  input_files = [ "images/smart_privacy.svg" ]
-}
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
deleted file mode 100644
index 9af11b01105..00000000000
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-ts_definition_files = [
-  "//tools/typescript/definitions/bluetooth.d.ts",
-  "//tools/typescript/definitions/bluetooth_private.d.ts",
-  "//tools/typescript/definitions/chrome_send.d.ts",
-  "//tools/typescript/definitions/input_method_private.d.ts",
-  "//tools/typescript/definitions/language_settings_private.d.ts",
-  "//tools/typescript/definitions/metrics_private.d.ts",
-  "//tools/typescript/definitions/pending.d.ts",
-  "//tools/typescript/definitions/quick_unlock_private.d.ts",
-  "//tools/typescript/definitions/runtime.d.ts",
-  "//tools/typescript/definitions/settings_private.d.ts",
-  "//tools/typescript/definitions/system_display.d.ts",
-  "//tools/typescript/definitions/tabs.d.ts",
-  "//tools/typescript/definitions/users_private.d.ts",
-]