BASELINE: Update Chromium to 85.0.4183.14085-based

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

8 files changed, 364 insertions, 169 deletions

diff --git a/chromium/chrome/browser/chromeos/BUILD.gn b/chromium/chrome/browser/chromeos/BUILD.gn
index b748814c49f..44a1ea38a22 100644
--- a/chromium/chrome/browser/chromeos/BUILD.gn
+++ b/chromium/chrome/browser/chromeos/BUILD.gn
@@ -36,6 +36,7 @@ source_set("chromeos") {
     "//chromeos/dbus:runtime_probe_proto",
     "//chromeos/dbus:seneschal_proto",
     "//chromeos/dbus:vm_applications_apps_proto",
+    "//chromeos/dbus:vm_permission_service_proto",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/strings",
@@ -61,12 +62,12 @@ source_set("chromeos") {
     ":user_activity_event_proto",
     ":user_charging_event_proto",
     "crostini:crostini_installer_types_mojom",
-    "net/network_diagnostics:network_diagnostics_mojom",
     "//apps",
     "//ash",
     "//ash/public/cpp",
+    "//ash/public/cpp/external_arc",
     "//ash/public/mojom",
-    "//ash/system/message_center/arc",
+    "//base/util/timer",
     "//build:branding_buildflags",
     "//chrome/app:command_ids",
     "//chrome/app/vector_icons",
@@ -74,7 +75,7 @@ source_set("chromeos") {
     "//chrome/browser/apps/platform_apps",
     "//chrome/browser/apps/platform_apps/api",
     "//chrome/browser/chromeos/child_accounts/time_limits/web_time_limit_error_page",
-    "//chrome/browser/chromeos/net/mojom",
+    "//chrome/browser/chromeos/local_search_service/proxy:mojom",
     "//chrome/browser/chromeos/power/ml/smart_dim",
     "//chrome/browser/devtools",
     "//chrome/browser/extensions",
@@ -90,10 +91,7 @@ source_set("chromeos") {
     "//chrome/browser/web_applications/extensions:extensions",
     "//chrome/common",
     "//chrome/common/extensions/api",
-    "//chrome/common/string_matching",
-    "//chrome/services/app_service:lib",
-    "//chrome/services/app_service/public/cpp:app_update",
-    "//chrome/services/app_service/public/cpp:instance_update",
+    "//chrome/installer/util:with_no_strings",
     "//chrome/services/file_util/public/cpp",
     "//chrome/services/keymaster/public/mojom",
     "//chrome/services/printing/public/mojom",
@@ -103,6 +101,7 @@ source_set("chromeos") {
     "//chromeos/attestation",
     "//chromeos/audio",
     "//chromeos/components/account_manager",
+    "//chromeos/components/cdm_factory_daemon:cdm_factory_daemon_browser",
     "//chromeos/components/drivefs",
     "//chromeos/components/drivefs/mojom",
     "//chromeos/components/help_app_ui",
@@ -116,7 +115,9 @@ source_set("chromeos") {
     "//chromeos/components/quick_answers/public/cpp:prefs",
     "//chromeos/components/smbfs",
     "//chromeos/components/smbfs/mojom",
+    "//chromeos/components/string_matching",
     "//chromeos/components/sync_wifi",
+    "//chromeos/components/telemetry_extension_ui/mojom",
     "//chromeos/components/tether",
     "//chromeos/constants",
     "//chromeos/cryptohome",
@@ -126,10 +127,13 @@ source_set("chromeos") {
     "//chromeos/dbus:plugin_vm_service_proto",
     "//chromeos/dbus:update_engine_proto",
     "//chromeos/dbus:vm_plugin_dispatcher_proto",
+    "//chromeos/dbus/attestation",
+    "//chromeos/dbus/attestation:attestation_proto",
     "//chromeos/dbus/audio",
     "//chromeos/dbus/authpolicy",
     "//chromeos/dbus/authpolicy:authpolicy_proto",
     "//chromeos/dbus/biod",
+    "//chromeos/dbus/cdm_factory_daemon",
     "//chromeos/dbus/constants",
     "//chromeos/dbus/cros_healthd",
     "//chromeos/dbus/cryptohome",
@@ -139,6 +143,7 @@ source_set("chromeos") {
     "//chromeos/dbus/cups_proxy",
     "//chromeos/dbus/dlcservice",
     "//chromeos/dbus/dlcservice:dlcservice_proto",
+    "//chromeos/dbus/hermes",
     "//chromeos/dbus/ip_peripheral",
     "//chromeos/dbus/kerberos",
     "//chromeos/dbus/kerberos:kerberos_proto",
@@ -156,6 +161,7 @@ source_set("chromeos") {
     "//chromeos/dbus/upstart",
     "//chromeos/disks",
     "//chromeos/geolocation",
+    "//chromeos/lacros/mojom",
     "//chromeos/login/auth",
     "//chromeos/login/login_state",
     "//chromeos/login/session",
@@ -179,6 +185,7 @@ source_set("chromeos") {
     "//chromeos/services/multidevice_setup/public/cpp:prefs",
     "//chromeos/services/network_config:in_process_instance",
     "//chromeos/services/network_config/public/cpp:cpp",
+    "//chromeos/services/network_health/public/mojom",
     "//chromeos/services/secure_channel",
     "//chromeos/services/secure_channel/public/cpp/client",
     "//chromeos/settings",
@@ -217,6 +224,7 @@ source_set("chromeos") {
     "//components/language/core/browser",
     "//components/language/core/common",
     "//components/login",
+    "//components/metrics",
     "//components/metrics:serialization",
     "//components/omnibox/browser",
     "//components/onc",
@@ -239,6 +247,9 @@ source_set("chromeos") {
     "//components/rlz",
     "//components/safe_browsing/core:csd_proto",
     "//components/safe_browsing/core/db:metadata_proto",
+    "//components/services/app_service:lib",
+    "//components/services/app_service/public/cpp:app_update",
+    "//components/services/app_service/public/cpp:instance_update",
     "//components/session_manager/core",
     "//components/signin/public/identity_manager",
     "//components/signin/public/webdata",
@@ -375,8 +386,6 @@ source_set("chromeos") {
     "accessibility/spoken_feedback_event_rewriter_delegate.h",
     "accessibility/switch_access_event_handler_delegate.cc",
     "accessibility/switch_access_event_handler_delegate.h",
-    "accessibility/switch_access_panel.cc",
-    "accessibility/switch_access_panel.h",
     "account_manager/account_manager_migrator.cc",
     "account_manager/account_manager_migrator.h",
     "account_manager/account_manager_policy_controller.cc",
@@ -440,19 +449,21 @@ source_set("chromeos") {
     "app_mode/kiosk_app_icon_loader.h",
     "app_mode/kiosk_app_launch_error.cc",
     "app_mode/kiosk_app_launch_error.h",
+    "app_mode/kiosk_app_launcher.cc",
+    "app_mode/kiosk_app_launcher.h",
     "app_mode/kiosk_app_manager.cc",
     "app_mode/kiosk_app_manager.h",
     "app_mode/kiosk_app_manager_base.cc",
     "app_mode/kiosk_app_manager_base.h",
     "app_mode/kiosk_app_manager_observer.h",
+    "app_mode/kiosk_app_types.cc",
+    "app_mode/kiosk_app_types.h",
     "app_mode/kiosk_app_update_install_gate.cc",
     "app_mode/kiosk_app_update_install_gate.h",
     "app_mode/kiosk_app_update_service.cc",
     "app_mode/kiosk_app_update_service.h",
     "app_mode/kiosk_cryptohome_remover.cc",
     "app_mode/kiosk_cryptohome_remover.h",
-    "app_mode/kiosk_diagnosis_runner.cc",
-    "app_mode/kiosk_diagnosis_runner.h",
     "app_mode/kiosk_external_update_validator.cc",
     "app_mode/kiosk_external_update_validator.h",
     "app_mode/kiosk_external_updater.cc",
@@ -936,6 +947,8 @@ source_set("chromeos") {
     "crostini/crostini_shelf_utils.cc",
     "crostini/crostini_shelf_utils.h",
     "crostini/crostini_simple_types.h",
+    "crostini/crostini_stability_monitor.cc",
+    "crostini/crostini_stability_monitor.h",
     "crostini/crostini_terminal.cc",
     "crostini/crostini_terminal.h",
     "crostini/crostini_unsupported_action_notifier.cc",
@@ -1001,6 +1014,8 @@ source_set("chromeos") {
     "dbus/smb_fs_service_provider.h",
     "dbus/virtual_file_request_service_provider.cc",
     "dbus/virtual_file_request_service_provider.h",
+    "dbus/vm/vm_permission_service_provider.cc",
+    "dbus/vm/vm_permission_service_provider.h",
     "dbus/vm_applications_service_provider.cc",
     "dbus/vm_applications_service_provider.h",
     "device_sync/device_sync_client_factory.cc",
@@ -1242,6 +1257,8 @@ source_set("chromeos") {
     "first_run/first_run_controller.h",
     "first_run/first_run_view.cc",
     "first_run/first_run_view.h",
+    "first_run/help_app_first_run_field_trial.cc",
+    "first_run/help_app_first_run_field_trial.h",
     "first_run/step.cc",
     "first_run/step.h",
     "first_run/step_names.cc",
@@ -1274,6 +1291,8 @@ source_set("chromeos") {
     "input_method/assistive_suggester.h",
     "input_method/assistive_window_controller.cc",
     "input_method/assistive_window_controller.h",
+    "input_method/assistive_window_controller_delegate.h",
+    "input_method/assistive_window_properties.cc",
     "input_method/assistive_window_properties.h",
     "input_method/browser_state_monitor.cc",
     "input_method/browser_state_monitor.h",
@@ -1293,6 +1312,8 @@ source_set("chromeos") {
     "input_method/input_method_delegate_impl.h",
     "input_method/input_method_engine.cc",
     "input_method/input_method_engine.h",
+    "input_method/input_method_engine_base.cc",
+    "input_method/input_method_engine_base.h",
     "input_method/input_method_manager_impl.cc",
     "input_method/input_method_manager_impl.h",
     "input_method/input_method_persistence.cc",
@@ -1306,14 +1327,39 @@ source_set("chromeos") {
     "input_method/suggester.h",
     "input_method/suggestion_enums.h",
     "input_method/suggestion_handler_interface.h",
+    "input_method/ui/assistive_delegate.h",
+    "input_method/ui/border_factory.cc",
+    "input_method/ui/border_factory.h",
+    "input_method/ui/candidate_view.cc",
+    "input_method/ui/candidate_view.h",
+    "input_method/ui/candidate_window_constants.h",
+    "input_method/ui/candidate_window_view.cc",
+    "input_method/ui/candidate_window_view.h",
+    "input_method/ui/infolist_window.cc",
+    "input_method/ui/infolist_window.h",
+    "input_method/ui/input_method_menu_item.cc",
+    "input_method/ui/input_method_menu_item.h",
+    "input_method/ui/input_method_menu_manager.cc",
+    "input_method/ui/input_method_menu_manager.h",
+    "input_method/ui/suggestion_details.h",
+    "input_method/ui/suggestion_view.cc",
+    "input_method/ui/suggestion_view.h",
+    "input_method/ui/suggestion_window_view.cc",
+    "input_method/ui/suggestion_window_view.h",
+    "input_method/ui/undo_window.cc",
+    "input_method/ui/undo_window.h",
     "kerberos/kerberos_credentials_manager.cc",
     "kerberos/kerberos_credentials_manager.h",
     "kerberos/kerberos_credentials_manager_factory.cc",
     "kerberos/kerberos_credentials_manager_factory.h",
     "kerberos/kerberos_ticket_expiry_notification.cc",
     "kerberos/kerberos_ticket_expiry_notification.h",
+    "lacros/ash_chrome_service_impl.cc",
+    "lacros/ash_chrome_service_impl.h",
     "lacros/lacros_loader.cc",
     "lacros/lacros_loader.h",
+    "lacros/lacros_manager.cc",
+    "lacros/lacros_manager.h",
     "lacros/lacros_util.cc",
     "lacros/lacros_util.h",
     "language_preferences.cc",
@@ -1324,14 +1370,32 @@ source_set("chromeos") {
     "launcher_search_provider/launcher_search_provider_service.h",
     "launcher_search_provider/launcher_search_provider_service_factory.cc",
     "launcher_search_provider/launcher_search_provider_service_factory.h",
+    "local_search_service/content_extraction_utils.cc",
+    "local_search_service/content_extraction_utils.h",
     "local_search_service/index.cc",
     "local_search_service/index.h",
     "local_search_service/inverted_index.cc",
     "local_search_service/inverted_index.h",
+    "local_search_service/inverted_index_search.cc",
+    "local_search_service/inverted_index_search.h",
+    "local_search_service/linear_map_search.cc",
+    "local_search_service/linear_map_search.h",
     "local_search_service/local_search_service.cc",
     "local_search_service/local_search_service.h",
     "local_search_service/local_search_service_factory.cc",
     "local_search_service/local_search_service_factory.h",
+    "local_search_service/proxy/index_proxy.cc",
+    "local_search_service/proxy/index_proxy.h",
+    "local_search_service/proxy/local_search_service_proxy.cc",
+    "local_search_service/proxy/local_search_service_proxy.h",
+    "local_search_service/proxy/local_search_service_proxy_factory.cc",
+    "local_search_service/proxy/local_search_service_proxy_factory.h",
+    "local_search_service/search_metrics_reporter.cc",
+    "local_search_service/search_metrics_reporter.h",
+    "local_search_service/search_utils.cc",
+    "local_search_service/search_utils.h",
+    "local_search_service/shared_structs.cc",
+    "local_search_service/shared_structs.h",
     "locale_change_guard.cc",
     "locale_change_guard.h",
     "lock_screen_apps/app_manager.h",
@@ -1461,6 +1525,8 @@ source_set("chromeos") {
     "login/login_auth_recorder.h",
     "login/login_client_cert_usage_observer.cc",
     "login/login_client_cert_usage_observer.h",
+    "login/login_pref_names.cc",
+    "login/login_pref_names.h",
     "login/login_screen_extensions_lifetime_manager.cc",
     "login/login_screen_extensions_lifetime_manager.h",
     "login/login_screen_extensions_storage_cleaner.cc",
@@ -1510,6 +1576,8 @@ source_set("chromeos") {
     "login/saml/saml_profile_prefs.h",
     "login/screen_manager.cc",
     "login/screen_manager.h",
+    "login/screens/active_directory_password_change_screen.cc",
+    "login/screens/active_directory_password_change_screen.h",
     "login/screens/app_downloading_screen.cc",
     "login/screens/app_downloading_screen.h",
     "login/screens/arc_terms_of_service_screen.cc",
@@ -1540,6 +1608,8 @@ source_set("chromeos") {
     "login/screens/eula_screen.h",
     "login/screens/fingerprint_setup_screen.cc",
     "login/screens/fingerprint_setup_screen.h",
+    "login/screens/gaia_password_changed_screen.cc",
+    "login/screens/gaia_password_changed_screen.h",
     "login/screens/gaia_screen.cc",
     "login/screens/gaia_screen.h",
     "login/screens/gesture_navigation_screen.cc",
@@ -1575,6 +1645,8 @@ source_set("chromeos") {
     "login/screens/sync_consent_screen.h",
     "login/screens/terms_of_service_screen.cc",
     "login/screens/terms_of_service_screen.h",
+    "login/screens/tpm_error_screen.cc",
+    "login/screens/tpm_error_screen.h",
     "login/screens/update_required_screen.cc",
     "login/screens/update_required_screen.h",
     "login/screens/update_screen.cc",
@@ -1742,6 +1814,12 @@ source_set("chromeos") {
     "net/delay_network_call.h",
     "net/dhcp_wpad_url_client.cc",
     "net/dhcp_wpad_url_client.h",
+    "net/network_diagnostics/dns_latency_routine.cc",
+    "net/network_diagnostics/dns_latency_routine.h",
+    "net/network_diagnostics/dns_resolution_routine.cc",
+    "net/network_diagnostics/dns_resolution_routine.h",
+    "net/network_diagnostics/dns_resolver_present_routine.cc",
+    "net/network_diagnostics/dns_resolver_present_routine.h",
     "net/network_diagnostics/gateway_can_be_pinged_routine.cc",
     "net/network_diagnostics/gateway_can_be_pinged_routine.h",
     "net/network_diagnostics/has_secure_wifi_connection_routine.cc",
@@ -1754,8 +1832,12 @@ source_set("chromeos") {
     "net/network_diagnostics/network_diagnostics_routine.h",
     "net/network_diagnostics/signal_strength_routine.cc",
     "net/network_diagnostics/signal_strength_routine.h",
-    "net/network_health.cc",
-    "net/network_health.h",
+    "net/network_health/network_health.cc",
+    "net/network_health/network_health.h",
+    "net/network_health/network_health_localized_strings.cc",
+    "net/network_health/network_health_localized_strings.h",
+    "net/network_health/network_health_service.cc",
+    "net/network_health/network_health_service.h",
     "net/network_portal_detector_impl.cc",
     "net/network_portal_detector_impl.h",
     "net/network_portal_detector_test_impl.cc",
@@ -1834,20 +1916,18 @@ source_set("chromeos") {
     "policy/affiliated_invalidation_service_provider_impl.h",
     "policy/android_management_client.cc",
     "policy/android_management_client.h",
-    "policy/app_install_event_log.cc",
-    "policy/app_install_event_log.h",
     "policy/app_install_event_log_collector.cc",
     "policy/app_install_event_log_collector.h",
-    "policy/app_install_event_log_manager.cc",
-    "policy/app_install_event_log_manager.h",
     "policy/app_install_event_log_manager_wrapper.cc",
     "policy/app_install_event_log_manager_wrapper.h",
-    "policy/app_install_event_log_uploader.cc",
-    "policy/app_install_event_log_uploader.h",
-    "policy/app_install_event_log_util.cc",
-    "policy/app_install_event_log_util.h",
     "policy/app_install_event_logger.cc",
     "policy/app_install_event_logger.h",
+    "policy/arc_app_install_event_log.cc",
+    "policy/arc_app_install_event_log.h",
+    "policy/arc_app_install_event_log_manager.cc",
+    "policy/arc_app_install_event_log_manager.h",
+    "policy/arc_app_install_event_log_uploader.cc",
+    "policy/arc_app_install_event_log_uploader.h",
     "policy/auto_enrollment_client.h",
     "policy/auto_enrollment_client_impl.cc",
     "policy/auto_enrollment_client_impl.h",
@@ -1920,8 +2000,18 @@ source_set("chromeos") {
     "policy/enrollment_config.h",
     "policy/enrollment_handler_chromeos.cc",
     "policy/enrollment_handler_chromeos.h",
+    "policy/enrollment_requisition_manager.cc",
+    "policy/enrollment_requisition_manager.h",
+    "policy/extension_install_event_log.cc",
+    "policy/extension_install_event_log.h",
     "policy/extension_install_event_log_collector.cc",
     "policy/extension_install_event_log_collector.h",
+    "policy/extension_install_event_log_manager.cc",
+    "policy/extension_install_event_log_manager.h",
+    "policy/extension_install_event_log_manager_wrapper.cc",
+    "policy/extension_install_event_log_manager_wrapper.h",
+    "policy/extension_install_event_log_uploader.cc",
+    "policy/extension_install_event_log_uploader.h",
     "policy/extension_install_event_logger.cc",
     "policy/extension_install_event_logger.h",
     "policy/external_data_handlers/cloud_external_data_policy_handler.cc",
@@ -1950,6 +2040,13 @@ source_set("chromeos") {
     "policy/heartbeat_scheduler.h",
     "policy/hostname_handler.cc",
     "policy/hostname_handler.h",
+    "policy/install_event_log.h",
+    "policy/install_event_log_manager.cc",
+    "policy/install_event_log_manager.h",
+    "policy/install_event_log_uploader_base.cc",
+    "policy/install_event_log_uploader_base.h",
+    "policy/install_event_log_util.cc",
+    "policy/install_event_log_util.h",
     "policy/lock_to_single_user_manager.cc",
     "policy/lock_to_single_user_manager.h",
     "policy/login_profile_policy_provider.cc",
@@ -2028,8 +2125,11 @@ source_set("chromeos") {
     "policy/server_backed_device_state.h",
     "policy/server_backed_state_keys_broker.cc",
     "policy/server_backed_state_keys_broker.h",
-    "policy/single_app_install_event_log.cc",
-    "policy/single_app_install_event_log.h",
+    "policy/single_arc_app_install_event_log.cc",
+    "policy/single_arc_app_install_event_log.h",
+    "policy/single_extension_install_event_log.cc",
+    "policy/single_extension_install_event_log.h",
+    "policy/single_install_event_log.h",
     "policy/status_collector/activity_storage.cc",
     "policy/status_collector/activity_storage.h",
     "policy/status_collector/affiliated_session_service.cc",
@@ -2258,6 +2358,8 @@ source_set("chromeos") {
     "printing/usb_printer_util.h",
     "printing/zeroconf_printer_detector.cc",
     "printing/zeroconf_printer_detector.h",
+    "process_snapshot_server.cc",
+    "process_snapshot_server.h",
     "profiles/profile_helper.cc",
     "profiles/profile_helper.h",
     "release_notes/release_notes_notification.cc",
@@ -2269,6 +2371,7 @@ source_set("chromeos") {
     "scheduler_configuration_manager.h",
     "secure_channel/secure_channel_client_provider.cc",
     "secure_channel/secure_channel_client_provider.h",
+    "service_sandbox_type.h",
     "session_length_limiter.cc",
     "session_length_limiter.h",
     "set_time_dialog.cc",
@@ -2357,6 +2460,8 @@ source_set("chromeos") {
     "sync/os_sync_util.h",
     "sync/os_syncable_service_model_type_controller.cc",
     "sync/os_syncable_service_model_type_controller.h",
+    "sync/split_settings_sync_field_trial.cc",
+    "sync/split_settings_sync_field_trial.h",
     "sync/turn_sync_on_helper.cc",
     "sync/turn_sync_on_helper.h",
     "system/automatic_reboot_manager.cc",
@@ -2399,6 +2504,8 @@ source_set("chromeos") {
     "system_logs/device_event_log_source.h",
     "system_logs/iwlwifi_dump_log_source.cc",
     "system_logs/iwlwifi_dump_log_source.h",
+    "system_logs/network_health_source.cc",
+    "system_logs/network_health_source.h",
     "system_logs/single_debug_daemon_log_source.cc",
     "system_logs/single_debug_daemon_log_source.h",
     "system_logs/single_log_file_log_source.cc",
@@ -2425,6 +2532,8 @@ source_set("chromeos") {
     "tpm_firmware_update.h",
     "tpm_firmware_update_notification.cc",
     "tpm_firmware_update_notification.h",
+    "tracing_allocation_failure_tracker.cc",
+    "tracing_allocation_failure_tracker.h",
     "u2f_notification.cc",
     "u2f_notification.h",
     "ui/echo_dialog_listener.h",
@@ -2446,6 +2555,8 @@ source_set("chromeos") {
     "ui/screen_capture_notification_ui_chromeos.h",
     "ui/tpm_auto_update_notification.cc",
     "ui/tpm_auto_update_notification.h",
+    "ui/update_required_notification.cc",
+    "ui/update_required_notification.h",
     "usb/cros_usb_detector.cc",
     "usb/cros_usb_detector.h",
     "virtual_machines/virtual_machines_util.cc",
@@ -2545,12 +2656,6 @@ source_set("chromeos") {
     "extensions/printing/print_job_controller.h",
     "extensions/printing/printer_capabilities_provider.cc",
     "extensions/printing/printer_capabilities_provider.h",
-    "extensions/printing_metrics/print_job_finished_event_dispatcher.cc",
-    "extensions/printing_metrics/print_job_finished_event_dispatcher.h",
-    "extensions/printing_metrics/print_job_info_idl_conversions.cc",
-    "extensions/printing_metrics/print_job_info_idl_conversions.h",
-    "extensions/printing_metrics/printing_metrics_api.cc",
-    "extensions/printing_metrics/printing_metrics_api.h",
     "extensions/quick_unlock_private/quick_unlock_private_api.cc",
     "extensions/quick_unlock_private/quick_unlock_private_api.h",
     "extensions/users_private/users_private_api.cc",
@@ -2582,6 +2687,12 @@ source_set("chromeos") {
       "extensions/printing/printing_api_handler.h",
       "extensions/printing/printing_api_utils.cc",
       "extensions/printing/printing_api_utils.h",
+      "extensions/printing_metrics/print_job_finished_event_dispatcher.cc",
+      "extensions/printing_metrics/print_job_finished_event_dispatcher.h",
+      "extensions/printing_metrics/print_job_info_idl_conversions.cc",
+      "extensions/printing_metrics/print_job_info_idl_conversions.h",
+      "extensions/printing_metrics/printing_metrics_api.cc",
+      "extensions/printing_metrics/printing_metrics_api.h",
       "printing/cups_print_job_manager_impl.cc",
       "printing/cups_proxy_service_delegate_impl.cc",
       "printing/cups_proxy_service_delegate_impl.h",
@@ -2628,6 +2739,7 @@ action("dbus_service_files") {
     "dbus/org.chromium.SmbFsService.conf",
     "dbus/org.chromium.VirtualFileRequestService.conf",
     "dbus/org.chromium.VmApplicationsService.conf",
+    "dbus/vm/org.chromium.VmPermissionService.conf",
   ]
   output_conf_file = "$root_out_dir/dbus/chrome_dbus_services.conf"
   outputs = [ output_conf_file ]
@@ -2766,7 +2878,6 @@ source_set("unit_tests") {
     "../policy/default_geolocation_policy_handler_unittest.cc",
     "../resources/chromeos/zip_archiver/test/char_coding_test.cc",
     "../ui/browser_finder_chromeos_unittest.cc",
-    "accessibility/switch_access_panel_unittest.cc",
     "account_manager/account_migration_runner_unittest.cc",
     "android_sms/android_sms_app_manager_impl_unittest.cc",
     "android_sms/android_sms_app_setup_controller_impl_unittest.cc",
@@ -2780,7 +2891,9 @@ source_set("unit_tests") {
     "apps/apk_web_app_installer_unittest.cc",
     "apps/intent_helper/chromeos_apps_navigation_throttle_unittest.cc",
     "apps/metrics/intent_handling_metrics_unittest.cc",
+    "arc/accessibility/accessibility_node_info_data_wrapper_unittest.cc",
     "arc/accessibility/arc_accessibility_helper_bridge_unittest.cc",
+    "arc/accessibility/arc_accessibility_util_unittest.cc",
     "arc/accessibility/ax_tree_source_arc_unittest.cc",
     "arc/app_shortcuts/arc_app_shortcuts_menu_builder_unittest.cc",
     "arc/app_shortcuts/arc_app_shortcuts_request_unittest.cc",
@@ -2907,6 +3020,7 @@ source_set("unit_tests") {
     "crostini/crostini_port_forwarder_unittest.cc",
     "crostini/crostini_reporting_util_unittest.cc",
     "crostini/crostini_shelf_utils_unittest.cc",
+    "crostini/crostini_stability_monitor_unittest.cc",
     "crostini/crostini_unsupported_action_notifier_unittest.cc",
     "crostini/crostini_util_unittest.cc",
     "crostini/crosvm_metrics_unittest.cc",
@@ -2939,9 +3053,6 @@ source_set("unit_tests") {
     "extensions/printing/fake_print_job_controller.cc",
     "extensions/printing/fake_print_job_controller.h",
     "extensions/printing/printer_capabilities_provider_unittest.cc",
-    "extensions/printing_metrics/print_job_finished_event_dispatcher_unittest.cc",
-    "extensions/printing_metrics/print_job_info_idl_conversions_unittest.cc",
-    "extensions/printing_metrics/printing_metrics_api_unittest.cc",
     "extensions/public_session_permission_helper_unittest.cc",
     "extensions/quick_unlock_private/quick_unlock_private_api_unittest.cc",
     "extensions/signin_screen_policy_provider_unittest.cc",
@@ -3011,6 +3122,7 @@ source_set("unit_tests") {
     "guest_os/guest_os_share_path_unittest.cc",
     "hats/hats_finch_helper_unittest.cc",
     "hats/hats_notification_controller_unittest.cc",
+    "input_method/assistive_suggester_unittest.cc",
     "input_method/assistive_window_controller_unittest.cc",
     "input_method/emoji_suggester_unittest.cc",
     "input_method/input_method_configuration_unittest.cc",
@@ -3018,12 +3130,23 @@ source_set("unit_tests") {
     "input_method/input_method_manager_impl_unittest.cc",
     "input_method/input_method_persistence_unittest.cc",
     "input_method/personal_info_suggester_unittest.cc",
+    "input_method/ui/candidate_view_unittest.cc",
+    "input_method/ui/candidate_window_view_unittest.cc",
+    "input_method/ui/input_method_menu_item_unittest.cc",
+    "input_method/ui/input_method_menu_manager_unittest.cc",
+    "input_method/ui/suggestion_window_view_unittest.cc",
     "kerberos/kerberos_credentials_manager_test.cc",
     "kerberos/kerberos_ticket_expiry_notification_test.cc",
     "lacros/lacros_util_unittest.cc",
-    "local_search_service/index_unittest.cc",
+    "local_search_service/content_extraction_utils_unittest.cc",
+    "local_search_service/inverted_index_search_unittest.cc",
     "local_search_service/inverted_index_unittest.cc",
+    "local_search_service/linear_map_search_unittest.cc",
     "local_search_service/local_search_service_unittest.cc",
+    "local_search_service/proxy/local_search_service_proxy_unittest.cc",
+    "local_search_service/proxy/types_mojom_traits_unittest.cc",
+    "local_search_service/search_metrics_reporter_unittest.cc",
+    "local_search_service/search_utils_unittest.cc",
     "local_search_service/test_utils.cc",
     "local_search_service/test_utils.h",
     "locale_change_guard_unittest.cc",
@@ -3073,12 +3196,15 @@ source_set("unit_tests") {
     "login/version_updater/version_updater_unittest.cc",
     "mobile/mobile_activator_unittest.cc",
     "net/client_cert_store_chromeos_unittest.cc",
+    "net/network_diagnostics/dns_latency_routine_unittest.cc",
+    "net/network_diagnostics/dns_resolution_routine_unittest.cc",
+    "net/network_diagnostics/dns_resolver_present_routine_unittest.cc",
     "net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc",
     "net/network_diagnostics/has_secure_wifi_connection_routine_unittest.cc",
     "net/network_diagnostics/lan_connectivity_routine_unittest.cc",
     "net/network_diagnostics/network_diagnostics_routine_unittest.cc",
     "net/network_diagnostics/signal_strength_routine_unittest.cc",
-    "net/network_health_unittest.cc",
+    "net/network_health/network_health_unittest.cc",
     "net/network_portal_detector_impl_unittest.cc",
     "net/network_pref_state_observer_unittest.cc",
     "net/network_throttling_observer_unittest.cc",
@@ -3099,11 +3225,11 @@ source_set("unit_tests") {
     "policy/affiliated_invalidation_service_provider_impl_unittest.cc",
     "policy/android_management_client_unittest.cc",
     "policy/app_install_event_log_collector_unittest.cc",
-    "policy/app_install_event_log_manager_unittest.cc",
     "policy/app_install_event_log_manager_wrapper_unittest.cc",
-    "policy/app_install_event_log_unittest.cc",
-    "policy/app_install_event_log_uploader_unittest.cc",
     "policy/app_install_event_logger_unittest.cc",
+    "policy/arc_app_install_event_log_manager_unittest.cc",
+    "policy/arc_app_install_event_log_unittest.cc",
+    "policy/arc_app_install_event_log_uploader_unittest.cc",
     "policy/auto_enrollment_client_impl_unittest.cc",
     "policy/bluetooth_policy_handler_unittest.cc",
     "policy/cached_policy_key_loader_chromeos_unittest.cc",
@@ -3124,6 +3250,7 @@ source_set("unit_tests") {
     "policy/dm_token_storage_unittest.cc",
     "policy/extension_cache_unittest.cc",
     "policy/extension_install_event_log_collector_unittest.cc",
+    "policy/extension_install_event_log_unittest.cc",
     "policy/extension_install_event_logger_unittest.cc",
     "policy/external_data_handlers/device_native_printers_external_data_handler_unittest.cc",
     "policy/fake_affiliated_invalidation_service_provider.cc",
@@ -3151,9 +3278,11 @@ source_set("unit_tests") {
     "policy/scheduled_update_checker/device_scheduled_update_checker_unittest.cc",
     "policy/secondary_google_account_signin_policy_handler_unittest.cc",
     "policy/server_backed_state_keys_broker_unittest.cc",
-    "policy/single_app_install_event_log_unittest.cc",
+    "policy/single_arc_app_install_event_log_unittest.cc",
+    "policy/status_collector/activity_storage_unittest.cc",
     "policy/status_collector/affiliated_session_service_unittest.cc",
     "policy/status_collector/app_info_generator_unittest.cc",
+    "policy/status_collector/enterprise_activity_storage_unittest.cc",
     "policy/status_collector/interval_map_unittest.cc",
     "policy/status_uploader_unittest.cc",
     "policy/system_features_disable_list_policy_handler_unittest.cc",
@@ -3227,6 +3356,7 @@ source_set("unit_tests") {
     "printing/test_printer_configurer.h",
     "printing/usb_printer_detector_unittest.cc",
     "printing/zeroconf_printer_detector_unittest.cc",
+    "process_snapshot_server_unittest.cc",
     "proxy_config_service_impl_unittest.cc",
     "release_notes/release_notes_notification_unittest.cc",
     "release_notes/release_notes_storage_unittest.cc",
@@ -3316,6 +3446,9 @@ source_set("unit_tests") {
     sources += [
       "extensions/printing/printing_api_handler_unittest.cc",
       "extensions/printing/printing_api_utils_unittest.cc",
+      "extensions/printing_metrics/print_job_finished_event_dispatcher_unittest.cc",
+      "extensions/printing_metrics/print_job_info_idl_conversions_unittest.cc",
+      "extensions/printing_metrics/printing_metrics_api_unittest.cc",
       "printing/test_cups_wrapper.cc",
       "printing/test_cups_wrapper.h",
     ]
@@ -3329,8 +3462,8 @@ source_set("unit_tests") {
     ":user_activity_event_proto",
     "//ash",
     "//ash/public/cpp:test_support",
-    "//ash/system/message_center/arc",
-    "//ash/system/message_center/arc:test_support",
+    "//ash/public/cpp/external_arc",
+    "//ash/public/cpp/external_arc:test_support",
     "//base",
     "//chrome/app:command_ids",
     "//chrome/browser/resources/chromeos/zip_archiver:char_coding",
@@ -3552,9 +3685,11 @@ if (use_libfuzzer) {
 
     deps = [
       ":policy_fuzzer_proto",
+      "//base/test:test_support",
       "//chrome/browser",
       "//chrome/browser/chromeos",
       "//chromeos/dbus:dbus",
+      "//chromeos/tpm",
       "//third_party/libprotobuf-mutator",
     ]
   }
@@ -3567,6 +3702,11 @@ if (use_libfuzzer) {
       "$root_gen_dir/components/policy/proto",
     ]
 
+    proto_deps = [
+      "//components/policy:cloud_policy_full_runtime_proto",
+      "//components/policy/proto:chrome_device_policy_full_runtime_proto",
+    ]
+
     link_deps = [
       "//components/policy:cloud_policy_full_runtime_proto",
       "//components/policy/proto:chrome_device_policy_full_runtime_proto",
diff --git a/chromium/chrome/browser/chromeos/local_search_service/proxy/BUILD.gn b/chromium/chrome/browser/chromeos/local_search_service/proxy/BUILD.gn
new file mode 100644
index 00000000000..f3883946d90
--- /dev/null
+++ b/chromium/chrome/browser/chromeos/local_search_service/proxy/BUILD.gn
@@ -0,0 +1,55 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//mojo/public/tools/bindings/mojom.gni")
+
+mojom("mojom") {
+  sources = [
+    "local_search_service_proxy.mojom",
+    "types.mojom",
+  ]
+
+  public_deps = [ "//mojo/public/mojom/base" ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "local_search_service.mojom.IndexId"
+          cpp = "::local_search_service::IndexId"
+        },
+        {
+          mojom = "local_search_service.mojom.Content"
+          cpp = "::local_search_service::Content"
+        },
+        {
+          mojom = "local_search_service.mojom.Data"
+          cpp = "::local_search_service::Data"
+        },
+        {
+          mojom = "local_search_service.mojom.SearchParams"
+          cpp = "::local_search_service::SearchParams"
+        },
+        {
+          mojom = "local_search_service.mojom.Position"
+          cpp = "::local_search_service::Position"
+        },
+        {
+          mojom = "local_search_service.mojom.Result"
+          cpp = "::local_search_service::Result"
+        },
+        {
+          mojom = "local_search_service.mojom.ResponseStatus"
+          cpp = "::local_search_service::ResponseStatus"
+        },
+        {
+          mojom = "local_search_service.mojom.Backend"
+          cpp = "::local_search_service::Backend"
+        },
+      ]
+      traits_headers = [ "//chrome/browser/chromeos/local_search_service/proxy/types_mojom_traits.h" ]
+      traits_sources = [ "//chrome/browser/chromeos/local_search_service/proxy/types_mojom_traits.cc" ]
+    },
+  ]
+}
diff --git a/chromium/chrome/browser/chromeos/local_search_service/proxy/local_search_service_proxy.mojom b/chromium/chrome/browser/chromeos/local_search_service/proxy/local_search_service_proxy.mojom
new file mode 100644
index 00000000000..dbe6983c4a7
--- /dev/null
+++ b/chromium/chrome/browser/chromeos/local_search_service/proxy/local_search_service_proxy.mojom
@@ -0,0 +1,55 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module local_search_service.mojom;
+
+import "chrome/browser/chromeos/local_search_service/proxy/types.mojom";
+import "mojo/public/mojom/base/string16.mojom";
+
+enum IndexId {
+  kCrosSettings = 0
+  // Add new client IDs here.
+};
+
+enum Backend {
+  kLinearMap = 0,
+  kInvertedIndex = 1
+};
+
+// LocalSearchServiceProxy creates and owns content-specific IndexProxies.
+// Clients can call |GetIndex| to get an IndexProxy for a given index id.
+interface LocalSearchServiceProxy {
+  // A client can call this function to bind an IndexProxy for |index_id|. If
+  // the Index isn't created when this function is called, LocalSearchService
+  // will create one.
+  // Note, there should be one primary client that is the owner of the data and
+  // can read/write the data to the Index. The other clients should only use
+  // the Index for query search.
+  GetIndex(IndexId index_id, Backend backend,
+      pending_receiver<IndexProxy> index_receiver);
+};
+
+// A proxy to a local search service Index.
+// An Index has a registry of searchable data, which can be updated. It also
+// runs a search function to find matching items for a given query.
+// Each Index can serve multiple clients, but only one client (the primary
+// client) that owns the data should be allowed to modify the Index.
+interface IndexProxy {
+  // Returns number of data items.
+  GetSize() => (uint64 num_items);
+
+  // Adds or updates data and callbacks upon completion.
+  // Only the primary client should be allowed to do this operation.
+  AddOrUpdate(array<Data> data) => ();
+
+  // Deletes data with |ids| and returns the number of items deleted.
+  // If an id doesn't exist in the Index, no operation will be done.
+  // Only the primary client should be allowed to do this operation.
+  Delete(array<string> ids) => (uint32 num_deleted);
+
+  // Takes an asynchronous search request call and returns results and status
+  // code via a callback. |results| will be null if there is an error.
+  Find(mojo_base.mojom.String16 query, uint32 max_results)
+      => (ResponseStatus status, array<Result>? results);
+};
diff --git a/chromium/chrome/browser/chromeos/local_search_service/proxy/types.mojom b/chromium/chrome/browser/chromeos/local_search_service/proxy/types.mojom
new file mode 100644
index 00000000000..70c32a21897
--- /dev/null
+++ b/chromium/chrome/browser/chromeos/local_search_service/proxy/types.mojom
@@ -0,0 +1,73 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module local_search_service.mojom;
+
+import "mojo/public/mojom/base/string16.mojom";
+
+struct Content {
+  // An identifier for the content in Data.
+  string id;
+  mojo_base.mojom.String16 content;
+  double weight = 1.0;
+};
+
+struct Data {
+  // Identifier of the data item, should be unique across the registry. Clients
+  // will decide what ids to use, they could be paths, urls or any opaque
+  // string identifiers.
+  // Ideally IDs should persist across sessions, but this is not strictly
+  // required now because data is not persisted across sessions.
+  string id;
+
+  // Data item will be matched between its search tags and query term.
+  array<Content> contents;
+
+  // If unset, we will use system configured locale.
+  string locale;
+};
+
+struct SearchParams {
+  double relevance_threshold = 0.32;
+  double prefix_threshold = 0.6;
+  double fuzzy_threshold = 0.6;
+};
+
+struct Position {
+  string content_id;
+  uint32 start;
+  uint32 length;
+};
+
+// Result is one item that matches a given query. It contains the id of the
+// item and its matching score.
+struct Result {
+  // Id of the data.
+  string id;
+  // Relevance score.
+  // Currently only linear map is implemented with fuzzy matching and score
+  // will always be in [0,1]. In the future, when an inverted index is
+  // implemented, the score will not be in this range any more. Client will be
+  // able to select a search backend to use (linear map vs inverted index) and
+  // hence client will be able to expect the range of the scores.
+  double score;
+   // Position of the matching text.
+   // We currently use linear map, which will return one matching content,
+   // hence the vector has only one element. When we have inverted index, we
+   // will have multiple matching contents.
+  array<Position> positions;
+};
+
+// Status of the search attempt.
+// More will be added later.
+enum ResponseStatus {
+  kUnknownError,
+  // Search operation is successful. But there could be no item and result list
+  // is empty.
+  kSuccess,
+  // Query is empty.
+  kEmptyQuery,
+  // Index is empty (i.e. no data).
+  kEmptyIndex
+};
diff --git a/chromium/chrome/browser/chromeos/net/mojom/BUILD.gn b/chromium/chrome/browser/chromeos/net/mojom/BUILD.gn
deleted file mode 100644
index 713ef8afafa..00000000000
--- a/chromium/chrome/browser/chromeos/net/mojom/BUILD.gn
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-mojom("mojom") {
-  sources = [ "network_health.mojom" ]
-
-  public_deps =
-      [ "//chromeos/services/network_config/public/mojom:network_types" ]
-}
diff --git a/chromium/chrome/browser/chromeos/net/mojom/network_health.mojom b/chromium/chrome/browser/chromeos/net/mojom/network_health.mojom
deleted file mode 100644
index f3d27f503cf..00000000000
--- a/chromium/chrome/browser/chromeos/net/mojom/network_health.mojom
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module chromeos.network_health.mojom;
-
-import "chromeos/services/network_config/public/mojom/network_types.mojom";
-
-// Contains information for a single network.
-struct Network {
-  chromeos.network_config.mojom.ConnectionStateType connection_state;
-  string name;
-  chromeos.network_config.mojom.NetworkType type;
-};
-
-// Contains information for a single network device.
-struct Device {
-  chromeos.network_config.mojom.DeviceStateType connection_state;
-  // Optional string for the device’s mac_address. Will only be populated if
-  // applicable to the device.
-  string? mac_address;
-  chromeos.network_config.mojom.NetworkType type;
-};
-
-// Interface for retrieving aggregated information about the current network
-// state and health.
-interface NetworkHealthService {
-  // Returns a list of the network devices.
-  GetDeviceList() => (array<Device> devices);
-
-  // Returns a list of the active (connected or connecting) networks.
-  GetActiveNetworkList() => (array<Network> active_networks);
-};
diff --git a/chromium/chrome/browser/chromeos/net/network_diagnostics/BUILD.gn b/chromium/chrome/browser/chromeos/net/network_diagnostics/BUILD.gn
deleted file mode 100644
index c0f2d7b573f..00000000000
--- a/chromium/chrome/browser/chromeos/net/network_diagnostics/BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-mojom("network_diagnostics_mojom") {
-  sources = [ "network_diagnostics.mojom" ]
-
-  deps = [ "//mojo/public/mojom/base" ]
-}
diff --git a/chromium/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.mojom b/chromium/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.mojom
deleted file mode 100644
index a001427d1be..00000000000
--- a/chromium/chrome/browser/chromeos/net/network_diagnostics/network_diagnostics.mojom
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module chromeos.network_diagnostics.mojom;
-
-// Each routine can result in one of the possible verdicts.
-[Extensible]
-enum RoutineVerdict {
-  // Routine ran successfully and no connectivity problem found.
-  kNoProblem,
-  // Routine ran successfully and connectivity problem found.
-  kProblem,
-  // Routine has not been run.
-  kNotRun,
-};
-
-// Problems related to the SignalStrength routine.
-[Extensible]
-enum SignalStrengthProblem {
-  kSignalNotFound,
-  kWeakSignal,
-};
-
-// Problems related to the GatewayCanBePinged routine.
-[Extensible]
-enum GatewayCanBePingedProblem {
-  // All gateways are unreachable, hence cannot be pinged.
-  kUnreachableGateway,
-  // The default network cannot be pinged.
-  kFailedToPingDefaultNetwork,
-  // The default network has a latency above the threshold.
-  kDefaultNetworkAboveLatencyThreshold,
-  // One or more of the non-default networks has failed pings.
-  kUnsuccessfulNonDefaultNetworksPings,
-  // One of more of the non-default networks has a latency above the threshold.
-  kNonDefaultNetworksAboveLatencyThreshold,
-};
-
-// Messages related to the HasSecureWiFiConnection routine.
-[Extensible]
-enum HasSecureWiFiConnectionProblem {
-  kSecurityTypeNone,
-  kSecurityTypeWep8021x,
-  kSecurityTypeWepPsk,
-  kUnknownSecurityType,
-};
-
-// This interface is to be used by any clients that need to run specific
-// network-related diagnostics. Expected clients of this interface are
-// NetworkHealth, cros_healthd, and a connectivity diagnostics Web UI (to name
-// a few). The bound implementation is intended to live in the browser process.
-interface NetworkDiagnosticsRoutines {
-  // Tests whether the device is connected to a LAN. It is possible that the
-  // device may be trapped in a captive portal yet pass this test successfully.
-  // Captive portal checks are done separately and are outside of the scope of
-  // this routine.
-  LanConnectivity() => (RoutineVerdict verdict);
-
-  // Tests whether there is an acceptable signal strength on wireless networks.
-  SignalStrength() => (RoutineVerdict verdict,
-      array<SignalStrengthProblem> problems);
-
-  // Tests whether the gateway of connected networks is pingable.
-  GatewayCanBePinged() => (RoutineVerdict verdict,
-      array<GatewayCanBePingedProblem> problems);
-
-  // Tests whether the WiFi connection is secure. Note that if WiFi is not
-  // connected, the routine will result in a |kNotRun| verdict.
-  HasSecureWiFiConnection() => (RoutineVerdict verdict,
-      array<HasSecureWiFiConnectionProblem> problems);
-};