BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 501 insertions, 331 deletions

diff --git a/chromium/chrome/browser/BUILD.gn b/chromium/chrome/browser/BUILD.gn
index ab78eae16b4..995b99c5ba9 100644
--- a/chromium/chrome/browser/BUILD.gn
+++ b/chromium/chrome/browser/BUILD.gn
@@ -6,6 +6,7 @@ import("//base/allocator/allocator.gni")
 import("//build/buildflag_header.gni")
 import("//build/config/buildflags_paint_preview.gni")
 import("//build/config/chrome_build.gni")
+import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/compiler/pgo/pgo.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
@@ -47,6 +48,12 @@ if (is_android) {
 additional_modules_list_file =
     "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
 
+# Reset sources_assignment_filter for the BUILD.gn file to prevent
+# regression during the migration of Chromium away from the feature.
+# See docs/no_sources_assignment_filter.md for more information.
+# TODO(crbug.com/1018739): remove this when migration is done.
+set_sources_assignment_filter([])
+
 if (is_win) {
   # This is in a separate config so the flags can be applied to dependents.
   # ldflags in GN aren't automatically inherited.
@@ -72,6 +79,7 @@ buildflag_header("buildflags") {
   flags = [
     "CLANG_PGO=$chrome_pgo_phase",
     "ENABLE_KALEIDOSCOPE=$enable_kaleidoscope",
+    "USE_THIN_LTO=$use_thin_lto",
   ]
 }
 
@@ -101,8 +109,6 @@ static_library("browser") {
     "accessibility/caption_util.h",
     "after_startup_task_utils.cc",
     "after_startup_task_utils.h",
-    "app_controller_mac.h",
-    "app_controller_mac.mm",
     "app_mode/app_mode_utils.cc",
     "app_mode/app_mode_utils.h",
     "apps/user_type_filter.cc",
@@ -199,16 +205,8 @@ static_library("browser") {
     "browser_process_impl.cc",
     "browser_process_impl.h",
     "browser_process_platform_part.h",
-    "browser_process_platform_part_android.cc",
-    "browser_process_platform_part_android.h",
     "browser_process_platform_part_base.cc",
     "browser_process_platform_part_base.h",
-    "browser_process_platform_part_chromeos.cc",
-    "browser_process_platform_part_chromeos.h",
-    "browser_process_platform_part_mac.h",
-    "browser_process_platform_part_mac.mm",
-    "browser_process_platform_part_win.cc",
-    "browser_process_platform_part_win.h",
     "browsing_data/browsing_data_file_system_util.cc",
     "browsing_data/browsing_data_file_system_util.h",
     "browsing_data/browsing_data_history_observer_service.cc",
@@ -253,23 +251,13 @@ static_library("browser") {
     "cache_stats_recorder.h",
     "chooser_controller/chooser_controller.cc",
     "chooser_controller/chooser_controller.h",
-    "chrome_browser_application_mac.h",
-    "chrome_browser_application_mac.mm",
     "chrome_browser_field_trials.cc",
     "chrome_browser_field_trials.h",
     "chrome_browser_interface_binders.cc",
     "chrome_browser_interface_binders.h",
     "chrome_browser_main.cc",
     "chrome_browser_main.h",
-    "chrome_browser_main_android.cc",
-    "chrome_browser_main_android.h",
     "chrome_browser_main_extra_parts.h",
-    "chrome_browser_main_linux.cc",
-    "chrome_browser_main_linux.h",
-    "chrome_browser_main_mac.h",
-    "chrome_browser_main_mac.mm",
-    "chrome_browser_main_win.cc",
-    "chrome_browser_main_win.h",
     "chrome_content_browser_client.cc",
     "chrome_content_browser_client.h",
     "chrome_content_browser_client_parts.h",
@@ -304,6 +292,8 @@ static_library("browser") {
     "component_updater/crowd_deny_component_installer.h",
     "component_updater/file_type_policies_component_installer.cc",
     "component_updater/file_type_policies_component_installer.h",
+    "component_updater/floc_blocklist_component_installer.cc",
+    "component_updater/floc_blocklist_component_installer.h",
     "component_updater/games_component_installer.cc",
     "component_updater/games_component_installer.h",
     "component_updater/mei_preload_component_installer.cc",
@@ -328,8 +318,6 @@ static_library("browser") {
     "component_updater/sth_set_component_remover.h",
     "component_updater/subresource_filter_component_installer.cc",
     "component_updater/subresource_filter_component_installer.h",
-    "component_updater/sw_reporter_installer_win.cc",
-    "component_updater/sw_reporter_installer_win.h",
     "component_updater/tls_deprecation_config_component_installer.cc",
     "component_updater/tls_deprecation_config_component_installer.h",
     "component_updater/trust_token_key_commitments_component_installer.cc",
@@ -358,8 +346,6 @@ static_library("browser") {
     "content_settings/tab_specific_content_settings_delegate.h",
     "crash_upload_list/crash_upload_list.cc",
     "crash_upload_list/crash_upload_list.h",
-    "crash_upload_list/crash_upload_list_android.cc",
-    "crash_upload_list/crash_upload_list_android.h",
     "custom_handlers/protocol_handler_registry.cc",
     "custom_handlers/protocol_handler_registry.h",
     "custom_handlers/protocol_handler_registry_factory.cc",
@@ -399,15 +385,13 @@ static_library("browser") {
     "download/download_core_service_factory.h",
     "download/download_core_service_impl.cc",
     "download/download_core_service_impl.h",
-    "download/download_crx_util_android.cc",
+    "download/download_dialog_types.h",
     "download/download_file_picker.cc",
     "download/download_file_picker.h",
     "download/download_history.cc",
     "download/download_history.h",
     "download/download_item_model.cc",
     "download/download_item_model.h",
-    "download/download_location_dialog_result.h",
-    "download/download_location_dialog_type.h",
     "download/download_manager_utils.cc",
     "download/download_manager_utils.h",
     "download/download_offline_content_provider.cc",
@@ -430,8 +414,6 @@ static_library("browser") {
     "download/download_stats.h",
     "download/download_status_updater.cc",
     "download/download_status_updater.h",
-    "download/download_status_updater_mac.mm",
-    "download/download_status_updater_win.cc",
     "download/download_target_determiner.cc",
     "download/download_target_determiner.h",
     "download/download_target_determiner_delegate.h",
@@ -461,7 +443,6 @@ static_library("browser") {
     "download/simple_download_manager_coordinator_factory.h",
     "download/trusted_sources_manager.cc",
     "download/trusted_sources_manager.h",
-    "download/trusted_sources_manager_win.cc",
     "engagement/important_sites_usage_counter.cc",
     "engagement/important_sites_usage_counter.h",
     "engagement/important_sites_util.cc",
@@ -478,9 +459,15 @@ static_library("browser") {
     "engagement/site_engagement_service.h",
     "engagement/site_engagement_service_factory.cc",
     "engagement/site_engagement_service_factory.h",
+    "enterprise/browser_management/browser_management_service.cc",
+    "enterprise/browser_management/browser_management_service.h",
+    "enterprise/browser_management/browser_management_status_provider.cc",
+    "enterprise/browser_management/browser_management_status_provider.h",
     "enterprise/util/managed_browser_utils.cc",
     "enterprise/util/managed_browser_utils.h",
     "expired_flags_list.h",
+    "external_protocol/auto_launch_protocols_policy_handler.cc",
+    "external_protocol/auto_launch_protocols_policy_handler.h",
     "external_protocol/external_protocol_handler.cc",
     "external_protocol/external_protocol_handler.h",
     "external_protocol/external_protocol_observer.cc",
@@ -497,11 +484,17 @@ static_library("browser") {
     "favicon/large_icon_service_factory.h",
     "feature_engagement/tracker_factory.cc",
     "feature_engagement/tracker_factory.h",
+    "federated_learning/floc_id_provider.h",
+    "federated_learning/floc_id_provider_factory.cc",
+    "federated_learning/floc_id_provider_factory.h",
+    "federated_learning/floc_id_provider_impl.cc",
+    "federated_learning/floc_id_provider_impl.h",
+    "federated_learning/floc_remote_permission_service.cc",
+    "federated_learning/floc_remote_permission_service.h",
+    "federated_learning/floc_remote_permission_service_factory.cc",
+    "federated_learning/floc_remote_permission_service_factory.h",
     "file_select_helper.cc",
     "file_select_helper.h",
-    "file_select_helper_contacts_android.cc",
-    "file_select_helper_contacts_android.h",
-    "file_select_helper_mac.mm",
     "file_util_service.cc",
     "file_util_service.h",
     "flag_descriptions.cc",
@@ -510,8 +503,6 @@ static_library("browser") {
     "font_pref_change_notifier.h",
     "font_pref_change_notifier_factory.cc",
     "font_pref_change_notifier_factory.h",
-    "fullscreen_mac.mm",
-    "fullscreen_win.cc",
     "games/games_service_factory.cc",
     "games/games_service_factory.h",
     "gcm/gcm_product_util.cc",
@@ -524,14 +515,8 @@ static_library("browser") {
     "generic_sensor/sensor_permission_context.h",
     "geolocation/geolocation_permission_context_delegate.cc",
     "geolocation/geolocation_permission_context_delegate.h",
-    "geolocation/geolocation_permission_context_delegate_android.cc",
-    "geolocation/geolocation_permission_context_delegate_android.h",
     "geolocation/geolocation_permission_context_extensions.cc",
     "geolocation/geolocation_permission_context_extensions.h",
-    "global_keyboard_shortcuts_mac.h",
-    "global_keyboard_shortcuts_mac.mm",
-    "google/did_run_updater_win.cc",
-    "google/did_run_updater_win.h",
     "google/google_brand.cc",
     "google/google_brand.h",
     "google/google_search_domain_mixing_metrics_emitter.cc",
@@ -543,8 +528,6 @@ static_library("browser") {
     "gpu/gpu_mode_manager.cc",
     "gpu/gpu_mode_manager.h",
     "hang_monitor/hang_crash_dump.h",
-    "hang_monitor/hang_crash_dump_mac.cc",
-    "hang_monitor/hang_crash_dump_win.cc",
     "heavy_ad_intervention/heavy_ad_blocklist.cc",
     "heavy_ad_intervention/heavy_ad_blocklist.h",
     "heavy_ad_intervention/heavy_ad_features.cc",
@@ -577,10 +560,6 @@ static_library("browser") {
     "history/web_history_service_factory.h",
     "icon_loader.cc",
     "icon_loader.h",
-    "icon_loader_android.cc",
-    "icon_loader_chromeos.cc",
-    "icon_loader_mac.mm",
-    "icon_loader_win.cc",
     "icon_manager.cc",
     "icon_manager.h",
     "idle/idle_detection_permission_context.cc",
@@ -593,11 +572,6 @@ static_library("browser") {
     "infobars/infobar_responder.h",
     "infobars/infobar_service.cc",
     "infobars/infobar_service.h",
-    "install_verification/win/module_info.h",
-    "install_verification/win/module_list.cc",
-    "install_verification/win/module_list.h",
-    "install_verification/win/module_verification_common.cc",
-    "install_verification/win/module_verification_common.h",
     "installable/installable_ambient_badge_infobar_delegate.h",
     "installable/installable_data.cc",
     "installable/installable_data.h",
@@ -628,9 +602,30 @@ static_library("browser") {
     "language/url_language_histogram_factory.h",
     "lifetime/application_lifetime.cc",
     "lifetime/application_lifetime.h",
-    "lifetime/application_lifetime_mac.mm",
     "lifetime/browser_shutdown.cc",
     "lifetime/browser_shutdown.h",
+    "lite_video/lite_video_decider.cc",
+    "lite_video/lite_video_decider.h",
+    "lite_video/lite_video_features.cc",
+    "lite_video/lite_video_features.h",
+    "lite_video/lite_video_hint.cc",
+    "lite_video/lite_video_hint.h",
+    "lite_video/lite_video_hint_cache.cc",
+    "lite_video/lite_video_hint_cache.h",
+    "lite_video/lite_video_keyed_service.cc",
+    "lite_video/lite_video_keyed_service.h",
+    "lite_video/lite_video_keyed_service_factory.cc",
+    "lite_video/lite_video_keyed_service_factory.h",
+    "lite_video/lite_video_navigation_metrics.cc",
+    "lite_video/lite_video_navigation_metrics.h",
+    "lite_video/lite_video_observer.cc",
+    "lite_video/lite_video_observer.h",
+    "lite_video/lite_video_switches.cc",
+    "lite_video/lite_video_switches.h",
+    "lite_video/lite_video_user_blocklist.cc",
+    "lite_video/lite_video_user_blocklist.h",
+    "lite_video/lite_video_util.cc",
+    "lite_video/lite_video_util.h",
     "lookalikes/lookalike_url_blocking_page.cc",
     "lookalikes/lookalike_url_blocking_page.h",
     "lookalikes/lookalike_url_controller_client.cc",
@@ -641,26 +636,6 @@ static_library("browser") {
     "lookalikes/lookalike_url_service.h",
     "lookalikes/lookalike_url_tab_storage.cc",
     "lookalikes/lookalike_url_tab_storage.h",
-    "mac/bluetooth_utility.h",
-    "mac/bluetooth_utility.mm",
-    "mac/dock.h",
-    "mac/dock.mm",
-    "mac/exception_processor.h",
-    "mac/exception_processor.mm",
-    "mac/install_from_dmg.h",
-    "mac/install_from_dmg.mm",
-    "mac/keystone_glue.h",
-    "mac/keystone_glue.mm",
-    "mac/keystone_registration.h",
-    "mac/keystone_registration.mm",
-    "mac/mac_startup_profiler.cc",
-    "mac/mac_startup_profiler.h",
-    "mac/master_prefs.h",
-    "mac/master_prefs.mm",
-    "mac/nsprocessinfo_additions.h",
-    "mac/nsprocessinfo_additions.mm",
-    "mac/relauncher.h",
-    "mac/relauncher.mm",
     "media/cast_mirroring_service_host.cc",
     "media/cast_mirroring_service_host.h",
     "media/cast_remoting_connector.cc",
@@ -669,8 +644,6 @@ static_library("browser") {
     "media/feeds/media_feeds_utils.h",
     "media/history/media_history_contents_observer.cc",
     "media/history/media_history_contents_observer.h",
-    "media/history/media_history_feed_associated_origins_table.cc",
-    "media/history/media_history_feed_associated_origins_table.h",
     "media/history/media_history_feed_items_table.cc",
     "media/history/media_history_feed_items_table.h",
     "media/history/media_history_feeds_table.cc",
@@ -777,9 +750,6 @@ static_library("browser") {
     "media/webrtc/webrtc_text_log_handler.cc",
     "media/webrtc/webrtc_text_log_handler.h",
     "media/webrtc/window_icon_util.h",
-    "media/webrtc/window_icon_util_chromeos.cc",
-    "media/webrtc/window_icon_util_mac.mm",
-    "media/webrtc/window_icon_util_win.cc",
     "memory/chrome_browser_main_extra_parts_memory.cc",
     "memory/chrome_browser_main_extra_parts_memory.h",
     "memory/enterprise_memory_limit_evaluator.cc",
@@ -788,19 +758,12 @@ static_library("browser") {
     "memory/enterprise_memory_limit_pref_observer.h",
     "memory_details.cc",
     "memory_details.h",
-    "memory_details_android.cc",
-    "memory_details_linux.cc",
-    "memory_details_mac.cc",
-    "memory_details_win.cc",
-    "metrics/antivirus_metrics_provider_win.cc",
-    "metrics/antivirus_metrics_provider_win.h",
     "metrics/bluetooth_available_utility.cc",
     "metrics/bluetooth_available_utility.h",
     "metrics/browser_window_histogram_helper.cc",
     "metrics/browser_window_histogram_helper.h",
     "metrics/chrome_browser_main_extra_parts_metrics.cc",
     "metrics/chrome_browser_main_extra_parts_metrics.h",
-    "metrics/chrome_browser_main_extra_parts_metrics_mac.mm",
     "metrics/chrome_feature_list_creator.cc",
     "metrics/chrome_feature_list_creator.h",
     "metrics/chrome_metrics_service_accessor.cc",
@@ -811,14 +774,10 @@ static_library("browser") {
     "metrics/chrome_metrics_services_manager_client.h",
     "metrics/chrome_stability_metrics_provider.cc",
     "metrics/chrome_stability_metrics_provider.h",
-    "metrics/google_update_metrics_provider_win.cc",
-    "metrics/google_update_metrics_provider_win.h",
     "metrics/https_engagement_metrics_provider.cc",
     "metrics/https_engagement_metrics_provider.h",
     "metrics/incognito_observer.cc",
     "metrics/incognito_observer.h",
-    "metrics/jumplist_metrics_win.cc",
-    "metrics/jumplist_metrics_win.h",
     "metrics/metrics_memory_details.cc",
     "metrics/metrics_memory_details.h",
     "metrics/metrics_reporting_state.cc",
@@ -827,8 +786,6 @@ static_library("browser") {
     "metrics/network_quality_estimator_provider_impl.h",
     "metrics/oom/out_of_memory_reporter.cc",
     "metrics/oom/out_of_memory_reporter.h",
-    "metrics/power_metrics_provider_mac.h",
-    "metrics/power_metrics_provider_mac.mm",
     "metrics/process_memory_metrics_emitter.cc",
     "metrics/process_memory_metrics_emitter.h",
     "metrics/renderer_uptime_tracker.cc",
@@ -837,8 +794,6 @@ static_library("browser") {
     "metrics/renderer_uptime_web_contents_observer.h",
     "metrics/sampling_metrics_provider.cc",
     "metrics/sampling_metrics_provider.h",
-    "metrics/subprocess_metrics_provider.cc",
-    "metrics/subprocess_metrics_provider.h",
     "metrics/tab_count_metrics.cc",
     "metrics/tab_count_metrics.h",
     "metrics/tab_footprint_aggregator.cc",
@@ -847,8 +802,6 @@ static_library("browser") {
     "metrics/testing/metrics_reporting_pref_helper.h",
     "metrics/thread_watcher.cc",
     "metrics/thread_watcher.h",
-    "metrics/thread_watcher_android.cc",
-    "metrics/thread_watcher_android.h",
     "metrics/thread_watcher_report_hang.cc",
     "metrics/thread_watcher_report_hang.h",
     "metrics/ukm_background_recorder_service.cc",
@@ -865,8 +818,6 @@ static_library("browser") {
     "native_file_system/native_file_system_tab_helper.h",
     "native_file_system/origin_scoped_native_file_system_permission_context.cc",
     "native_file_system/origin_scoped_native_file_system_permission_context.h",
-    "native_file_system/tab_scoped_native_file_system_permission_context.cc",
-    "native_file_system/tab_scoped_native_file_system_permission_context.h",
     "native_window_notification_source.h",
     "navigation_predictor/navigation_predictor.cc",
     "navigation_predictor/navigation_predictor.h",
@@ -893,7 +844,6 @@ static_library("browser") {
     "net/file_downloader.cc",
     "net/file_downloader.h",
     "net/net_error_diagnostics_dialog.h",
-    "net/net_error_diagnostics_dialog_win.cc",
     "net/net_error_tab_helper.cc",
     "net/net_error_tab_helper.h",
     "net/net_export_helper.cc",
@@ -920,8 +870,6 @@ static_library("browser") {
     "net/secure_dns_policy_handler.h",
     "net/secure_dns_util.cc",
     "net/secure_dns_util.h",
-    "net/service_providers_win.cc",
-    "net/service_providers_win.h",
     "net/stub_resolver_config_reader.cc",
     "net/stub_resolver_config_reader.h",
     "net/system_network_context_manager.cc",
@@ -930,17 +878,12 @@ static_library("browser") {
     "net_benchmarking.h",
     "nfc/nfc_permission_context.cc",
     "nfc/nfc_permission_context.h",
-    "nfc/nfc_permission_context_android.cc",
-    "nfc/nfc_permission_context_android.h",
-    "notifications/alert_dispatcher_mac.h",
     "notifications/metrics/notification_metrics_logger.cc",
     "notifications/metrics/notification_metrics_logger.h",
     "notifications/metrics/notification_metrics_logger_factory.cc",
     "notifications/metrics/notification_metrics_logger_factory.h",
     "notifications/non_persistent_notification_handler.cc",
     "notifications/non_persistent_notification_handler.h",
-    "notifications/notification_channels_provider_android.cc",
-    "notifications/notification_channels_provider_android.h",
     "notifications/notification_common.cc",
     "notifications/notification_common.h",
     "notifications/notification_display_service.cc",
@@ -955,8 +898,6 @@ static_library("browser") {
     "notifications/notification_permission_context.h",
     "notifications/notification_platform_bridge.cc",
     "notifications/notification_platform_bridge.h",
-    "notifications/notification_platform_bridge_mac.h",
-    "notifications/notification_platform_bridge_mac.mm",
     "notifications/notification_trigger_scheduler.cc",
     "notifications/notification_trigger_scheduler.h",
     "notifications/notification_ui_manager.h",
@@ -1001,6 +942,8 @@ static_library("browser") {
     "optimization_guide/optimization_guide_permissions_util.h",
     "optimization_guide/optimization_guide_session_statistic.cc",
     "optimization_guide/optimization_guide_session_statistic.h",
+    "optimization_guide/optimization_guide_test_util.cc",
+    "optimization_guide/optimization_guide_test_util.h",
     "optimization_guide/optimization_guide_top_host_provider.cc",
     "optimization_guide/optimization_guide_top_host_provider.h",
     "optimization_guide/optimization_guide_util.cc",
@@ -1061,6 +1004,8 @@ static_library("browser") {
     "page_load_metrics/observers/omnibox_suggestion_used_page_load_metrics_observer.h",
     "page_load_metrics/observers/optimization_guide_page_load_metrics_observer.cc",
     "page_load_metrics/observers/optimization_guide_page_load_metrics_observer.h",
+    "page_load_metrics/observers/portal_page_load_metrics_observer.cc",
+    "page_load_metrics/observers/portal_page_load_metrics_observer.h",
     "page_load_metrics/observers/previews_page_load_metrics_observer.cc",
     "page_load_metrics/observers/previews_page_load_metrics_observer.h",
     "page_load_metrics/observers/previews_ukm_observer.cc",
@@ -1095,8 +1040,6 @@ static_library("browser") {
     "paint_preview/services/paint_preview_tab_service_factory.h",
     "password_manager/account_storage/account_password_store_factory.cc",
     "password_manager/account_storage/account_password_store_factory.h",
-    "password_manager/biometric_authenticator_android.cc",
-    "password_manager/biometric_authenticator_android.h",
     "password_manager/bulk_leak_check_service_factory.cc",
     "password_manager/bulk_leak_check_service_factory.h",
     "password_manager/chrome_biometric_authenticator.h",
@@ -1104,10 +1047,6 @@ static_library("browser") {
     "password_manager/chrome_password_manager_client.h",
     "password_manager/field_info_manager_factory.cc",
     "password_manager/field_info_manager_factory.h",
-    "password_manager/password_manager_util_mac.h",
-    "password_manager/password_manager_util_mac.mm",
-    "password_manager/password_manager_util_win.cc",
-    "password_manager/password_manager_util_win.h",
     "password_manager/password_store_factory.cc",
     "password_manager/password_store_factory.h",
     "password_manager/password_store_utils.cc",
@@ -1115,8 +1054,12 @@ static_library("browser") {
     "payments/payment_handler_permission_context.cc",
     "payments/payment_handler_permission_context.h",
     "payments/ssl_validity_checker.cc",
+    "performance_hints/performance_hints_features.cc",
+    "performance_hints/performance_hints_features.h",
     "performance_hints/performance_hints_observer.cc",
     "performance_hints/performance_hints_observer.h",
+    "performance_hints/performance_hints_rewrite_handler.cc",
+    "performance_hints/performance_hints_rewrite_handler.h",
     "performance_manager/browser_child_process_watcher.cc",
     "performance_manager/browser_child_process_watcher.h",
     "performance_manager/chrome_browser_main_extra_parts_performance_manager.cc",
@@ -1139,10 +1082,6 @@ static_library("browser") {
     "performance_manager/mechanisms/high_pmf_memory_pressure_signals.h",
     "performance_manager/mechanisms/working_set_trimmer.cc",
     "performance_manager/mechanisms/working_set_trimmer.h",
-    "performance_manager/mechanisms/working_set_trimmer_chromeos.cc",
-    "performance_manager/mechanisms/working_set_trimmer_chromeos.h",
-    "performance_manager/mechanisms/working_set_trimmer_win.cc",
-    "performance_manager/mechanisms/working_set_trimmer_win.h",
     "performance_manager/metrics/memory_pressure_metrics.cc",
     "performance_manager/metrics/memory_pressure_metrics.h",
     "performance_manager/observers/background_metrics_reporter.h",
@@ -1156,12 +1095,6 @@ static_library("browser") {
     "performance_manager/policies/policy_features.h",
     "performance_manager/policies/working_set_trimmer_policy.cc",
     "performance_manager/policies/working_set_trimmer_policy.h",
-    "performance_manager/policies/working_set_trimmer_policy_chromeos.cc",
-    "performance_manager/policies/working_set_trimmer_policy_chromeos.h",
-    "performance_manager/policies/working_set_trimmer_policy_win.cc",
-    "performance_manager/policies/working_set_trimmer_policy_win.h",
-    "performance_monitor/metric_evaluator_helper_win.cc",
-    "performance_monitor/metric_evaluator_helper_win.h",
     "performance_monitor/process_metrics_history.cc",
     "performance_monitor/process_metrics_history.h",
     "performance_monitor/process_monitor.cc",
@@ -1189,22 +1122,13 @@ static_library("browser") {
     "picture_in_picture/picture_in_picture_window_manager.cc",
     "picture_in_picture/picture_in_picture_window_manager.h",
     "platform_util.h",
-    "platform_util_chromeos.cc",
     "platform_util_internal.h",
-    "platform_util_mac.mm",
-    "platform_util_win.cc",
     "plugins/pdf_iframe_navigation_throttle.cc",
     "plugins/pdf_iframe_navigation_throttle.h",
     "plugins/pdf_plugin_placeholder_observer.cc",
     "plugins/pdf_plugin_placeholder_observer.h",
     "policy/browser_dm_token_storage.cc",
     "policy/browser_dm_token_storage.h",
-    "policy/browser_dm_token_storage_linux.cc",
-    "policy/browser_dm_token_storage_linux.h",
-    "policy/browser_dm_token_storage_mac.h",
-    "policy/browser_dm_token_storage_mac.mm",
-    "policy/browser_dm_token_storage_win.cc",
-    "policy/browser_dm_token_storage_win.h",
     "policy/browsing_history_policy_handler.cc",
     "policy/browsing_history_policy_handler.h",
     "policy/chrome_browser_policy_connector.cc",
@@ -1237,13 +1161,26 @@ static_library("browser") {
     "policy/homepage_location_policy_handler.h",
     "policy/javascript_policy_handler.cc",
     "policy/javascript_policy_handler.h",
+    "policy/messaging_layer/encryption/encryption_module.cc",
+    "policy/messaging_layer/encryption/encryption_module.h",
+    "policy/messaging_layer/public/report_client.cc",
+    "policy/messaging_layer/public/report_client.h",
+    "policy/messaging_layer/public/report_queue.cc",
+    "policy/messaging_layer/public/report_queue.h",
     "policy/messaging_layer/public/report_queue_configuration.cc",
     "policy/messaging_layer/public/report_queue_configuration.h",
+    "policy/messaging_layer/storage/storage.cc",
+    "policy/messaging_layer/storage/storage.h",
+    "policy/messaging_layer/storage/storage_module.cc",
+    "policy/messaging_layer/storage/storage_module.h",
+    "policy/messaging_layer/storage/storage_queue.cc",
+    "policy/messaging_layer/storage/storage_queue.h",
     "policy/messaging_layer/util/status.cc",
     "policy/messaging_layer/util/status.h",
     "policy/messaging_layer/util/status_macros.h",
     "policy/messaging_layer/util/statusor.cc",
     "policy/messaging_layer/util/statusor.h",
+    "policy/messaging_layer/util/task_runner_context.h",
     "policy/network_prediction_policy_handler.cc",
     "policy/network_prediction_policy_handler.h",
     "policy/profile_policy_connector.cc",
@@ -1287,6 +1224,8 @@ static_library("browser") {
     "predictors/predictors_enums.h",
     "predictors/predictors_features.cc",
     "predictors/predictors_features.h",
+    "predictors/prefetch_manager.cc",
+    "predictors/prefetch_manager.h",
     "predictors/proxy_lookup_client_impl.cc",
     "predictors/proxy_lookup_client_impl.h",
     "predictors/resolve_host_client_impl.cc",
@@ -1309,8 +1248,8 @@ static_library("browser") {
     "prefs/origin_trial_prefs.h",
     "prefs/pref_metrics_service.cc",
     "prefs/pref_metrics_service.h",
-    "prefs/pref_service_incognito_whitelist.cc",
-    "prefs/pref_service_incognito_whitelist.h",
+    "prefs/pref_service_incognito_allowlist.cc",
+    "prefs/pref_service_incognito_allowlist.h",
     "prefs/pref_service_syncable_util.cc",
     "prefs/pref_service_syncable_util.h",
     "prefs/profile_pref_store_manager.cc",
@@ -1321,16 +1260,22 @@ static_library("browser") {
     "prerender/isolated/isolated_prerender_features.h",
     "prerender/isolated/isolated_prerender_from_string_url_loader.cc",
     "prerender/isolated/isolated_prerender_from_string_url_loader.h",
+    "prerender/isolated/isolated_prerender_network_context_client.cc",
+    "prerender/isolated/isolated_prerender_network_context_client.h",
+    "prerender/isolated/isolated_prerender_origin_prober.cc",
+    "prerender/isolated/isolated_prerender_origin_prober.h",
     "prerender/isolated/isolated_prerender_params.cc",
     "prerender/isolated/isolated_prerender_params.h",
     "prerender/isolated/isolated_prerender_proxy_configurator.cc",
     "prerender/isolated/isolated_prerender_proxy_configurator.h",
+    "prerender/isolated/isolated_prerender_proxying_url_loader_factory.cc",
+    "prerender/isolated/isolated_prerender_proxying_url_loader_factory.h",
     "prerender/isolated/isolated_prerender_service.cc",
     "prerender/isolated/isolated_prerender_service.h",
     "prerender/isolated/isolated_prerender_service_factory.cc",
     "prerender/isolated/isolated_prerender_service_factory.h",
-    "prerender/isolated/isolated_prerender_service_workers_observer.cc",
-    "prerender/isolated/isolated_prerender_service_workers_observer.h",
+    "prerender/isolated/isolated_prerender_subresource_manager.cc",
+    "prerender/isolated/isolated_prerender_subresource_manager.h",
     "prerender/isolated/isolated_prerender_tab_helper.cc",
     "prerender/isolated/isolated_prerender_tab_helper.h",
     "prerender/isolated/isolated_prerender_url_loader.cc",
@@ -1345,8 +1290,6 @@ static_library("browser") {
     "prerender/prerender_contents.h",
     "prerender/prerender_field_trial.cc",
     "prerender/prerender_field_trial.h",
-    "prerender/prerender_final_status.cc",
-    "prerender/prerender_final_status.h",
     "prerender/prerender_handle.cc",
     "prerender/prerender_handle.h",
     "prerender/prerender_histograms.cc",
@@ -1363,8 +1306,6 @@ static_library("browser") {
     "prerender/prerender_manager_factory.h",
     "prerender/prerender_message_filter.cc",
     "prerender/prerender_message_filter.h",
-    "prerender/prerender_origin.cc",
-    "prerender/prerender_origin.h",
     "prerender/prerender_processor_impl.cc",
     "prerender/prerender_processor_impl.h",
     "prerender/prerender_tab_helper.cc",
@@ -1390,8 +1331,6 @@ static_library("browser") {
     "process_resource_usage.cc",
     "process_resource_usage.h",
     "process_singleton.h",
-    "process_singleton_mac.mm",
-    "process_singleton_win.cc",
     "profiles/avatar_menu_actions.h",
     "profiles/bookmark_model_loaded_observer.cc",
     "profiles/bookmark_model_loaded_observer.h",
@@ -1450,8 +1389,6 @@ static_library("browser") {
     "profiles/profile_metrics.cc",
     "profiles/profile_metrics.h",
     "profiles/profile_observer.h",
-    "profiles/profile_shortcut_manager_win.cc",
-    "profiles/profile_shortcut_manager_win.h",
     "profiles/profiles_state.cc",
     "profiles/profiles_state.h",
     "profiles/renderer_updater.cc",
@@ -1485,10 +1422,6 @@ static_library("browser") {
     "renderer_context_menu/context_menu_content_type_factory.h",
     "renderer_host/chrome_navigation_ui_data.cc",
     "renderer_host/chrome_navigation_ui_data.h",
-    "renderer_host/chrome_render_widget_host_view_mac_delegate.h",
-    "renderer_host/chrome_render_widget_host_view_mac_delegate.mm",
-    "renderer_host/chrome_render_widget_host_view_mac_history_swiper.h",
-    "renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm",
     "renderer_preferences_util.cc",
     "renderer_preferences_util.h",
     "reputation/local_heuristics.cc",
@@ -1532,8 +1465,6 @@ static_library("browser") {
     "search_engines/template_url_service_factory.h",
     "search_engines/ui_thread_search_terms_data.cc",
     "search_engines/ui_thread_search_terms_data.h",
-    "search_engines/ui_thread_search_terms_data_android.cc",
-    "search_engines/ui_thread_search_terms_data_android.h",
     "search_provider_logos/logo_service_factory.cc",
     "search_provider_logos/logo_service_factory.h",
     "security_events/security_event_recorder.h",
@@ -1564,15 +1495,18 @@ static_library("browser") {
     "sessions/session_common_utils.h",
     "sessions/session_data_deleter.cc",
     "sessions/session_data_deleter.h",
-    "sessions/session_restore_android.cc",
     "sessions/session_tab_helper_factory.cc",
     "sessions/session_tab_helper_factory.h",
     "sessions/tab_restore_service_factory.cc",
     "sessions/tab_restore_service_factory.h",
+    "sharesheet/sharesheet_action_cache.cc",
+    "sharesheet/sharesheet_action_cache.h",
+    "sharesheet/sharesheet_service.cc",
+    "sharesheet/sharesheet_service.h",
+    "sharesheet/sharesheet_service_factory.cc",
+    "sharesheet/sharesheet_service_factory.h",
     "sharing/ack_message_handler.cc",
     "sharing/ack_message_handler.h",
-    "sharing/click_to_call/click_to_call_message_handler_android.cc",
-    "sharing/click_to_call/click_to_call_message_handler_android.h",
     "sharing/click_to_call/feature.cc",
     "sharing/click_to_call/feature.h",
     "sharing/features.cc",
@@ -1617,8 +1551,6 @@ static_library("browser") {
     "sharing/sharing_service.h",
     "sharing/sharing_service_factory.cc",
     "sharing/sharing_service_factory.h",
-    "sharing/sharing_service_proxy_android.cc",
-    "sharing/sharing_service_proxy_android.h",
     "sharing/sharing_sync_preference.cc",
     "sharing/sharing_sync_preference.h",
     "sharing/sharing_utils.cc",
@@ -1641,11 +1573,6 @@ static_library("browser") {
     "sharing/webrtc/webrtc_flags.h",
     "shell_integration.cc",
     "shell_integration.h",
-    "shell_integration_android.cc",
-    "shell_integration_chromeos.cc",
-    "shell_integration_mac.mm",
-    "shell_integration_win.cc",
-    "shell_integration_win.h",
     "signin/about_signin_internals_factory.cc",
     "signin/about_signin_internals_factory.h",
     "signin/account_consistency_mode_manager.cc",
@@ -1684,6 +1611,8 @@ static_library("browser") {
     "signin/reauth_result.h",
     "signin/reauth_tab_helper.cc",
     "signin/reauth_tab_helper.h",
+    "signin/reauth_util.cc",
+    "signin/reauth_util.h",
     "signin/signin_error_controller_factory.cc",
     "signin/signin_error_controller_factory.h",
     "signin/signin_features.cc",
@@ -1694,29 +1623,25 @@ static_library("browser") {
     "signin/signin_profile_attributes_updater_factory.h",
     "signin/signin_promo_util.cc",
     "signin/signin_promo_util.h",
-    "signin/signin_status_metrics_provider_chromeos.cc",
-    "signin/signin_status_metrics_provider_chromeos.h",
     "signin/signin_util.cc",
     "signin/signin_util.h",
     "site_isolation/prefs_observer.cc",
     "site_isolation/prefs_observer.h",
     "site_isolation/site_details.cc",
     "site_isolation/site_details.h",
-    "site_isolation/site_isolation_policy.cc",
-    "site_isolation/site_isolation_policy.h",
     "speech/chrome_speech_recognition_manager_delegate.cc",
     "speech/chrome_speech_recognition_manager_delegate.h",
     "speech/speech_recognizer.cc",
     "speech/speech_recognizer.h",
     "speech/speech_recognizer_delegate.h",
-    "speech/tts_controller_delegate_impl.cc",
-    "speech/tts_controller_delegate_impl.h",
     "ssl/certificate_error_reporter.cc",
     "ssl/certificate_error_reporter.h",
     "ssl/chrome_security_blocking_page_factory.cc",
     "ssl/chrome_security_blocking_page_factory.h",
     "ssl/connection_help_tab_helper.cc",
     "ssl/connection_help_tab_helper.h",
+    "ssl/insecure_form/insecure_form_controller_client.cc",
+    "ssl/insecure_form/insecure_form_controller_client.h",
     "ssl/insecure_sensitive_input_driver.cc",
     "ssl/insecure_sensitive_input_driver.h",
     "ssl/insecure_sensitive_input_driver_factory.cc",
@@ -1740,8 +1665,6 @@ static_library("browser") {
     "ssl/stateful_ssl_host_state_delegate_factory.h",
     "ssl/tls_deprecation_config.cc",
     "ssl/tls_deprecation_config.h",
-    "ssl/typed_navigation_timing_throttle.cc",
-    "ssl/typed_navigation_timing_throttle.h",
     "startup_data.cc",
     "startup_data.h",
     "status_icons/status_icon.cc",
@@ -1763,6 +1686,10 @@ static_library("browser") {
     "subresource_filter/subresource_filter_profile_context.h",
     "subresource_filter/subresource_filter_profile_context_factory.cc",
     "subresource_filter/subresource_filter_profile_context_factory.h",
+    "subresource_redirect/https_image_compression_bypass_decider.cc",
+    "subresource_redirect/https_image_compression_bypass_decider.h",
+    "subresource_redirect/https_image_compression_infobar_decider.cc",
+    "subresource_redirect/https_image_compression_infobar_decider.h",
     "subresource_redirect/subresource_redirect_observer.cc",
     "subresource_redirect/subresource_redirect_observer.h",
     "sync/bookmark_sync_service_factory.cc",
@@ -1791,12 +1718,8 @@ static_library("browser") {
     "sync/sessions/sync_sessions_web_contents_router_factory.h",
     "sync/sync_encryption_keys_tab_helper.cc",
     "sync/sync_encryption_keys_tab_helper.h",
-    "sync/sync_error_infobar_delegate_android.cc",
-    "sync/sync_error_infobar_delegate_android.h",
     "sync/sync_startup_tracker.cc",
     "sync/sync_startup_tracker.h",
-    "sync/trusted_vault_client_android.cc",
-    "sync/trusted_vault_client_android.h",
     "sync/user_event_service_factory.cc",
     "sync/user_event_service_factory.h",
     "tab/state/tab_state_db.cc",
@@ -1809,8 +1732,6 @@ static_library("browser") {
     "tab_contents/tab_util.h",
     "task_manager/web_contents_tags.cc",
     "task_manager/web_contents_tags.h",
-    "themes/theme_helper_win.cc",
-    "themes/theme_helper_win.h",
     "tracing/background_tracing_field_trial.cc",
     "tracing/background_tracing_field_trial.h",
     "tracing/background_tracing_metrics_provider.cc",
@@ -1823,8 +1744,6 @@ static_library("browser") {
     "tracing/trace_event_system_stats_monitor.h",
     "transition_manager/full_browser_transition_manager.cc",
     "transition_manager/full_browser_transition_manager.h",
-    "translate/android/translate_utils.cc",
-    "translate/android/translate_utils.h",
     "translate/chrome_translate_client.cc",
     "translate/chrome_translate_client.h",
     "translate/translate_accept_languages_factory.cc",
@@ -1866,55 +1785,10 @@ static_library("browser") {
     "vr/ui_suppressed_element.h",
     "vr/vr_tab_helper.cc",
     "vr/vr_tab_helper.h",
-    "vr/webxr_permission_context.cc",
-    "vr/webxr_permission_context.h",
     "wake_lock/wake_lock_permission_context.cc",
     "wake_lock/wake_lock_permission_context.h",
     "web_data_service_factory.cc",
     "web_data_service_factory.h",
-    "win/app_icon.cc",
-    "win/app_icon.h",
-    "win/automation_controller.cc",
-    "win/automation_controller.h",
-    "win/browser_util.cc",
-    "win/browser_util.h",
-    "win/chrome_elf_init.cc",
-    "win/chrome_elf_init.h",
-    "win/chrome_select_file_dialog_factory.cc",
-    "win/chrome_select_file_dialog_factory.h",
-    "win/conflicts/enumerate_input_method_editors.cc",
-    "win/conflicts/enumerate_input_method_editors.h",
-    "win/conflicts/enumerate_shell_extensions.cc",
-    "win/conflicts/enumerate_shell_extensions.h",
-    "win/conflicts/inspection_results_cache.cc",
-    "win/conflicts/inspection_results_cache.h",
-    "win/conflicts/module_database.cc",
-    "win/conflicts/module_database.h",
-    "win/conflicts/module_database_observer.h",
-    "win/conflicts/module_event_sink_impl.cc",
-    "win/conflicts/module_event_sink_impl.h",
-    "win/conflicts/module_inspector.cc",
-    "win/conflicts/module_inspector.h",
-    "win/conflicts/third_party_metrics_recorder.cc",
-    "win/conflicts/third_party_metrics_recorder.h",
-    "win/jumplist.cc",
-    "win/jumplist.h",
-    "win/jumplist_factory.cc",
-    "win/jumplist_factory.h",
-    "win/jumplist_file_util.cc",
-    "win/jumplist_file_util.h",
-    "win/jumplist_update_util.cc",
-    "win/jumplist_update_util.h",
-    "win/jumplist_updater.cc",
-    "win/jumplist_updater.h",
-    "win/settings_app_monitor.cc",
-    "win/settings_app_monitor.h",
-    "win/taskbar_icon_finder.cc",
-    "win/taskbar_icon_finder.h",
-    "win/titlebar_config.cc",
-    "win/titlebar_config.h",
-    "win/ui_automation_util.cc",
-    "win/ui_automation_util.h",
   ]
 
   configs += [
@@ -1956,7 +1830,6 @@ static_library("browser") {
     ":expired_flags_list",
     ":ntp_background_proto",
     ":permissions_proto",
-    ":reporting_record_proto",
     ":resource_prefetch_predictor_proto",
     ":status_proto",
     ":tab_state_db_content_proto",
@@ -1984,6 +1857,7 @@ static_library("browser") {
     "//chrome/browser/metrics/variations:chrome_ui_string_overrider_factory",
     "//chrome/browser/net:probe_message_proto",
     "//chrome/browser/notifications",
+    "//chrome/browser/privacy_budget",
     "//chrome/browser/profiling_host",
     "//chrome/browser/push_messaging:budget_proto",
     "//chrome/browser/reputation:proto",
@@ -2000,13 +1874,14 @@ static_library("browser") {
     "//chrome/browser/updates/announcement_notification",
     "//chrome/common:channel_info",
     "//chrome/common/net",
+    "//chrome/common/performance_manager/mojom",
     "//chrome/installer/util:with_no_strings",
     "//components/assist_ranker",
     "//components/autofill/content/browser",
     "//components/autofill/core/browser",
     "//components/background_task_scheduler",
-    "//components/blacklist/opt_out_blacklist:opt_out_blacklist",
-    "//components/blacklist/opt_out_blacklist/sql:opt_out_blacklist_sql",
+    "//components/blocklist/opt_out_blocklist:opt_out_blocklist",
+    "//components/blocklist/opt_out_blocklist/sql:opt_out_blocklist_sql",
     "//components/bookmarks/browser",
     "//components/bookmarks/managed",
     "//components/browser_sync",
@@ -2030,6 +1905,7 @@ static_library("browser") {
     "//components/contextual_search/content:browser",
     "//components/contextual_search/core:browser",
     "//components/cookie_config",
+    "//components/country_codes",
     "//components/crx_file",
     "//components/data_reduction_proxy/core/browser",
     "//components/data_use_measurement/core:ascriber",
@@ -2042,11 +1918,14 @@ static_library("browser") {
     "//components/download/public/background_service:public",
     "//components/embedder_support",
     "//components/encrypted_messages",
+    "//components/enterprise",
+    "//components/enterprise/common/proto:connectors_proto",
     "//components/error_page/common",
     "//components/favicon/content",
     "//components/favicon/core",
     "//components/favicon_base",
     "//components/feature_engagement",
+    "//components/federated_learning",
     "//components/filename_generation",
     "//components/find_in_page",
     "//components/flags_ui",
@@ -2056,6 +1935,7 @@ static_library("browser") {
     "//components/history/content/browser",
     "//components/history/core/browser",
     "//components/history/core/common",
+    "//components/infobars/content",
     "//components/infobars/core",
     "//components/invalidation/impl",
     "//components/javascript_dialogs",
@@ -2067,8 +1947,8 @@ static_library("browser") {
     "//components/lookalikes/core",
     "//components/metrics:call_stack_profile_collector",
     "//components/metrics:component_metrics",
+    "//components/metrics:content",
     "//components/metrics:demographic_metrics_provider",
-    "//components/metrics:gpu",
     "//components/metrics:net",
     "//components/metrics:ui",
     "//components/metrics_services_manager",
@@ -2101,7 +1981,10 @@ static_library("browser") {
     "//components/policy/core/browser",
     "//components/policy/proto",
     "//components/policy/proto:policy_record_constants",
+    "//components/policy/proto:reporting_record_proto",
     "//components/prefs",
+    "//components/prerender/common",
+    "//components/prerender/common:mojo_bindings",
     "//components/previews/content",
     "//components/previews/core",
     "//components/profile_metrics",
@@ -2215,6 +2098,7 @@ static_library("browser") {
     "//printing/buildflags",
     "//rlz/buildflags",
     "//services/audio/public/cpp",
+    "//services/cert_verifier:lib",
     "//services/data_decoder/public/cpp",
     "//services/device/public/cpp:device_features",
     "//services/device/public/cpp/usb",
@@ -2278,18 +2162,6 @@ static_library("browser") {
     "//ui/web_dialogs",
   ]
 
-  if (is_win) {
-    libs += [
-      "secur32.lib",
-
-      # Needed for _variant_t used in browser_dm_token_storage_win.cc
-      "comsuppw.lib",
-    ]
-    sources +=
-        [ "component_updater/recovery_improved_component_installer_win.cc" ]
-    deps += [ "//chrome/elevation_service:elevation_service_idl" ]
-  }
-
   if (is_posix || is_fuchsia) {
     sources += [
       "download/trusted_sources_manager_posix.cc",
@@ -2332,6 +2204,8 @@ static_library("browser") {
       "android/autofill_assistant/ui_controller_android.h",
       "android/autofill_assistant/ui_controller_android_utils.cc",
       "android/autofill_assistant/ui_controller_android_utils.h",
+      "android/autofill_assistant/view_handler_android.cc",
+      "android/autofill_assistant/view_handler_android.h",
       "android/background_sync_launcher_android.cc",
       "android/background_sync_launcher_android.h",
       "android/background_tab_manager.cc",
@@ -2631,15 +2505,11 @@ static_library("browser") {
       "android/preferences/browser_prefs_android.h",
       "android/preferences/clipboard_android.cc",
       "android/preferences/clipboard_android.h",
-      "android/preferences/cookie_controls_bridge.cc",
-      "android/preferences/cookie_controls_bridge.h",
       "android/preferences/cookie_controls_service_bridge.cc",
       "android/preferences/cookie_controls_service_bridge.h",
       "android/preferences/pref_change_registrar_android.cc",
       "android/preferences/pref_change_registrar_android.h",
       "android/preferences/pref_service_bridge.cc",
-      "android/preferences/pref_service_bridge.h",
-      "android/preferences/prefs.h",
       "android/preferences/privacy_preferences_manager.cc",
       "android/profile_key_startup_accessor.cc",
       "android/profile_key_startup_accessor.h",
@@ -2705,8 +2575,6 @@ static_library("browser") {
       "android/tab_favicon.h",
       "android/tab_printer.cc",
       "android/tab_printer.h",
-      "android/tab_state.cc",
-      "android/tab_state.h",
       "android/tab_web_contents_delegate_android.cc",
       "android/tab_web_contents_delegate_android.h",
       "android/trusted_cdn.cc",
@@ -2720,6 +2588,8 @@ static_library("browser") {
       "android/usb/web_usb_chooser_android.h",
       "android/warmup_manager.cc",
       "android/web_contents_factory.cc",
+      "android/web_contents_state.cc",
+      "android/web_contents_state.h",
       "android/webapk/webapk_handler_delegate.cc",
       "android/webapk/webapk_handler_delegate.h",
       "android/webapk/webapk_icon_hasher.cc",
@@ -2756,6 +2626,7 @@ static_library("browser") {
       "android/webapps/add_to_homescreen_params.h",
       "android/webapps/webapp_registry.cc",
       "android/webapps/webapp_registry.h",
+      "android/webauth/fido2helper_native_android.cc",
       "autofill/accessory_controller.h",
       "autofill/address_accessory_controller.h",
       "autofill/address_accessory_controller_impl.cc",
@@ -2778,8 +2649,14 @@ static_library("browser") {
       "autofill/manual_filling_view_interface.h",
       "banners/app_banner_manager_android.cc",
       "banners/app_banner_manager_android.h",
+      "browser_process_platform_part_android.cc",
+      "browser_process_platform_part_android.h",
       "chrome_browser_field_trials_mobile.cc",
       "chrome_browser_field_trials_mobile.h",
+      "chrome_browser_main_android.cc",
+      "chrome_browser_main_android.h",
+      "crash_upload_list/crash_upload_list_android.cc",
+      "crash_upload_list/crash_upload_list_android.h",
       "data_reduction_proxy/data_reduction_promo_infobar_delegate_android.cc",
       "data_reduction_proxy/data_reduction_promo_infobar_delegate_android.h",
       "data_reduction_proxy/data_reduction_proxy_settings_android.cc",
@@ -2797,9 +2674,8 @@ static_library("browser") {
       "download/android/download_controller.h",
       "download/android/download_controller_base.cc",
       "download/android/download_controller_base.h",
-      "download/android/download_location_dialog_bridge.h",
-      "download/android/download_location_dialog_bridge_impl.cc",
-      "download/android/download_location_dialog_bridge_impl.h",
+      "download/android/download_dialog_bridge.cc",
+      "download/android/download_dialog_bridge.h",
       "download/android/download_manager_bridge.cc",
       "download/android/download_manager_bridge.h",
       "download/android/download_manager_service.cc",
@@ -2821,11 +2697,18 @@ static_library("browser") {
       "download/android/service/download_task_scheduler.cc",
       "download/android/service/download_task_scheduler.h",
       "download/android/string_utils.cc",
+      "download/download_crx_util_android.cc",
       "engagement/site_engagement_service_android.cc",
       "engagement/site_engagement_service_android.h",
+      "enterprise/util/android_enterprise_info.cc",
+      "enterprise/util/android_enterprise_info.h",
+      "file_select_helper_contacts_android.cc",
+      "file_select_helper_contacts_android.h",
       "first_run/android/first_run_utils.cc",
       "flags/android/chrome_feature_list.cc",
       "flags/android/chrome_feature_list.h",
+      "geolocation/geolocation_permission_context_delegate_android.cc",
+      "geolocation/geolocation_permission_context_delegate_android.h",
       "history/android/android_history_provider_service.cc",
       "history/android/android_history_provider_service.h",
       "history/android/android_provider_backend.cc",
@@ -2834,9 +2717,14 @@ static_library("browser") {
       "history/android/bookmark_model_sql_handler.h",
       "history/android/sqlite_cursor.cc",
       "history/android/sqlite_cursor.h",
+      "icon_loader_android.cc",
       "installable/installable_ambient_badge_infobar_delegate.cc",
       "installable/installed_webapp_bridge.cc",
       "installable/installed_webapp_bridge.h",
+      "installable/installed_webapp_geolocation_bridge.cc",
+      "installable/installed_webapp_geolocation_bridge.h",
+      "installable/installed_webapp_geolocation_context.cc",
+      "installable/installed_webapp_geolocation_context.h",
       "installable/installed_webapp_provider.cc",
       "installable/installed_webapp_provider.h",
       "lifetime/application_lifetime_android.cc",
@@ -2859,11 +2747,18 @@ static_library("browser") {
       "media/android/router/media_router_dialog_controller_android.h",
       "media/webrtc/screen_capture_infobar_delegate_android.cc",
       "media/webrtc/screen_capture_infobar_delegate_android.h",
+      "memory_details_android.cc",
       "metrics/chrome_android_metrics_provider.cc",
       "metrics/chrome_android_metrics_provider.h",
       "metrics/incognito_observer_android.cc",
       "metrics/page_load_metrics_provider.cc",
       "metrics/page_load_metrics_provider.h",
+      "metrics/thread_watcher_android.cc",
+      "metrics/thread_watcher_android.h",
+      "nfc/nfc_permission_context_android.cc",
+      "nfc/nfc_permission_context_android.h",
+      "notifications/notification_channels_provider_android.cc",
+      "notifications/notification_channels_provider_android.h",
       "notifications/notification_platform_bridge_android.cc",
       "notifications/notification_platform_bridge_android.h",
       "notifications/notification_trigger_scheduler_android.cc",
@@ -2909,6 +2804,8 @@ static_library("browser") {
       "password_manager/android/touch_to_fill_view.h",
       "password_manager/android/update_password_infobar_delegate_android.cc",
       "password_manager/android/update_password_infobar_delegate_android.h",
+      "password_manager/biometric_authenticator_android.cc",
+      "password_manager/biometric_authenticator_android.h",
       "payments/android/can_make_payment_query_android.cc",
       "payments/android/journey_logger_android.cc",
       "payments/android/journey_logger_android.h",
@@ -2949,8 +2846,16 @@ static_library("browser") {
       "search/contextual_search_policy_handler_android.h",
       "search_engines/template_url_service_factory_android.cc",
       "search_engines/template_url_service_factory_android.h",
+      "search_engines/ui_thread_search_terms_data_android.cc",
+      "search_engines/ui_thread_search_terms_data_android.h",
+      "sessions/session_restore_android.cc",
+      "sharing/click_to_call/click_to_call_message_handler_android.cc",
+      "sharing/click_to_call/click_to_call_message_handler_android.h",
       "sharing/shared_clipboard/shared_clipboard_message_handler_android.cc",
       "sharing/shared_clipboard/shared_clipboard_message_handler_android.h",
+      "sharing/sharing_service_proxy_android.cc",
+      "sharing/sharing_service_proxy_android.h",
+      "shell_integration_android.cc",
       "signin/identity_services_provider_android.cc",
       "signin/signin_manager_android_factory.cc",
       "signin/signin_manager_android_factory.h",
@@ -2968,10 +2873,16 @@ static_library("browser") {
       "sync/glue/synced_window_delegates_getter_android.h",
       "sync/profile_sync_service_android.cc",
       "sync/profile_sync_service_android.h",
+      "sync/sync_error_infobar_delegate_android.cc",
+      "sync/sync_error_infobar_delegate_android.h",
+      "sync/trusted_vault_client_android.cc",
+      "sync/trusted_vault_client_android.h",
       "touch_to_fill/touch_to_fill_controller.cc",
       "touch_to_fill/touch_to_fill_controller.h",
       "translate/android/translate_bridge.cc",
       "translate/android/translate_bridge.h",
+      "translate/android/translate_utils.cc",
+      "translate/android/translate_utils.h",
       "updates/update_notification_client.cc",
       "updates/update_notification_client.h",
       "updates/update_notification_service_bridge_android.cc",
@@ -2996,7 +2907,9 @@ static_library("browser") {
       "//chrome/browser/notifications/scheduler/public",
       "//chrome/browser/offline_pages/prefetch/notifications",
       "//chrome/browser/optimization_guide/android:jni_headers",
+      "//chrome/browser/password_check/android",
       "//chrome/browser/payments/android:jni_headers",
+      "//chrome/browser/safety_check/android",
       "//chrome/browser/share",
       "//chrome/browser/updates",
       "//chrome/common:non_code_constants",
@@ -3074,15 +2987,6 @@ static_library("browser") {
       ]
       deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
     }
-
-    if (enable_password_change_in_leaked_dialog) {
-      sources += [
-        "password_manager/credential_leak_password_change_controller_android.cc",
-        "password_manager/credential_leak_password_change_controller_android.h",
-      ]
-
-      defines += [ "ENABLE_PASSWORD_CHANGE" ]
-    }
   } else {  # !is_android
     sources += [
       "accessibility/caption_controller.cc",
@@ -3149,6 +3053,12 @@ static_library("browser") {
       "banners/app_banner_manager_desktop.h",
       "bookmarks/bookmark_html_writer.cc",
       "bookmarks/bookmark_html_writer.h",
+      "browsing_data/access_context_audit_database.cc",
+      "browsing_data/access_context_audit_database.h",
+      "browsing_data/access_context_audit_service.cc",
+      "browsing_data/access_context_audit_service.h",
+      "browsing_data/access_context_audit_service_factory.cc",
+      "browsing_data/access_context_audit_service_factory.h",
       "certificate_viewer.h",
       "chrome_browser_field_trials_desktop.cc",
       "chrome_browser_field_trials_desktop.h",
@@ -3158,6 +3068,8 @@ static_library("browser") {
       "component_updater/intervention_policy_database_component_installer.h",
       "component_updater/soda_component_installer.cc",
       "component_updater/soda_component_installer.h",
+      "content_settings/generated_cookie_prefs.cc",
+      "content_settings/generated_cookie_prefs.h",
       "custom_handlers/register_protocol_handler_permission_request.cc",
       "custom_handlers/register_protocol_handler_permission_request.h",
       "device_identity/device_identity_provider.cc",
@@ -3211,8 +3123,10 @@ static_library("browser") {
       "enterprise/connectors/connectors_prefs.h",
       "enterprise/connectors/enterprise_connectors_policy_handler.cc",
       "enterprise/connectors/enterprise_connectors_policy_handler.h",
-      "enterprise/connectors/service_providers.cc",
-      "enterprise/connectors/service_providers.h",
+      "enterprise/connectors/reporting_service_settings.cc",
+      "enterprise/connectors/reporting_service_settings.h",
+      "enterprise/connectors/service_provider_config.cc",
+      "enterprise/connectors/service_provider_config.h",
       "enterprise/reporting/browser_report_generator.cc",
       "enterprise/reporting/browser_report_generator.h",
       "enterprise/reporting/extension_info.cc",
@@ -3225,15 +3139,12 @@ static_library("browser") {
       "enterprise/reporting/notification/extension_request_observer.h",
       "enterprise/reporting/notification/extension_request_observer_factory.cc",
       "enterprise/reporting/notification/extension_request_observer_factory.h",
-      "enterprise/reporting/policy_info.cc",
-      "enterprise/reporting/policy_info.h",
       "enterprise/reporting/prefs.cc",
       "enterprise/reporting/prefs.h",
       "enterprise/reporting/profile_report_generator.cc",
       "enterprise/reporting/profile_report_generator.h",
       "enterprise/reporting/report_generator.cc",
       "enterprise/reporting/report_generator.h",
-      "enterprise/reporting/report_request_definition.h",
       "enterprise/reporting/report_request_queue_generator.cc",
       "enterprise/reporting/report_request_queue_generator.h",
       "enterprise/reporting/report_scheduler.cc",
@@ -3261,9 +3172,6 @@ static_library("browser") {
       "first_run/first_run.h",
       "first_run/first_run_dialog.h",
       "first_run/first_run_internal.h",
-      "first_run/first_run_internal_linux.cc",
-      "first_run/first_run_internal_mac.mm",
-      "first_run/first_run_internal_win.cc",
       "font_family_cache.cc",
       "font_family_cache.h",
       "hid/chrome_hid_delegate.cc",
@@ -3278,7 +3186,6 @@ static_library("browser") {
       "importer/external_process_importer_host.h",
       "importer/firefox_profile_lock.cc",
       "importer/firefox_profile_lock.h",
-      "importer/firefox_profile_lock_win.cc",
       "importer/importer_list.cc",
       "importer/importer_list.h",
       "importer/importer_lock_dialog.h",
@@ -3305,6 +3212,16 @@ static_library("browser") {
       "media/feeds/media_feeds_service.h",
       "media/feeds/media_feeds_service_factory.cc",
       "media/feeds/media_feeds_service_factory.h",
+      "media/kaleidoscope/constants.cc",
+      "media/kaleidoscope/constants.h",
+      "media/kaleidoscope/kaleidoscope_data_provider_impl.cc",
+      "media/kaleidoscope/kaleidoscope_data_provider_impl.h",
+      "media/kaleidoscope/kaleidoscope_switches.cc",
+      "media/kaleidoscope/kaleidoscope_switches.h",
+      "media/kaleidoscope/kaleidoscope_tab_helper.cc",
+      "media/kaleidoscope/kaleidoscope_tab_helper.h",
+      "media/kaleidoscope/kaleidoscope_ui.cc",
+      "media/kaleidoscope/kaleidoscope_ui.h",
       "media/unified_autoplay_config.cc",
       "media/unified_autoplay_config.h",
       "media/webrtc/desktop_capture_devices_util.cc",
@@ -3361,8 +3278,6 @@ static_library("browser") {
       "memory/swap_thrashing_monitor.h",
       "memory/swap_thrashing_monitor_delegate.cc",
       "memory/swap_thrashing_monitor_delegate.h",
-      "memory/swap_thrashing_monitor_delegate_win.cc",
-      "memory/swap_thrashing_monitor_delegate_win.h",
       "metrics/browser_activity_watcher.cc",
       "metrics/browser_activity_watcher.h",
       "metrics/desktop_platform_features_metrics_provider.cc",
@@ -3379,6 +3294,8 @@ static_library("browser") {
       "metrics/desktop_session_duration/desktop_session_duration_observer.h",
       "metrics/desktop_session_duration/desktop_session_duration_tracker.cc",
       "metrics/desktop_session_duration/desktop_session_duration_tracker.h",
+      "metrics/desktop_session_duration/touch_mode_stats_tracker.cc",
+      "metrics/desktop_session_duration/touch_mode_stats_tracker.h",
       "metrics/first_web_contents_profiler.cc",
       "metrics/first_web_contents_profiler.h",
       "metrics/incognito_observer_desktop.cc",
@@ -3387,8 +3304,23 @@ static_library("browser") {
       "metrics/tab_stats_tracker.cc",
       "metrics/tab_stats_tracker.h",
       "metrics/tab_stats_tracker_delegate.h",
-      "metrics/tab_stats_tracker_delegate_win.cc",
-      "metrics/tab_stats_tracker_win.cc",
+      "nearby_sharing/attachment.h",
+      "nearby_sharing/client/nearby_share_api_call_flow.h",
+      "nearby_sharing/client/nearby_share_api_call_flow_impl.cc",
+      "nearby_sharing/client/nearby_share_api_call_flow_impl.h",
+      "nearby_sharing/client/nearby_share_request_error.cc",
+      "nearby_sharing/client/nearby_share_request_error.h",
+      "nearby_sharing/fast_initiation_manager.cc",
+      "nearby_sharing/fast_initiation_manager.h",
+      "nearby_sharing/file_attachment.cc",
+      "nearby_sharing/file_attachment.h",
+      "nearby_sharing/nearby_connection.h",
+      "nearby_sharing/nearby_connections_manager.h",
+      "nearby_sharing/nearby_connections_manager_impl.cc",
+      "nearby_sharing/nearby_connections_manager_impl.h",
+      "nearby_sharing/nearby_constants.h",
+      "nearby_sharing/nearby_process_manager.cc",
+      "nearby_sharing/nearby_process_manager.h",
       "nearby_sharing/nearby_sharing_prefs.cc",
       "nearby_sharing/nearby_sharing_prefs.h",
       "nearby_sharing/nearby_sharing_service.h",
@@ -3396,14 +3328,28 @@ static_library("browser") {
       "nearby_sharing/nearby_sharing_service_factory.h",
       "nearby_sharing/nearby_sharing_service_impl.cc",
       "nearby_sharing/nearby_sharing_service_impl.h",
+      "nearby_sharing/share_target.cc",
+      "nearby_sharing/share_target.h",
+      "nearby_sharing/share_target_discovered_callback.h",
+      "nearby_sharing/tachyon/constants.h",
+      "nearby_sharing/tachyon/receive_messages_express.cc",
+      "nearby_sharing/tachyon/receive_messages_express.h",
+      "nearby_sharing/tachyon/send_message_express.cc",
+      "nearby_sharing/tachyon/send_message_express.h",
+      "nearby_sharing/tachyon/stream_parser.cc",
+      "nearby_sharing/tachyon/stream_parser.h",
+      "nearby_sharing/tachyon/token_fetcher.cc",
+      "nearby_sharing/tachyon/token_fetcher.h",
+      "nearby_sharing/text_attachment.cc",
+      "nearby_sharing/text_attachment.h",
+      "nearby_sharing/transfer_metadata.cc",
+      "nearby_sharing/transfer_metadata.h",
+      "nearby_sharing/transfer_update_callback.h",
       "notifications/notification_system_observer.cc",
       "notifications/notification_system_observer.h",
       "notifications/profile_notification.cc",
       "notifications/profile_notification.h",
       "obsolete_system/obsolete_system.h",
-      "obsolete_system/obsolete_system_linux.cc",
-      "obsolete_system/obsolete_system_mac.cc",
-      "obsolete_system/obsolete_system_win.cc",
       "page_load_metrics/observers/session_restore_page_load_metrics_observer.cc",
       "page_load_metrics/observers/session_restore_page_load_metrics_observer.h",
       "performance_manager/mechanisms/page_discarder.cc",
@@ -3446,7 +3392,6 @@ static_library("browser") {
       "profile_resetter/triggered_profile_resetter.h",
       "profile_resetter/triggered_profile_resetter_factory.cc",
       "profile_resetter/triggered_profile_resetter_factory.h",
-      "profile_resetter/triggered_profile_resetter_win.cc",
       "profiles/profile_shortcut_manager.cc",
       "profiles/profile_shortcut_manager.h",
       "profiles/profile_window.cc",
@@ -3516,8 +3461,6 @@ static_library("browser") {
       "resource_coordinator/tab_lifecycle_unit_source.h",
       "resource_coordinator/tab_manager.cc",
       "resource_coordinator/tab_manager.h",
-      "resource_coordinator/tab_manager_delegate_chromeos.cc",
-      "resource_coordinator/tab_manager_delegate_chromeos.h",
       "resource_coordinator/tab_manager_resource_coordinator_signal_observer.cc",
       "resource_coordinator/tab_manager_resource_coordinator_signal_observer.h",
       "resource_coordinator/tab_manager_stats_collector.cc",
@@ -3526,10 +3469,10 @@ static_library("browser") {
       "resource_coordinator/tab_manager_web_contents_data.h",
       "resource_coordinator/tab_metrics_logger.cc",
       "resource_coordinator/tab_metrics_logger.h",
-      "resource_coordinator/tracing_lifecycle_unit_observer.cc",
-      "resource_coordinator/tracing_lifecycle_unit_observer.h",
       "resource_coordinator/usage_clock.cc",
       "resource_coordinator/usage_clock.h",
+      "safe_browsing/generated_safe_browsing_pref.cc",
+      "safe_browsing/generated_safe_browsing_pref.h",
       "search/background/ntp_background_data.cc",
       "search/background/ntp_background_data.h",
       "search/background/ntp_background_service.cc",
@@ -3685,6 +3628,8 @@ static_library("browser") {
       "task_manager/providers/per_profile_worker_task_tracker.h",
       "task_manager/providers/render_process_host_task_provider.cc",
       "task_manager/providers/render_process_host_task_provider.h",
+      "task_manager/providers/spare_render_process_host_task_provider.cc",
+      "task_manager/providers/spare_render_process_host_task_provider.h",
       "task_manager/providers/task.cc",
       "task_manager/providers/task.h",
       "task_manager/providers/task_provider.cc",
@@ -3737,8 +3682,6 @@ static_library("browser") {
       "task_manager/providers/worker_task_provider.cc",
       "task_manager/providers/worker_task_provider.h",
       "task_manager/sampling/shared_sampler.h",
-      "task_manager/sampling/shared_sampler_win.cc",
-      "task_manager/sampling/shared_sampler_win_defines.h",
       "task_manager/sampling/task_group.cc",
       "task_manager/sampling/task_group.h",
       "task_manager/sampling/task_group_sampler.cc",
@@ -3794,7 +3737,11 @@ static_library("browser") {
       "//base/util/memory_pressure",
       "//base/util/timer",
       "//chrome/app/vector_icons",
-      "//chrome/browser/enterprise/connectors:connectors_proto",
+      "//chrome/browser/media/kaleidoscope/mojom",
+      "//chrome/browser/nearby_sharing/certificates",
+      "//chrome/browser/nearby_sharing/logging",
+      "//chrome/browser/nearby_sharing/proto",
+      "//chrome/browser/nearby_sharing/tachyon/proto",
       "//chrome/browser/policy:path_parser",
       "//chrome/browser/profile_resetter:profile_reset_report_proto",
       "//chrome/browser/resource_coordinator:intervention_policy_database_proto",
@@ -3805,12 +3752,6 @@ static_library("browser") {
       "//chrome/common/importer:interfaces",
       "//chrome/common/search:generate_chrome_colors_info",
       "//chrome/common/themes:autogenerated_theme_util",
-      "//chrome/services/app_service:lib",
-      "//chrome/services/app_service/public/cpp:app_update",
-      "//chrome/services/app_service/public/cpp:icon_loader",
-      "//chrome/services/app_service/public/cpp:intents",
-      "//chrome/services/app_service/public/cpp:preferred_apps",
-      "//chrome/services/app_service/public/cpp:publisher",
       "//chrome/services/sharing/public/cpp",
       "//chrome/services/sharing/public/mojom",
       "//chrome/services/speech:buildflags",
@@ -3819,7 +3760,13 @@ static_library("browser") {
       "//components/keep_alive_registry",
       "//components/ntp_snippets",
       "//components/schema_org:extractor",
+      "//components/services/app_service:lib",
       "//components/services/app_service/public/cpp:app_file_handling",
+      "//components/services/app_service/public/cpp:app_update",
+      "//components/services/app_service/public/cpp:icon_loader",
+      "//components/services/app_service/public/cpp:intents",
+      "//components/services/app_service/public/cpp:preferred_apps",
+      "//components/services/app_service/public/cpp:publisher",
       "//components/soda:constants",
       "//components/vector_icons",
       "//components/web_modal",
@@ -3865,6 +3812,8 @@ static_library("browser") {
       "apps/app_service/uninstall_dialog.h",
       "apps/app_service/web_apps_chromeos.cc",
       "apps/app_service/web_apps_chromeos.h",
+      "browser_process_platform_part_chromeos.cc",
+      "browser_process_platform_part_chromeos.h",
       "component_updater/cros_component_installer_chromeos.cc",
       "component_updater/cros_component_installer_chromeos.h",
       "component_updater/cros_component_manager.cc",
@@ -3887,6 +3836,7 @@ static_library("browser") {
       "google/google_brand_chromeos.h",
       "google/google_brand_code_map_chromeos.cc",
       "google/google_brand_code_map_chromeos.h",
+      "icon_loader_chromeos.cc",
       "media/chromeos_login_media_access_handler.cc",
       "media/chromeos_login_media_access_handler.h",
       "media/public_session_media_access_handler.cc",
@@ -3895,6 +3845,7 @@ static_library("browser") {
       "media/public_session_tab_capture_access_handler.h",
       "media/webrtc/desktop_media_list_ash.cc",
       "media/webrtc/desktop_media_list_ash.h",
+      "media/webrtc/window_icon_util_chromeos.cc",
       "media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc",
       "media_galleries/chromeos/mtp_device_delegate_impl_chromeos.h",
       "media_galleries/chromeos/mtp_device_object_enumerator.cc",
@@ -3943,12 +3894,24 @@ static_library("browser") {
       "notifications/notifier_controller.h",
       "notifications/web_page_notifier_controller.cc",
       "notifications/web_page_notifier_controller.h",
+      "performance_manager/mechanisms/working_set_trimmer_chromeos.cc",
+      "performance_manager/mechanisms/working_set_trimmer_chromeos.h",
+      "performance_manager/policies/working_set_trimmer_policy_chromeos.cc",
+      "performance_manager/policies/working_set_trimmer_policy_chromeos.h",
+      "platform_util_chromeos.cc",
       "policy/default_geolocation_policy_handler.cc",
       "policy/default_geolocation_policy_handler.h",
       "renderer_context_menu/quick_answers_menu_observer.cc",
       "renderer_context_menu/quick_answers_menu_observer.h",
+      "resource_coordinator/tab_manager_delegate_chromeos.cc",
+      "resource_coordinator/tab_manager_delegate_chromeos.h",
+      "shell_integration_chromeos.cc",
+      "signin/signin_status_metrics_provider_chromeos.cc",
+      "signin/signin_status_metrics_provider_chromeos.h",
       "speech/tts_chromeos.cc",
       "speech/tts_chromeos.h",
+      "speech/tts_controller_delegate_impl.cc",
+      "speech/tts_controller_delegate_impl.h",
       "sync/sync_error_notifier_ash.cc",
       "sync/sync_error_notifier_ash.h",
       "sync/sync_error_notifier_factory_ash.cc",
@@ -3976,11 +3939,13 @@ static_library("browser") {
     ]
     deps += [
       "//ash/public/cpp",
+      "//ash/public/cpp/external_arc",
       "//chrome/browser/chromeos",
-      "//chrome/services/app_service/public/cpp:instance_update",
       "//chromeos/components/account_manager",
+      "//chromeos/components/cdm_factory_daemon:cdm_factory_daemon_browser",
       "//chromeos/components/quick_answers",
       "//chromeos/components/sync_wifi",
+      "//chromeos/lacros/mojom",
       "//chromeos/services/assistant/public/cpp",
       "//chromeos/services/cellular_setup",
       "//chromeos/services/device_sync/public/mojom",
@@ -3992,8 +3957,10 @@ static_library("browser") {
       "//chromeos/services/secure_channel/public/mojom",
       "//chromeos/strings",
       "//components/metrics/structured",
+      "//components/services/app_service/public/cpp:instance_update",
       "//components/services/font:lib",
       "//components/services/font/public/mojom",
+      "//components/user_manager",
       "//ui/events/ozone",
       "//ui/ozone",
     ]
@@ -4028,14 +3995,55 @@ static_library("browser") {
     ]
   }
 
+  if (chromeos_is_browser_only) {
+    sources += [
+      "metrics/lacros_metrics_provider.cc",
+      "metrics/lacros_metrics_provider.h",
+    ]
+    deps += [
+      "//chromeos/lacros/browser",
+      "//chromeos/lacros/mojom",
+    ]
+  }
+
   if (is_win) {
+    libs += [
+      "secur32.lib",
+
+      # Needed for _variant_t used in browser_dm_token_storage_win.cc
+      "comsuppw.lib",
+    ]
     sources += [
       "badging/badge_manager_delegate_win.cc",
       "badging/badge_manager_delegate_win.h",
+      "browser_process_platform_part_win.cc",
+      "browser_process_platform_part_win.h",
       "browser_switcher/browser_switcher_policy_migrator.cc",
       "browser_switcher/browser_switcher_policy_migrator.h",
       "browser_switcher/browser_switcher_service_win.cc",
       "browser_switcher/browser_switcher_service_win.h",
+      "chrome_browser_main_win.cc",
+      "chrome_browser_main_win.h",
+      "component_updater/recovery_improved_component_installer_win.cc",
+      "component_updater/sw_reporter_installer_win.cc",
+      "component_updater/sw_reporter_installer_win.h",
+      "download/download_status_updater_win.cc",
+      "download/trusted_sources_manager_win.cc",
+      "first_run/first_run_internal_win.cc",
+      "first_run/upgrade_util_win.cc",
+      "first_run/upgrade_util_win.h",
+      "fullscreen_win.cc",
+      "google/did_run_updater_win.cc",
+      "google/did_run_updater_win.h",
+      "hang_monitor/hang_crash_dump_win.cc",
+      "icon_loader_win.cc",
+      "importer/firefox_profile_lock_win.cc",
+      "install_verification/win/module_info.h",
+      "install_verification/win/module_list.cc",
+      "install_verification/win/module_list.h",
+      "install_verification/win/module_verification_common.cc",
+      "install_verification/win/module_verification_common.h",
+      "media/webrtc/window_icon_util_win.cc",
       "media_galleries/win/mtp_device_delegate_impl_win.cc",
       "media_galleries/win/mtp_device_delegate_impl_win.h",
       "media_galleries/win/mtp_device_object_entry.cc",
@@ -4048,16 +4056,98 @@ static_library("browser") {
       "media_galleries/win/portable_device_map_service.h",
       "media_galleries/win/snapshot_file_details.cc",
       "media_galleries/win/snapshot_file_details.h",
+      "memory/swap_thrashing_monitor_delegate_win.cc",
+      "memory/swap_thrashing_monitor_delegate_win.h",
+      "memory_details_win.cc",
+      "metrics/antivirus_metrics_provider_win.cc",
+      "metrics/antivirus_metrics_provider_win.h",
+      "metrics/google_update_metrics_provider_win.cc",
+      "metrics/google_update_metrics_provider_win.h",
+      "metrics/jumplist_metrics_win.cc",
+      "metrics/jumplist_metrics_win.h",
+      "metrics/tab_stats_tracker_delegate_win.cc",
+      "metrics/tab_stats_tracker_win.cc",
+      "net/net_error_diagnostics_dialog_win.cc",
+      "net/service_providers_win.cc",
+      "net/service_providers_win.h",
       "notifications/win/notification_image_retainer.cc",
       "notifications/win/notification_image_retainer.h",
       "notifications/win/notification_template_builder.cc",
       "notifications/win/notification_template_builder.h",
+      "obsolete_system/obsolete_system_win.cc",
+      "password_manager/password_manager_util_win.cc",
+      "password_manager/password_manager_util_win.h",
+      "performance_manager/mechanisms/working_set_trimmer_win.cc",
+      "performance_manager/mechanisms/working_set_trimmer_win.h",
+      "performance_manager/policies/working_set_trimmer_policy_win.cc",
+      "performance_manager/policies/working_set_trimmer_policy_win.h",
+      "performance_monitor/metric_evaluator_helper_win.cc",
+      "performance_monitor/metric_evaluator_helper_win.h",
+      "platform_util_win.cc",
+      "policy/browser_dm_token_storage_win.cc",
+      "policy/browser_dm_token_storage_win.h",
+      "process_singleton_win.cc",
+      "profile_resetter/triggered_profile_resetter_win.cc",
+      "profiles/profile_shortcut_manager_win.cc",
+      "profiles/profile_shortcut_manager_win.h",
+      "shell_integration_win.cc",
+      "shell_integration_win.h",
       "sync/roaming_profile_directory_deleter_win.cc",
       "sync/roaming_profile_directory_deleter_win.h",
+      "task_manager/sampling/shared_sampler_win.cc",
+      "task_manager/sampling/shared_sampler_win_defines.h",
       "taskbar/taskbar_decorator_win.cc",
       "taskbar/taskbar_decorator_win.h",
+      "themes/theme_helper_win.cc",
+      "themes/theme_helper_win.h",
+      "upgrade_detector/get_installed_version_win.cc",
+      "win/app_icon.cc",
+      "win/app_icon.h",
+      "win/automation_controller.cc",
+      "win/automation_controller.h",
+      "win/browser_util.cc",
+      "win/browser_util.h",
+      "win/chrome_elf_init.cc",
+      "win/chrome_elf_init.h",
+      "win/chrome_select_file_dialog_factory.cc",
+      "win/chrome_select_file_dialog_factory.h",
+      "win/conflicts/enumerate_input_method_editors.cc",
+      "win/conflicts/enumerate_input_method_editors.h",
+      "win/conflicts/enumerate_shell_extensions.cc",
+      "win/conflicts/enumerate_shell_extensions.h",
+      "win/conflicts/inspection_results_cache.cc",
+      "win/conflicts/inspection_results_cache.h",
+      "win/conflicts/module_database.cc",
+      "win/conflicts/module_database.h",
+      "win/conflicts/module_database_observer.h",
+      "win/conflicts/module_event_sink_impl.cc",
+      "win/conflicts/module_event_sink_impl.h",
+      "win/conflicts/module_inspector.cc",
+      "win/conflicts/module_inspector.h",
+      "win/conflicts/third_party_metrics_recorder.cc",
+      "win/conflicts/third_party_metrics_recorder.h",
+      "win/icon_reader_service.cc",
+      "win/icon_reader_service.h",
+      "win/jumplist.cc",
+      "win/jumplist.h",
+      "win/jumplist_factory.cc",
+      "win/jumplist_factory.h",
+      "win/jumplist_file_util.cc",
+      "win/jumplist_file_util.h",
+      "win/jumplist_update_util.cc",
+      "win/jumplist_update_util.h",
+      "win/jumplist_updater.cc",
+      "win/jumplist_updater.h",
       "win/parental_controls.cc",
       "win/parental_controls.h",
+      "win/settings_app_monitor.cc",
+      "win/settings_app_monitor.h",
+      "win/taskbar_icon_finder.cc",
+      "win/taskbar_icon_finder.h",
+      "win/titlebar_config.cc",
+      "win/titlebar_config.h",
+      "win/ui_automation_util.cc",
+      "win/ui_automation_util.h",
       "win/util_win_service.cc",
       "win/util_win_service.h",
     ]
@@ -4075,6 +4165,7 @@ static_library("browser") {
       "//chrome/chrome_elf:dll_hash",
       "//chrome/common:version_header",
       "//chrome/credential_provider/common:common_constants",
+      "//chrome/elevation_service:elevation_service_idl",
       "//chrome/install_static:install_static_util",
       "//chrome/notification_helper:constants",
       "//chrome/services/util_win/public/mojom",
@@ -4088,6 +4179,7 @@ static_library("browser") {
       "//third_party/wtl",
       "//ui/aura_extra",
       "//ui/base:fullscreen_win",
+      "//ui/base/cursor",
     ]
     allow_circular_includes_from +=
         [ "//chrome/browser/safe_browsing/chrome_cleaner" ]
@@ -4167,13 +4259,72 @@ static_library("browser") {
   if (is_mac) {
     allow_circular_includes_from += [ "//chrome/browser/apps/app_shim" ]
     sources += [
+      "app_controller_mac.h",
+      "app_controller_mac.mm",
       "apps/intent_helper/mac_apps_navigation_throttle.h",
       "apps/intent_helper/mac_apps_navigation_throttle.mm",
       "badging/badge_manager_delegate_mac.cc",
       "badging/badge_manager_delegate_mac.h",
+      "browser_process_platform_part_mac.h",
+      "browser_process_platform_part_mac.mm",
+      "chrome_browser_application_mac.h",
+      "chrome_browser_application_mac.mm",
+      "chrome_browser_main_mac.h",
+      "chrome_browser_main_mac.mm",
+      "download/download_status_updater_mac.mm",
       "download/drag_download_item_mac.mm",
+      "file_select_helper_mac.mm",
+      "first_run/first_run_internal_mac.mm",
+      "first_run/upgrade_util_mac.cc",
+      "fullscreen_mac.mm",
+      "global_keyboard_shortcuts_mac.h",
+      "global_keyboard_shortcuts_mac.mm",
+      "hang_monitor/hang_crash_dump_mac.cc",
+      "icon_loader_mac.mm",
+      "lifetime/application_lifetime_mac.mm",
+      "mac/bluetooth_utility.h",
+      "mac/bluetooth_utility.mm",
+      "mac/dock.h",
+      "mac/dock.mm",
+      "mac/exception_processor.h",
+      "mac/exception_processor.mm",
+      "mac/install_from_dmg.h",
+      "mac/install_from_dmg.mm",
+      "mac/keystone_glue.h",
+      "mac/keystone_glue.mm",
+      "mac/keystone_registration.h",
+      "mac/keystone_registration.mm",
+      "mac/mac_startup_profiler.cc",
+      "mac/mac_startup_profiler.h",
+      "mac/master_prefs.h",
+      "mac/master_prefs.mm",
+      "mac/nsprocessinfo_additions.h",
+      "mac/nsprocessinfo_additions.mm",
+      "mac/relauncher.h",
+      "mac/relauncher.mm",
+      "media/webrtc/window_icon_util_mac.mm",
       "media_galleries/mac/mtp_device_delegate_impl_mac.h",
       "media_galleries/mac/mtp_device_delegate_impl_mac.mm",
+      "memory_details_mac.cc",
+      "metrics/chrome_browser_main_extra_parts_metrics_mac.mm",
+      "metrics/power_metrics_provider_mac.h",
+      "metrics/power_metrics_provider_mac.mm",
+      "notifications/alert_dispatcher_mac.h",
+      "notifications/notification_platform_bridge_mac.h",
+      "notifications/notification_platform_bridge_mac.mm",
+      "obsolete_system/obsolete_system_mac.cc",
+      "password_manager/password_manager_util_mac.h",
+      "password_manager/password_manager_util_mac.mm",
+      "platform_util_mac.mm",
+      "policy/browser_dm_token_storage_mac.h",
+      "policy/browser_dm_token_storage_mac.mm",
+      "process_singleton_mac.mm",
+      "renderer_host/chrome_render_widget_host_view_mac_delegate.h",
+      "renderer_host/chrome_render_widget_host_view_mac_delegate.mm",
+      "renderer_host/chrome_render_widget_host_view_mac_history_swiper.h",
+      "renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm",
+      "shell_integration_mac.mm",
+      "upgrade_detector/get_installed_version_mac.mm",
     ]
     deps += [
       "//chrome/app_shim",
@@ -4200,6 +4351,15 @@ static_library("browser") {
   }
 
   if (is_linux) {
+    sources += [
+      "chrome_browser_main_linux.cc",
+      "chrome_browser_main_linux.h",
+      "first_run/first_run_internal_linux.cc",
+      "memory_details_linux.cc",
+      "obsolete_system/obsolete_system_linux.cc",
+      "policy/browser_dm_token_storage_linux.cc",
+      "policy/browser_dm_token_storage_linux.h",
+    ]
     if (use_aura) {
       deps += [ "//third_party/fontconfig" ]
       if (use_dbus) {
@@ -4209,14 +4369,15 @@ static_library("browser") {
     if (use_x11) {
       deps += [ "//ui/gfx/x" ]
     }
-    deps += [ "//services/service_manager/zygote" ]
+  }
 
+  if (is_chromeos) {
     if (use_allocator == "tcmalloc") {
       deps += [ "//chrome/common/performance_manager/mojom" ]
 
       sources += [
-        "performance_manager/policies/dynamic_tcmalloc_policy_linux.cc",
-        "performance_manager/policies/dynamic_tcmalloc_policy_linux.h",
+        "performance_manager/policies/dynamic_tcmalloc_policy_chromeos.cc",
+        "performance_manager/policies/dynamic_tcmalloc_policy_chromeos.h",
       ]
     }
   }
@@ -4308,7 +4469,6 @@ static_library("browser") {
   if (is_win || is_mac || is_desktop_linux) {
     sources += [
       "browser_switcher/alternative_browser_driver.h",
-      "browser_switcher/alternative_browser_driver_win.cc",
       "browser_switcher/browser_switcher_navigation_throttle.cc",
       "browser_switcher/browser_switcher_navigation_throttle.h",
       "browser_switcher/browser_switcher_prefs.cc",
@@ -4322,6 +4482,9 @@ static_library("browser") {
       "browser_switcher/ieem_sitelist_parser.cc",
       "browser_switcher/ieem_sitelist_parser.h",
     ]
+    if (is_win) {
+      sources += [ "browser_switcher/alternative_browser_driver_win.cc" ]
+    }
     if (is_mac || is_desktop_linux) {
       sources += [ "browser_switcher/alternative_browser_driver_posix.cc" ]
     }
@@ -4354,9 +4517,6 @@ static_library("browser") {
       "device_identity/device_oauth2_token_store_desktop.h",
       "first_run/upgrade_util.cc",
       "first_run/upgrade_util.h",
-      "first_run/upgrade_util_mac.cc",
-      "first_run/upgrade_util_win.cc",
-      "first_run/upgrade_util_win.h",
       "lifetime/switch_utils.cc",
       "lifetime/switch_utils.h",
       "metrics/upgrade_metrics_provider.cc",
@@ -4408,8 +4568,6 @@ static_library("browser") {
       "signin/signin_global_error_factory.h",
       "upgrade_detector/get_installed_version.cc",
       "upgrade_detector/get_installed_version.h",
-      "upgrade_detector/get_installed_version_mac.mm",
-      "upgrade_detector/get_installed_version_win.cc",
       "upgrade_detector/installed_version_poller.cc",
       "upgrade_detector/installed_version_poller.h",
       "upgrade_detector/upgrade_detector_impl.cc",
@@ -4499,28 +4657,38 @@ static_library("browser") {
 
   if (use_x11) {
     sources += [
-      "chrome_browser_main_extra_parts_x11.cc",
-      "chrome_browser_main_extra_parts_x11.h",
       "password_manager/password_store_x.cc",
       "password_manager/password_store_x.h",
     ]
   }
 
+  if (use_x11 || use_ozone) {
+    sources += [
+      "chrome_browser_main_extra_parts_ozone.cc",
+      "chrome_browser_main_extra_parts_ozone.h",
+    ]
+  }
+
   if (enable_background_mode) {
     sources += [
       "background/background_application_list_model.cc",
       "background/background_application_list_model.h",
       "background/background_mode_manager.cc",
       "background/background_mode_manager.h",
-      "background/background_mode_manager_aura.cc",
-      "background/background_mode_manager_chromeos.cc",
-      "background/background_mode_manager_mac.mm",
-      "background/background_mode_manager_win.cc",
       "background/background_mode_optimizer.cc",
       "background/background_mode_optimizer.h",
     ]
-    if (!use_aura || is_win || is_chromeos) {
-      sources -= [ "background/background_mode_manager_aura.cc" ]
+    if (is_win) {
+      sources += [ "background/background_mode_manager_win.cc" ]
+    }
+    if (is_mac) {
+      sources += [ "background/background_mode_manager_mac.mm" ]
+    }
+    if (is_chromeos) {
+      sources += [ "background/background_mode_manager_chromeos.cc" ]
+    }
+    if (use_aura && !is_win && !is_chromeos) {
+      sources += [ "background/background_mode_manager_aura.cc" ]
     }
   }
   if (enable_background_contents) {
@@ -4548,9 +4716,6 @@ static_library("browser") {
       "printing/print_view_manager_common.cc",
       "printing/print_view_manager_common.h",
       "printing/printer_manager_dialog.h",
-      "printing/printer_manager_dialog_linux.cc",
-      "printing/printer_manager_dialog_mac.mm",
-      "printing/printer_manager_dialog_win.cc",
       "printing/printer_query.cc",
       "printing/printer_query.h",
       "printing/printing_init.cc",
@@ -4569,8 +4734,15 @@ static_library("browser") {
       sources += [
         "printing/pdf_to_emf_converter.cc",
         "printing/pdf_to_emf_converter.h",
+        "printing/printer_manager_dialog_win.cc",
       ]
     }
+    if (is_mac) {
+      sources += [ "printing/printer_manager_dialog_mac.mm" ]
+    }
+    if (is_linux) {
+      sources += [ "printing/printer_manager_dialog_linux.cc" ]
+    }
     if (is_win || enable_print_preview) {
       deps += [ "//chrome/services/printing/public/mojom" ]
     }
@@ -4645,13 +4817,6 @@ static_library("browser") {
     ]
   }
 
-  if (enable_kaleidoscope) {
-    deps += [
-      "//chrome/browser/media/kaleidoscope/internal",
-      "//chrome/browser/media/kaleidoscope/internal/mojom",
-    ]
-  }
-
   if (enable_legacy_desktop_in_product_help) {
     sources += [
       "feature_engagement/bookmark/bookmark_tracker.cc",
@@ -4675,21 +4840,35 @@ static_library("browser") {
 
   if (enable_dice_support) {
     sources += [
+      "signin/dice_intercepted_session_startup_helper.cc",
+      "signin/dice_intercepted_session_startup_helper.h",
       "signin/dice_response_handler.cc",
       "signin/dice_response_handler.h",
+      "signin/dice_signed_in_profile_creator.cc",
+      "signin/dice_signed_in_profile_creator.h",
       "signin/dice_tab_helper.cc",
       "signin/dice_tab_helper.h",
       "signin/dice_web_signin_interceptor.cc",
       "signin/dice_web_signin_interceptor.h",
+      "signin/dice_web_signin_interceptor_delegate.cc",
+      "signin/dice_web_signin_interceptor_delegate.h",
       "signin/dice_web_signin_interceptor_factory.cc",
       "signin/dice_web_signin_interceptor_factory.h",
       "signin/logout_tab_helper.cc",
       "signin/logout_tab_helper.h",
       "signin/process_dice_header_delegate_impl.cc",
       "signin/process_dice_header_delegate_impl.h",
-      "signin/signin_util_win.cc",
-      "signin/signin_util_win.h",
+      "signin/signin_manager.cc",
+      "signin/signin_manager.h",
+      "signin/signin_manager_factory.cc",
+      "signin/signin_manager_factory.h",
     ]
+    if (is_win) {
+      sources += [
+        "signin/signin_util_win.cc",
+        "signin/signin_util_win.h",
+      ]
+    }
   }
 
   if (enable_extensions) {
@@ -5443,10 +5622,10 @@ static_library("browser") {
   }
   if (enable_supervised_users && enable_extensions) {
     sources += [
+      "supervised_user/supervised_user_extensions_delegate_impl.cc",
+      "supervised_user/supervised_user_extensions_delegate_impl.h",
       "supervised_user/supervised_user_extensions_metrics_recorder.cc",
       "supervised_user/supervised_user_extensions_metrics_recorder.h",
-      "supervised_user/supervised_user_service_management_api_delegate.cc",
-      "supervised_user/supervised_user_service_management_api_delegate.h",
     ]
   }
 
@@ -5459,10 +5638,6 @@ static_library("browser") {
 
     if (is_win) {
       sources += [
-        "vr/consent/win_xr_consent_helper.cc",
-        "vr/consent/win_xr_consent_helper.h",
-        "vr/consent/xr_session_request_consent_manager_impl.cc",
-        "vr/consent/xr_session_request_consent_manager_impl.h",
         "vr/ui_host/vr_ui_host_impl.cc",
         "vr/ui_host/vr_ui_host_impl.h",
       ]
@@ -5486,7 +5661,7 @@ static_library("browser") {
   if (enable_wayland_server) {
     deps += [
       "//components/exo",
-      "//components/exo/wayland",
+      "//components/exo/server",
     ]
     sources += [
       "exo_parts.cc",
@@ -5703,7 +5878,6 @@ grit("resources") {
 
   if (is_chromeos && optimize_webui) {
     deps += [
-      "//chrome/browser/resources/chromeos/bluetooth_pairing_dialog:build",
       "//chrome/browser/resources/chromeos/internet_config_dialog:build",
       "//chrome/browser/resources/chromeos/internet_detail_dialog:build",
     ]
@@ -5748,6 +5922,8 @@ grit("dev_ui_browser_resources") {
     "//chrome/browser/engagement:mojo_bindings_js",
     "//chrome/browser/media:mojo_bindings_js",
     "//chrome/browser/media/feeds:mojo_bindings_js",
+    "//chrome/browser/resources/web_app_internals:components",
+    "//chrome/browser/ui/webui/internals/web_app:mojo_bindings_js",
     "//chrome/browser/ui/webui/interventions_internals:mojo_bindings_js",
   ]
   if (is_android) {
@@ -5939,6 +6115,8 @@ static_library("test_support") {
       "chooser_controller/fake_usb_chooser_controller.h",
       "download/test_download_shelf.cc",
       "download/test_download_shelf.h",
+      "hid/mock_hid_device_observer.cc",
+      "hid/mock_hid_device_observer.h",
       "profile_resetter/profile_resetter_test_base.cc",
       "profile_resetter/profile_resetter_test_base.h",
       "sessions/session_restore_test_helper.cc",
@@ -5964,8 +6142,6 @@ static_library("test_support") {
       "chromeos/arc/extensions/fake_arc_support.h",
       "chromeos/file_manager/fake_disk_mount_manager.cc",
       "chromeos/file_manager/fake_disk_mount_manager.h",
-      "chromeos/input_method/mock_assistive_window_controller.cc",
-      "chromeos/input_method/mock_assistive_window_controller.h",
       "chromeos/input_method/mock_candidate_window_controller.cc",
       "chromeos/input_method/mock_candidate_window_controller.h",
       "chromeos/input_method/mock_input_method_engine.cc",
@@ -6158,12 +6334,6 @@ if (is_android) {
   }
 }
 
-proto_library("reporting_record_proto") {
-  proto_in_dir = "//"
-  sources = [ "policy/messaging_layer/proto/record.proto" ]
-  deps = [ "//components/policy/proto:policy_record_constants" ]
-}
-
 proto_library("status_proto") {
   sources = [ "policy/messaging_layer/util/status.proto" ]
   generate_python = false