BASELINE: Update Chromium to 69.0.3497.70

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

1 files changed, 297 insertions, 105 deletions

diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn
index 0ba10d54a17..43d51b04bd0 100644
--- a/chromium/chrome/test/BUILD.gn
+++ b/chromium/chrome/test/BUILD.gn
@@ -146,6 +146,7 @@ static_library("test_support") {
     "//components/sync_preferences:test_support",
     "//components/sync_sessions:test_support",
     "//components/toolbar:test_support",
+    "//components/unified_consent:test_support",
     "//components/update_client:test_support",
     "//components/variations:test_support",
     "//components/web_resource:test_support",
@@ -239,6 +240,7 @@ static_library("test_support") {
       "//components/user_manager:test_support",
       "//ui/aura",
       "//ui/aura:test_support",
+      "//ui/base/ime",
     ]
   }
 
@@ -332,6 +334,7 @@ group("telemetry_gpu_integration_test") {
     # For pixel_test
     "//media/test/data/bear.mp4",
     "//media/test/data/bear-vp9.webm",
+    "//media/test/data/four-colors.mp4",
   ]
 }
 
@@ -410,6 +413,7 @@ test("browser_tests") {
       "//ui/file_manager/integration_tests/",
       "//third_party/analytics/",
       "//third_party/polymer/v1_0/components-chromium/polymer/",
+      "$root_gen_dir/ui/file_manager/file_manager/",
       "$root_gen_dir/ui/login/login_resources.pak",
       "$root_out_dir/chromevox_test_data/",
       "$root_out_dir/content_shell.pak",
@@ -440,7 +444,6 @@ test("browser_tests") {
     deps += [
       "//chrome/android:app_hooks_java",
       "//chrome/android:chrome_java",
-      "//chrome/android:class_register_java",
       "//v8:v8_external_startup_data_assets",
     ]
 
@@ -455,18 +458,18 @@ test("browser_tests") {
       "../browser/accessibility/browser_accessibility_state_browsertest.cc",
       "../browser/accessibility/interstitial_accessibility_browsertest.cc",
       "../browser/app_controller_mac_browsertest.mm",
-      "../browser/apps/app_browsertest.cc",
       "../browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm",
       "../browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.cc",
       "../browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h",
-      "../browser/apps/app_speech_recognition_browsertest.cc",
-      "../browser/apps/app_window_browsertest.cc",
-      "../browser/apps/event_page_browsertest.cc",
       "../browser/apps/guest_view/app_view_browsertest.cc",
       "../browser/apps/guest_view/extension_view/extension_view_browsertest.cc",
       "../browser/apps/guest_view/web_view_browsertest.cc",
-      "../browser/apps/platform_app_navigation_redirector_browsertest.cc",
-      "../browser/apps/service_worker_browsertest.cc",
+      "../browser/apps/platform_apps/app_browsertest.cc",
+      "../browser/apps/platform_apps/app_speech_recognition_browsertest.cc",
+      "../browser/apps/platform_apps/app_window_browsertest.cc",
+      "../browser/apps/platform_apps/event_page_browsertest.cc",
+      "../browser/apps/platform_apps/platform_app_navigation_redirector_browsertest.cc",
+      "../browser/apps/platform_apps/service_worker_browsertest.cc",
       "../browser/autocomplete/autocomplete_browsertest.cc",
       "../browser/autofill/autofill_browsertest.cc",
       "../browser/autofill/autofill_metrics_browsertest.cc",
@@ -501,6 +504,7 @@ test("browser_tests") {
       "../browser/chrome_find_request_manager_browsertest.cc",
       "../browser/chrome_main_browsertest.cc",
       "../browser/chrome_navigation_browsertest.cc",
+      "../browser/chrome_network_service_browsertest.cc",
       "../browser/chrome_network_service_restart_browsertest.cc",
       "../browser/chrome_origin_trials_browsertest.cc",
       "../browser/chrome_plugin_browsertest.cc",
@@ -515,6 +519,7 @@ test("browser_tests") {
       "../browser/data_saver/data_saver_browsertest.cc",
       "../browser/data_saver/data_saver_holdback_browsertest.cc",
       "../browser/data_saver/data_saver_webapis_browsertest.cc",
+      "../browser/data_use_measurement/page_load_capping/page_load_capping_browsertest.cc",
       "../browser/devtools/device/adb/adb_client_socket_browsertest.cc",
       "../browser/devtools/device/adb/mock_adb_server.cc",
       "../browser/devtools/device/adb/mock_adb_server.h",
@@ -536,7 +541,6 @@ test("browser_tests") {
       "../browser/favicon/content_favicon_driver_browsertest.cc",
       "../browser/first_run/first_run_browsertest.cc",
       "../browser/geolocation/geolocation_browsertest.cc",
-      "../browser/global_keyboard_shortcuts_mac_browsertest.mm",
       "../browser/history/history_browsertest.cc",
       "../browser/history/redirect_browsertest.cc",
       "../browser/iframe_browsertest.cc",
@@ -560,6 +564,7 @@ test("browser_tests") {
       "../browser/loadtimes_extension_bindings_browsertest.cc",
       "../browser/locale_tests_browsertest.cc",
       "../browser/media/autoplay_metrics_browsertest.cc",
+      "../browser/media/cast_mirroring_service_host_browsertest.cc",
       "../browser/media/defer_background_media_browsertest.cc",
       "../browser/media/encrypted_media_browsertest.cc",
       "../browser/media/encrypted_media_supported_types_browsertest.cc",
@@ -593,7 +598,6 @@ test("browser_tests") {
       "../browser/media/webrtc/webrtc_getmediadevices_browsertest.cc",
       "../browser/media/webrtc/webrtc_internals_integration_browsertest.cc",
       "../browser/media/webrtc/webrtc_internals_perf_browsertest.cc",
-      "../browser/media/webrtc/webrtc_rtp_browsertest.cc",
       "../browser/media/webrtc/webrtc_simulcast_browsertest.cc",
       "../browser/media/webrtc/webrtc_stats_perf_browsertest.cc",
       "../browser/media/webrtc/webrtc_video_display_perf_browsertest.cc",
@@ -604,6 +608,7 @@ test("browser_tests") {
       "../browser/media_galleries/fileapi/media_file_validator_browsertest.cc",
       "../browser/media_galleries/media_galleries_dialog_controller_mock.cc",
       "../browser/media_galleries/media_galleries_dialog_controller_mock.h",
+      "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc",
       "../browser/metrics/metrics_reporting_state_browsertest.cc",
       "../browser/metrics/metrics_service_browsertest.cc",
       "../browser/metrics/oom/out_of_memory_reporter_browsertest.cc",
@@ -622,6 +627,8 @@ test("browser_tests") {
       "../browser/net/load_timing_browsertest.cc",
       "../browser/net/network_connection_tracker_browsertest.cc",
       "../browser/net/network_context_configuration_browsertest.cc",
+      "../browser/net/network_quality_tracker_browsertest.cc",
+      "../browser/net/network_request_metrics_browsertest.cc",
       "../browser/net/nqe/ui_network_quality_estimator_service_browsertest.cc",
       "../browser/net/nqe/ui_network_quality_estimator_service_test_util.cc",
       "../browser/net/nqe/ui_network_quality_estimator_service_test_util.h",
@@ -629,12 +636,14 @@ test("browser_tests") {
       "../browser/net/predictor_browsertest.cc",
       "../browser/net/profile_network_context_service_browsertest.cc",
       "../browser/net/proxy_browsertest.cc",
+      "../browser/net/reporting_browsertest.cc",
       "../browser/net/variations_http_headers_browsertest.cc",
       "../browser/net/websocket_browsertest.cc",
       "../browser/no_background_tasks_browsertest.cc",
       "../browser/ntp_snippets/content_suggestions_service_factory_browsertest.cc",
       "../browser/ntp_tiles/ntp_tiles_browsertest.cc",
       "../browser/page_load_metrics/observers/ads_page_load_metrics_observer_browsertest.cc",
+      "../browser/page_load_metrics/observers/data_saver_site_breakdown_metrics_observer_browsertest.cc",
       "../browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc",
       "../browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer_browsertest.cc",
       "../browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc",
@@ -651,6 +660,7 @@ test("browser_tests") {
       "../browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc",
       "../browser/plugins/flash_permission_browsertest.cc",
       "../browser/plugins/plugin_power_saver_browsertest.cc",
+      "../browser/plugins/plugin_response_interceptor_url_loader_throttle_browsertest.cc",
       "../browser/policy/cloud/cloud_policy_browsertest.cc",
       "../browser/policy/cloud/cloud_policy_manager_browsertest.cc",
       "../browser/policy/cloud/cloud_policy_test_utils.cc",
@@ -677,6 +687,7 @@ test("browser_tests") {
       "../browser/prerender/prerender_test_utils.h",
       "../browser/previews/previews_browsertest.cc",
       "../browser/previews/previews_service_browser_test.cc",
+      "../browser/previews/resource_loading_hints/resource_loading_hints_browsertest.cc",
       "../browser/process_singleton_browsertest.cc",
       "../browser/profile_resetter/profile_resetter_browsertest.cc",
       "../browser/profiles/host_zoom_map_browsertest.cc",
@@ -695,6 +706,10 @@ test("browser_tests") {
       "../browser/renderer_context_menu/spelling_menu_observer_browsertest.cc",
       "../browser/renderer_host/render_process_host_chrome_browsertest.cc",
       "../browser/repost_form_warning_browsertest.cc",
+      "../browser/resource_coordinator/local_site_characteristics_data_store_factory_browsertest.cc",
+      "../browser/resource_coordinator/local_site_characteristics_data_unittest_utils.cc",
+      "../browser/resource_coordinator/local_site_characteristics_data_unittest_utils.h",
+      "../browser/resource_coordinator/local_site_characteristics_database_browsertest.cc",
       "../browser/resource_coordinator/render_process_probe_browsertest.cc",
       "../browser/resource_coordinator/tab_activity_watcher_browsertest.cc",
       "../browser/resource_coordinator/tab_manager_browsertest.cc",
@@ -714,12 +729,13 @@ test("browser_tests") {
       "../browser/sessions/tab_restore_browsertest.cc",
       "../browser/site_details_browsertest.cc",
       "../browser/thumbnails/thumbnail_browsertest.cc",
+      "../browser/ui/bloated_renderer/bloated_renderer_tab_helper_browsertest.cc",
       "../browser/ui/blocked_content/popup_tracker_browsertest.cc",
       "../browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc",
       "../browser/ui/blocked_content/tab_under_blocker_browsertest.cc",
       "../browser/ui/tabs/pinned_tab_service_browsertest.cc",
 
-      #If this list is used on Android in the future, these browser / speech/*
+      # If this list is used on Android in the future, these browser / speech/*
       # files will probably not be applicable.
       "../browser/speech/extension_api/tts_extension_apitest.cc",
       "../browser/speech/speech_recognition_browsertest.cc",
@@ -740,6 +756,7 @@ test("browser_tests") {
       "../browser/ssl/typed_navigation_timing_throttle_browsertest.cc",
       "../browser/storage/durable_storage_browsertest.cc",
       "../browser/subresource_filter/ad_delay_browsertest.cc",
+      "../browser/subresource_filter/ad_tagging_browsertest.cc",
       "../browser/subresource_filter/subresource_filter_browser_test_harness.cc",
       "../browser/subresource_filter/subresource_filter_browser_test_harness.h",
       "../browser/subresource_filter/subresource_filter_browsertest.cc",
@@ -775,8 +792,6 @@ test("browser_tests") {
       "../browser/ui/ask_google_for_suggestions_dialog_browsertest.cc",
       "../browser/ui/autofill/card_unmask_prompt_view_browsertest.cc",
       "../browser/ui/autofill/card_unmask_prompt_view_tester.h",
-      "../browser/ui/autofill/password_generation_popup_view_browsertest.cc",
-      "../browser/ui/autofill/password_generation_popup_view_tester.h",
       "../browser/ui/autofill/save_card_bubble_controller_impl_browsertest.cc",
       "../browser/ui/bookmarks/bookmark_browsertest.cc",
       "../browser/ui/browser_browsertest.cc",
@@ -805,6 +820,8 @@ test("browser_tests") {
       "../browser/ui/login/login_handler_browsertest.cc",
       "../browser/ui/native_window_tracker_browsertest.cc",
       "../browser/ui/passwords/manage_passwords_test.cc",
+      "../browser/ui/passwords/password_generation_popup_view_browsertest.cc",
+      "../browser/ui/passwords/password_generation_popup_view_tester.h",
       "../browser/ui/permission_bubble/permission_bubble_browser_test_util.cc",
       "../browser/ui/permission_bubble/permission_bubble_browser_test_util.h",
       "../browser/ui/prefs/prefs_tab_helper_browsertest.cc",
@@ -818,8 +835,6 @@ test("browser_tests") {
       "../browser/ui/search/local_ntp_doodle_browsertest.cc",
       "../browser/ui/search/local_ntp_js_browsertest.cc",
       "../browser/ui/search/local_ntp_one_google_bar_browsertest.cc",
-      "../browser/ui/search/local_ntp_test_utils.cc",
-      "../browser/ui/search/local_ntp_test_utils.h",
       "../browser/ui/search/local_ntp_voice_search_browsertest.cc",
       "../browser/ui/search/new_tab_page_navigation_throttle_browsertest.cc",
       "../browser/ui/search_engines/search_engine_tab_helper_browsertest.cc",
@@ -850,6 +865,8 @@ test("browser_tests") {
       "../browser/ui/views/content_setting_bubble_contents_browsertest.cc",
       "../browser/ui/views/device_chooser_browsertest.cc",
       "../browser/ui/views/try_chrome_dialog_win/try_chrome_dialog_browsertest.cc",
+      "../browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc",
+      "../browser/ui/webauthn/authenticator_dialog_browsertest.cc",
       "../browser/ui/webui/chrome_url_data_manager_browsertest.cc",
       "../browser/ui/webui/chromeos/bluetooth_pairing_dialog_browsertest-inl.h",
       "../browser/ui/webui/constrained_web_dialog_ui_browsertest.cc",
@@ -886,8 +903,8 @@ test("browser_tests") {
       "../common/mac/mock_launchd.h",
       "../common/time_format_browsertest.cc",
       "../renderer/autofill/autofill_renderer_browsertest.cc",
-      "../renderer/autofill/fake_content_password_manager_driver.cc",
-      "../renderer/autofill/fake_content_password_manager_driver.h",
+      "../renderer/autofill/fake_mojo_password_manager_driver.cc",
+      "../renderer/autofill/fake_mojo_password_manager_driver.h",
       "../renderer/autofill/fake_password_manager_client.cc",
       "../renderer/autofill/fake_password_manager_client.h",
       "../renderer/autofill/form_autocomplete_browsertest.cc",
@@ -950,6 +967,7 @@ test("browser_tests") {
       "//components/dom_distiller/core:test_support",
       "//components/download/quarantine",
       "//components/feature_engagement/test:test_support",
+      "//components/offline_items_collection/core/test_support",
       "//components/optimization_guide:test_support",
       "//components/policy:chrome_settings_proto_generated_compile",
       "//components/resources",
@@ -970,6 +988,7 @@ test("browser_tests") {
       "//mojo/public/cpp/system",
       "//net",
       "//net:test_support",
+      "//services/device/public/cpp/test:test_support",
       "//services/device/public/mojom",
       "//services/network/public/cpp",
       "//services/service_manager/public/cpp",
@@ -1127,13 +1146,17 @@ test("browser_tests") {
         "../browser/ui/views/feature_promos/incognito_window_promo_dialog_browsertest.cc",
         "../browser/ui/views/feature_promos/new_tab_promo_dialog_browsertest.cc",
       ]
+
+      if (is_win) {
+        sources += [ "../browser/ui/views/feature_promos/bookmark_bar_promo_dialog_browsertest.cc" ]
+      }
     }
 
     if (enable_extensions) {
       sources += [
         "../browser/accessibility/accessibility_extension_api_browsertest.cc",
-        "../browser/apps/app_browsertest_util.cc",
-        "../browser/apps/app_browsertest_util.h",
+        "../browser/apps/platform_apps/app_browsertest_util.cc",
+        "../browser/apps/platform_apps/app_browsertest_util.h",
         "../browser/extensions/active_tab_apitest.cc",
         "../browser/extensions/activity_log/activity_log_browsertest.cc",
         "../browser/extensions/alert_apitest.cc",
@@ -1267,6 +1290,7 @@ test("browser_tests") {
         "../browser/extensions/extension_apitest.cc",
         "../browser/extensions/extension_apitest.h",
         "../browser/extensions/extension_bindings_apitest.cc",
+        "../browser/extensions/extension_bookmarklet_browsertest.cc",
         "../browser/extensions/extension_browsertest.cc",
         "../browser/extensions/extension_browsertest.h",
         "../browser/extensions/extension_context_menu_browsertest.cc",
@@ -1326,6 +1350,7 @@ test("browser_tests") {
         "../browser/extensions/sandboxed_pages_apitest.cc",
         "../browser/extensions/service_worker_apitest.cc",
         "../browser/extensions/shared_module_apitest.cc",
+        "../browser/extensions/shared_worker_apitest.cc",
         "../browser/extensions/startup_helper_browsertest.cc",
         "../browser/extensions/stubs_apitest.cc",
         "../browser/extensions/subscribe_page_action_browsertest.cc",
@@ -1345,6 +1370,7 @@ test("browser_tests") {
         "../browser/extensions/webstore_reinstaller_browsertest.cc",
         "../browser/extensions/webstore_startup_installer_browsertest.cc",
         "../browser/extensions/window_open_apitest.cc",
+        "../browser/notifications/notification_permission_context_apitest.cc",
         "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_dialog_controller_impl_browsertest_win.cc",
         "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_reboot_dialog_controller_impl_browsertest_win.cc",
         "../browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_controller_win.cc",
@@ -1402,7 +1428,6 @@ test("browser_tests") {
         "../browser/ui/global_error/global_error_service_browsertest.cc",
         "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc",
         "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h",
-        "../browser/ui/views/autofill/dialog_event_waiter.h",
         "../browser/ui/views/autofill/save_card_bubble_views_browsertest.cc",
         "../browser/ui/views/autofill/save_card_bubble_views_browsertest_base.cc",
         "../browser/ui/views/autofill/save_card_bubble_views_browsertest_base.h",
@@ -1414,6 +1439,7 @@ test("browser_tests") {
         "../browser/ui/views/folder_upload_confirmation_view_browsertest.cc",
         "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win.cc",
         "../browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc",
+        "../browser/ui/views/frame/glass_browser_frame_view_browsertest_win.cc",
         "../browser/ui/views/importer/import_lock_dialog_view_browsertest.cc",
         "../browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc",
         "../browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc",
@@ -1472,8 +1498,6 @@ test("browser_tests") {
           "../browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc",
           "../browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc",
           "../browser/ui/views/autofill/autofill_popup_view_views_browsertest.cc",
-          "../browser/ui/views/autofill/password_generation_popup_view_tester_views.cc",
-          "../browser/ui/views/autofill/password_generation_popup_view_tester_views.h",
           "../browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc",
           "../browser/ui/views/certificate_selector_dialog_browsertest.cc",
           "../browser/ui/views/collected_cookies_views_browsertest.cc",
@@ -1492,7 +1516,12 @@ test("browser_tests") {
           "../browser/ui/views/omnibox/omnibox_popup_contents_view_browsertest.cc",
           "../browser/ui/views/page_info/page_info_bubble_view_browsertest.cc",
           "../browser/ui/views/passwords/password_dialog_view_browsertest.cc",
+          "../browser/ui/views/passwords/password_generation_popup_view_tester_views.cc",
+          "../browser/ui/views/passwords/password_generation_popup_view_tester_views.h",
           "../browser/ui/views/session_crashed_bubble_view_browsertest.cc",
+          "../browser/ui/views/status_bubble_views_browsertest.cc",
+          "../browser/ui/views/status_bubble_views_browsertest_mac.h",
+          "../browser/ui/views/status_bubble_views_browsertest_mac.mm",
           "../browser/ui/views/task_manager_view_browsertest.cc",
           "../browser/ui/views/toolbar/browser_actions_container_browsertest.cc",
           "../browser/ui/views/translate/translate_bubble_test_utils_views.cc",
@@ -1516,7 +1545,6 @@ test("browser_tests") {
     if (is_chromeos) {
       assert(enable_app_list)
       sources += [
-        "../browser/ash_service_registry_browsertest.cc",
         "../browser/chromeos/accessibility/accessibility_manager_browsertest.cc",
         "../browser/chromeos/accessibility/magnification_manager_browsertest.cc",
         "../browser/chromeos/accessibility/speech_monitor.cc",
@@ -1563,7 +1591,10 @@ test("browser_tests") {
         "../browser/chromeos/file_manager/file_manager_jstest.cc",
         "../browser/chromeos/file_manager/file_manager_jstest_base.cc",
         "../browser/chromeos/file_manager/file_manager_jstest_base.h",
+        "../browser/chromeos/file_manager/file_manager_test_util.cc",
+        "../browser/chromeos/file_manager/file_manager_test_util.h",
         "../browser/chromeos/file_manager/file_manager_uitest.cc",
+        "../browser/chromeos/file_manager/file_tasks_browsertest.cc",
         "../browser/chromeos/file_manager/gallery_browsertest.cc",
         "../browser/chromeos/file_manager/gallery_jstest.cc",
         "../browser/chromeos/file_manager/image_loader_jstest.cc",
@@ -1582,6 +1613,7 @@ test("browser_tests") {
         "../browser/chromeos/login/bluetooth_host_pairing_browsertest.cc",
         "../browser/chromeos/login/crash_restore_browsertest.cc",
         "../browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc",
+        "../browser/chromeos/login/demo_mode/demo_setup_test_utils.h",
         "../browser/chromeos/login/demo_setup_browsertest.cc",
         "../browser/chromeos/login/enable_debugging_browsertest.cc",
         "../browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc",
@@ -1608,6 +1640,10 @@ test("browser_tests") {
         "../browser/chromeos/login/resource_loader_browsertest.cc",
         "../browser/chromeos/login/saml/saml_browsertest.cc",
         "../browser/chromeos/login/screens/hid_detection_screen_browsertest.cc",
+        "../browser/chromeos/login/screens/mock_arc_terms_of_service_screen.cc",
+        "../browser/chromeos/login/screens/mock_arc_terms_of_service_screen.h",
+        "../browser/chromeos/login/screens/mock_demo_preferences_screen.cc",
+        "../browser/chromeos/login/screens/mock_demo_preferences_screen.h",
         "../browser/chromeos/login/screens/mock_demo_setup_screen.cc",
         "../browser/chromeos/login/screens/mock_demo_setup_screen.h",
         "../browser/chromeos/login/screens/mock_enable_debugging_screen.cc",
@@ -1616,9 +1652,9 @@ test("browser_tests") {
         "../browser/chromeos/login/screens/mock_eula_screen.h",
         "../browser/chromeos/login/screens/mock_wrong_hwid_screen.cc",
         "../browser/chromeos/login/screens/mock_wrong_hwid_screen.h",
-        "../browser/chromeos/login/screens/network_screen_browsertest.cc",
         "../browser/chromeos/login/screens/update_screen_browsertest.cc",
         "../browser/chromeos/login/screens/user_selection_screen_browsertest.cc",
+        "../browser/chromeos/login/screens/welcome_screen_browsertest.cc",
         "../browser/chromeos/login/session/chrome_session_manager_browsertest.cc",
         "../browser/chromeos/login/session_login_browsertest.cc",
         "../browser/chromeos/login/signin/device_id_browsertest.cc",
@@ -1641,7 +1677,6 @@ test("browser_tests") {
         "../browser/chromeos/login/webview_login_browsertest.cc",
         "../browser/chromeos/login/wizard_controller_browsertest.cc",
         "../browser/chromeos/net/network_portal_detector_impl_browsertest.cc",
-        "../browser/chromeos/options/network_config_view_browsertest.cc",
         "../browser/chromeos/policy/affiliation_test_helper.cc",
         "../browser/chromeos/policy/affiliation_test_helper.h",
         "../browser/chromeos/policy/blocking_login_browsertest.cc",
@@ -1687,7 +1722,6 @@ test("browser_tests") {
         "../browser/notifications/notification_platform_bridge_chromeos_browsertest.cc",
         "../browser/resources/chromeos/zip_archiver/test/zip_archiver_jstest.cc",
         "../browser/signin/chromeos_mirror_account_consistency_browsertest.cc",
-        "../browser/ui/app_list/app_list_browsertest.cc",
         "../browser/ui/app_list/arc/arc_usb_host_permission_browsertest.cc",
         "../browser/ui/ash/accelerator_commands_browsertest.cc",
         "../browser/ui/ash/chrome_new_window_client_browsertest.cc",
@@ -1709,7 +1743,10 @@ test("browser_tests") {
         "../browser/ui/ash/volume_controller_browsertest.cc",
         "../browser/ui/views/apps/chrome_native_app_window_views_aura_ash_browsertest.cc",
         "../browser/ui/views/arc_app_dialog_view_browsertest.cc",
+        "../browser/ui/views/crostini/crostini_browser_test_util.cc",
+        "../browser/ui/views/crostini/crostini_browser_test_util.h",
         "../browser/ui/views/crostini/crostini_installer_view_browsertest.cc",
+        "../browser/ui/views/crostini/crostini_uninstaller_view_browsertest.cc",
         "../browser/ui/views/frame/browser_frame_ash_browsertest.cc",
         "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc",
         "../browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc",
@@ -1748,6 +1785,7 @@ test("browser_tests") {
         "//ash/public/interfaces:test_interfaces",
         "//chrome/browser/chromeos:arc_test_support",
         "//chrome/services/file_util/public/cpp:browser_tests",
+        "//chromeos/components/drivefs:test_support",
         "//components/arc:arc_test_support",
         "//components/exo:test_support",
         "//components/prefs",
@@ -1888,7 +1926,6 @@ test("browser_tests") {
         "../browser/ui/cocoa/accelerators_cocoa_browsertest.mm",
         "../browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm",
         "../browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm",
-        "../browser/ui/cocoa/browser_window_touch_bar_browsertest.mm",
         "../browser/ui/cocoa/dev_tools_controller_browsertest.mm",
         "../browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h",
         "../browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm",
@@ -1903,6 +1940,8 @@ test("browser_tests") {
         "../browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm",
         "../browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa_browsertest.mm",
         "../browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm",
+        "../browser/ui/cocoa/touchbar/browser_window_touch_bar_controller_browsertest.mm",
+        "../browser/ui/cocoa/touchbar/suggested_text_touch_bar_controller_browsertest.mm",
         "../browser/ui/cocoa/view_id_util_browsertest.mm",
         "../browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm",
 
@@ -1929,12 +1968,15 @@ test("browser_tests") {
         "../browser/ui/views/accessibility/invert_bubble_view_browsertest.cc",
         "../browser/ui/views/settings_reset_prompt_dialog_browsertest.cc",
         "../browser/ui/views/uninstall_view_browsertest.cc",
+        "../browser/vr/test/mock_openvr_device_hook_base.cc",
+        "../browser/vr/test/mock_openvr_device_hook_base.h",
         "../browser/vr/test/vr_browser_test.cc",
         "../browser/vr/test/vr_browser_test.h",
         "../browser/vr/test/vr_xr_browser_test.cc",
         "../browser/vr/test/vr_xr_browser_test.h",
         "../browser/vr/test/xr_browser_test.cc",
         "../browser/vr/test/xr_browser_test.h",
+        "../browser/vr/webvr_frame_pose_browser_test.cc",
         "../browser/vr/webvr_input_browser_test.cc",
         "../browser/vr/webvr_pixel_browser_test.cc",
         "../browser/vr/webvr_tab_browser_test.cc",
@@ -1943,14 +1985,17 @@ test("browser_tests") {
       deps += [
         "//chrome:other_version",
         "//chrome/app:command_ids",
+        "//device/vr",
         "//third_party/wtl",
         "//ui/resources",
       ]
       data_deps += [ "../../device/vr:openvr_mock" ]
 
       if (is_chrome_branded) {
-        sources +=
-            [ "../browser/conflicts/incompatible_applications_browsertest.cc" ]
+        sources += [
+          "../browser/conflicts/incompatible_applications_browsertest.cc",
+          "../browser/conflicts/third_party_blocking_browsertest.cc",
+        ]
         deps += [ ":conflicts_dll" ]
       }
     } else {  # Not Windows.
@@ -1978,7 +2023,6 @@ test("browser_tests") {
       sources += [
         # Tests for non mobile and non CrOS (includes Linux, Win, Mac).
         "../browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc",
-        "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc",
         "../browser/profiles/profile_statistics_browsertest.cc",
       ]
     }
@@ -1992,7 +2036,6 @@ test("browser_tests") {
     if (enable_app_list) {
       sources += [
         "../browser/ui/app_list/app_list_client_impl_browsertest.cc",
-        "../browser/ui/app_list/app_list_controller_browsertest.cc",
         "../browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc",
       ]
     }
@@ -2006,6 +2049,10 @@ test("browser_tests") {
         "../browser/supervised_user/supervised_user_service_browsertest.cc",
       ]
     }
+    if (is_desktop_linux && is_asan && is_lsan) {
+      # TODO(crbug.com/793426): Fix the flakiness on Linux Asan Lsan bot.
+      sources -= [ "../browser/media/encrypted_media_browsertest.cc" ]
+    }
     if (enable_library_cdms) {
       # Runtime dependencies.
       data_deps += [
@@ -2126,6 +2173,10 @@ group("telemetry_perf_unittests") {
 
     # For smoke testing run_telemetry_benchmark_as_googletest
     "//testing/scripts/run_telemetry_benchmark_as_googletest.py",
+
+    # For tests in tools/perf/process_perf_results_unittest.py
+    "//build/android/pylib/",
+    "//tools/swarming_client/",
   ]
 
   if (enable_mus) {
@@ -2234,14 +2285,9 @@ test("unit_tests") {
     "../browser/android/compositor/layer/tab_layer_unittest.cc",
     "../browser/android/contextualsearch/contextual_search_delegate_unittest.cc",
     "../browser/android/contextualsearch/contextual_search_field_trial_unittest.cc",
-    "../browser/android/data_usage/data_use_matcher_unittest.cc",
-    "../browser/android/data_usage/data_use_tab_model_unittest.cc",
-    "../browser/android/data_usage/data_use_ui_tab_model_unittest.cc",
-    "../browser/android/data_usage/external_data_use_observer_unittest.cc",
-    "../browser/android/data_usage/external_data_use_reporter_unittest.cc",
-    "../browser/android/data_usage/tab_data_use_entry_unittest.cc",
     "../browser/android/digital_asset_links/digital_asset_links_handler_unittest.cc",
     "../browser/android/download/download_manager_service_unittest.cc",
+    "../browser/android/explore_sites/ntp_json_fetcher_unittest.cc",
     "../browser/android/history_report/data_observer_unittest.cc",
     "../browser/android/history_report/delta_file_backend_leveldb_unittest.cc",
     "../browser/android/history_report/delta_file_commons_unittest.cc",
@@ -2335,9 +2381,8 @@ test("unit_tests") {
     "../browser/content_settings/sound_content_setting_observer_unittest.cc",
     "../browser/content_settings/tab_specific_content_settings_unittest.cc",
     "../browser/custom_handlers/protocol_handler_registry_unittest.cc",
-    "../browser/data_usage/tab_id_annotator_unittest.cc",
-    "../browser/data_usage/tab_id_provider_unittest.cc",
     "../browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc",
+    "../browser/data_use_measurement/page_load_capping/page_load_capping_blacklist_unittest.cc",
     "../browser/data_use_measurement/page_load_capping/page_load_capping_infobar_delegate_unittest.cc",
     "../browser/download/chrome_download_manager_delegate_unittest.cc",
     "../browser/download/download_history_unittest.cc",
@@ -2385,7 +2430,7 @@ test("unit_tests") {
     "../browser/installable/installable_manager_unittest.cc",
     "../browser/installable/installable_task_queue_unittest.cc",
     "../browser/internal_auth_unittest.cc",
-    "../browser/language/language_model_factory_unittest.cc",
+    "../browser/language/language_model_manager_factory_unittest.cc",
     "../browser/language/url_language_histogram_factory_unittest.cc",
     "../browser/loader/chrome_navigation_data_unittest.cc",
     "../browser/loader/chrome_resource_dispatcher_host_delegate_unittest.cc",
@@ -2424,6 +2469,7 @@ test("unit_tests") {
     "../browser/metrics/subprocess_metrics_provider_unittest.cc",
     "../browser/metrics/thread_watcher_android_unittest.cc",
     "../browser/metrics/thread_watcher_unittest.cc",
+    "../browser/navigation_predictor/navigation_predictor_unittest.cc",
     "../browser/net/chrome_accept_language_settings_unittest.cc",
     "../browser/net/chrome_network_delegate_unittest.cc",
     "../browser/net/dns_probe_runner_unittest.cc",
@@ -2438,7 +2484,6 @@ test("unit_tests") {
     "../browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc",
     "../browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc",
     "../browser/net/url_info_unittest.cc",
-    "../browser/notifications/desktop_notification_profile_util_unittest.cc",
     "../browser/notifications/metrics/notification_metrics_logger_unittest.cc",
     "../browser/notifications/notification_channels_provider_android_unittest.cc",
     "../browser/notifications/notification_permission_context_unittest.cc",
@@ -2473,6 +2518,7 @@ test("unit_tests") {
     "../browser/page_load_metrics/observers/page_load_metrics_observer_tester.h",
     "../browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc",
     "../browser/page_load_metrics/observers/protocol_page_load_metrics_observer_unittest.cc",
+    "../browser/page_load_metrics/observers/scheme_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/service_worker_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/ukm_page_load_metrics_observer_unittest.cc",
@@ -2493,6 +2539,9 @@ test("unit_tests") {
     "../browser/permissions/permission_request_manager_unittest.cc",
     "../browser/permissions/permission_util_unittest.cc",
     "../browser/plugins/pdf_iframe_navigation_throttle_unittest.cc",
+    "../browser/policy/browser_dm_token_storage_linux_unittest.cc",
+    "../browser/policy/browser_dm_token_storage_mac_unittest.cc",
+    "../browser/policy/browser_dm_token_storage_unittest.cc",
     "../browser/policy/browser_dm_token_storage_win_unittest.cc",
     "../browser/policy/cloud/cloud_policy_invalidator_unittest.cc",
     "../browser/policy/cloud/cloud_policy_test_utils.cc",
@@ -2508,6 +2557,7 @@ test("unit_tests") {
     "../browser/predictors/autocomplete_action_predictor_unittest.cc",
     "../browser/predictors/loading_data_collector_unittest.cc",
     "../browser/predictors/loading_predictor_config_unittest.cc",
+    "../browser/predictors/loading_predictor_tab_helper_unittest.cc",
     "../browser/predictors/loading_predictor_unittest.cc",
     "../browser/predictors/loading_stats_collector_unittest.cc",
     "../browser/predictors/preconnect_manager_unittest.cc",
@@ -2572,7 +2622,6 @@ test("unit_tests") {
     "../browser/signin/unified_consent_helper_unittest.cc",
     "../browser/ssl/certificate_error_report_unittest.cc",
     "../browser/ssl/certificate_error_reporter_unittest.cc",
-    "../browser/ssl/chrome_expect_ct_reporter_unittest.cc",
     "../browser/ssl/insecure_sensitive_input_driver_unittest.cc",
     "../browser/ssl/security_state_tab_helper_unittest.cc",
     "../browser/ssl/ssl_config_service_manager_pref_unittest.cc",
@@ -2604,6 +2653,9 @@ test("unit_tests") {
     "../browser/ui/autofill/autofill_dialog_models_unittest.cc",
     "../browser/ui/autofill/autofill_popup_layout_model_unittest.cc",
     "../browser/ui/autofill/popup_view_common_unittest.cc",
+    "../browser/ui/autofill/popup_view_test_helpers.cc",
+    "../browser/ui/autofill/popup_view_test_helpers.h",
+    "../browser/ui/bloated_renderer/bloated_renderer_tab_helper_unittest.cc",
     "../browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc",
     "../browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc",
     "../browser/ui/blocked_content/scoped_visibility_tracker_unittest.cc",
@@ -2632,9 +2684,10 @@ test("unit_tests") {
     "../browser/update_client/chrome_update_query_params_delegate_unittest.cc",
     "../browser/vr/metrics/session_metrics_helper_unittest.cc",
     "../browser/vr/vr_tab_helper_unittest.cc",
+    "../browser/webauthn/authenticator_request_scheduler_unittest.cc",
+    "../browser/webauthn/chrome_authenticator_request_delegate_unittest.cc",
     "../browser/webshare/share_target_pref_helper_unittest.cc",
     "../browser/win/chrome_elf_init_unittest.cc",
-    "../browser/win/enumerate_modules_model_unittest.cc",
     "../browser/win/jumplist_file_util_unittest.cc",
     "../browser/win/jumplist_update_util_unittest.cc",
     "../browser/win/taskbar_icon_finder_unittest.cc",
@@ -2697,8 +2750,9 @@ test("unit_tests") {
   if (is_win) {
     assert(toolkit_views)
     sources += [
-      "../browser/notifications/mock_notification_image_retainer.cc",
-      "../browser/notifications/mock_notification_image_retainer.h",
+      "../browser/media/widevine_hardware_caps_win_unittest.cc",
+      "../browser/notifications/win/mock_notification_image_retainer.cc",
+      "../browser/notifications/win/mock_notification_image_retainer.h",
       "../browser/ui/views/try_chrome_dialog_win/button_layout_unittest.cc",
     ]
   }
@@ -2706,7 +2760,6 @@ test("unit_tests") {
   configs += [ "//build/config:precompiled_headers" ]
 
   data_deps = [
-    "//testing/buildbot/filters:unit_tests_filters",
     "//chrome/test/data/media/engagement/preload:generate_preload_list",
     "//chrome/test/data/media/engagement/preload:test_data",
   ]
@@ -2865,18 +2918,21 @@ test("unit_tests") {
   if (is_android) {
     sources += [
       "../browser/android/search_permissions/search_permissions_service_unittest.cc",
+      "../browser/android/tasks/task_tab_helper_unittest.cc",
       "../browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc",
       "../browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc",
       "../browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc",
       "../browser/password_manager/account_chooser_dialog_android_unittest.cc",
       "../browser/password_manager/auto_signin_first_run_dialog_android_unittest.cc",
+      "../browser/password_manager/password_accessory_controller_unittest.cc",
       "../browser/password_manager/save_password_infobar_delegate_android_unittest.cc",
+      "../browser/password_manager/update_password_infobar_delegate_android_unittest.cc",
     ]
     deps += [
       "//base:base_java",
       "//chrome/android:app_hooks_java",
       "//chrome/android:chrome_java",
-      "//chrome/android:class_register_java",
+      "//components/favicon/core/test:test_support",
       "//components/gcm_driver/instance_id/android:instance_id_driver_java",
       "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
       "//content/public/android:content_java",
@@ -2928,12 +2984,14 @@ test("unit_tests") {
       "../browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc",
       "../browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc",
       "../browser/memory/swap_thrashing_monitor_delegate_win_unittest.cc",
+      "../browser/metrics/desktop_session_duration/desktop_session_duration_tracker_unittest.cc",
       "../browser/metrics/tab_stats_data_store_unittest.cc",
       "../browser/metrics/tab_stats_tracker_unittest.cc",
       "../browser/page_load_metrics/observers/session_restore_page_load_metrics_observer_unittest.cc",
       "../browser/resource_coordinator/background_tab_navigation_throttle_unittest.cc",
       "../browser/resource_coordinator/decision_details_unittest.cc",
       "../browser/resource_coordinator/discard_metrics_lifecycle_unit_observer_unittest.cc",
+      "../browser/resource_coordinator/intervention_policy_database_unittest.cc",
       "../browser/resource_coordinator/leveldb_site_characteristics_database_unittest.cc",
       "../browser/resource_coordinator/lifecycle_unit_base_unittest.cc",
       "../browser/resource_coordinator/lifecycle_unit_unittest.cc",
@@ -2944,6 +3002,10 @@ test("unit_tests") {
       "../browser/resource_coordinator/local_site_characteristics_data_unittest_utils.h",
       "../browser/resource_coordinator/local_site_characteristics_data_writer_unittest.cc",
       "../browser/resource_coordinator/local_site_characteristics_non_recording_data_store_unittest.cc",
+      "../browser/resource_coordinator/local_site_characteristics_webcontents_observer_unittest.cc",
+      "../browser/resource_coordinator/page_signal_receiver_unittest.cc",
+      "../browser/resource_coordinator/performance_measurement_manager_unittest.cc",
+      "../browser/resource_coordinator/session_restore_policy_unittest.cc",
       "../browser/resource_coordinator/tab_activity_watcher_unittest.cc",
       "../browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc",
       "../browser/resource_coordinator/tab_lifecycle_unit_unittest.cc",
@@ -2958,6 +3020,7 @@ test("unit_tests") {
       "../browser/resource_coordinator/tab_ranker/tab_score_predictor_unittest.cc",
       "../browser/resource_coordinator/test_lifecycle_unit.cc",
       "../browser/resource_coordinator/test_lifecycle_unit.h",
+      "../browser/resource_coordinator/usage_clock_unittest.cc",
 
       # Android does not use the Message Center notification system.
       "../browser/notifications/message_center_notifications_unittest.cc",
@@ -2983,7 +3046,6 @@ test("unit_tests") {
       "../browser/search/search_engine_base_url_tracker_unittest.cc",
       "../browser/search/search_unittest.cc",
       "../browser/sessions/persistent_tab_restore_service_unittest.cc",
-      "../browser/signin/mutable_profile_oauth2_token_service_delegate_unittest.cc",
       "../browser/signin/signin_promo_unittest.cc",
       "../browser/speech/extension_api/extension_manifests_tts_unittest.cc",
       "../browser/speech/tts_controller_unittest.cc",
@@ -3005,7 +3067,6 @@ test("unit_tests") {
       "../browser/themes/theme_service_unittest.cc",
       "../browser/themes/theme_syncable_service_unittest.cc",
       "../browser/translate/translate_manager_render_view_host_unittest.cc",
-      "../browser/ui/webui/theme_source_unittest.cc",
 
       # The autofill popup is implemented in mostly native code on Android.
       "../browser/ui/autofill/autofill_popup_controller_unittest.cc",
@@ -3029,6 +3090,7 @@ test("unit_tests") {
       "../browser/ui/page_info/permission_menu_model_unittest.cc",
       "../browser/ui/passwords/manage_passwords_bubble_model_unittest.cc",
       "../browser/ui/passwords/password_dialog_controller_impl_unittest.cc",
+      "../browser/ui/recently_audible_helper_unittest.cc",
       "../browser/ui/search/ntp_user_data_logger_unittest.cc",
       "../browser/ui/search/search_ipc_router_policy_unittest.cc",
       "../browser/ui/search/search_ipc_router_unittest.cc",
@@ -3072,6 +3134,7 @@ test("unit_tests") {
       "../browser/ui/webui/signin/login_ui_service_unittest.cc",
       "../browser/ui/webui/site_settings_helper_unittest.cc",
       "../browser/ui/webui/sync_internals_message_handler_unittest.cc",
+      "../browser/ui/webui/theme_source_unittest.cc",
       "../browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc",
       "../browser/ui/window_sizer/window_sizer_common_unittest.cc",
       "../browser/ui/window_sizer/window_sizer_common_unittest.h",
@@ -3104,8 +3167,12 @@ test("unit_tests") {
     if (is_posix || is_fuchsia) {
       sources += [ "../browser/process_singleton_posix_unittest.cc" ]
     }
+    if (is_chrome_branded && is_win) {
+      sources += [ "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_extension_util_win_unittest.cc" ]
+    }
 
     deps += [
+      "//chrome/browser/apps/foundation/app_service:unit_tests",
       "//chrome/browser/resource_coordinator:tab_metrics_event_proto",
       "//components/signin/core/browser:signin_buildflags",
       "//services/metrics/public/cpp:ukm_builders",
@@ -3160,6 +3227,8 @@ test("unit_tests") {
       "../browser/policy/local_sync_policy_handler_unittest.cc",
       "../browser/renderer_context_menu/render_view_context_menu_test_util.cc",
       "../browser/renderer_context_menu/render_view_context_menu_test_util.h",
+      "../browser/signin/mutable_profile_oauth2_token_service_delegate_unittest.cc",
+      "../browser/ui/autofill/local_card_migration_bubble_controller_impl_unittest.cc",
       "../browser/ui/autofill/save_card_bubble_controller_impl_unittest.cc",
       "../browser/ui/bluetooth/bluetooth_chooser_controller_unittest.cc",
       "../browser/ui/media_router/cast_modes_with_media_sources_unittest.cc",
@@ -3212,9 +3281,9 @@ test("unit_tests") {
 
     if (is_win) {
       sources += [
-        "../browser/notifications/notification_helper_launches_chrome_unittest.cc",
-        "../browser/notifications/notification_launch_id_unittest.cc",
         "../browser/notifications/notification_platform_bridge_win_unittest.cc",
+        "../browser/notifications/win/notification_helper_launches_chrome_unittest.cc",
+        "../browser/notifications/win/notification_launch_id_unittest.cc",
       ]
 
       deps += [
@@ -3243,6 +3312,7 @@ test("unit_tests") {
 
   if (is_chromeos) {
     sources -= [
+      "../browser/notifications/message_center_notifications_unittest.cc",
       "../browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc",
       "../browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc",
 
@@ -3250,7 +3320,6 @@ test("unit_tests") {
       "../browser/ui/window_sizer/window_sizer_unittest.cc",
     ]
     sources += [
-      "../browser/ash_service_registry_unittest.cc",
       "../browser/chromeos/crostini/crostini_registry_service_unittest.cc",
       "../browser/chromeos/policy/policy_cert_verifier_unittest.cc",
       "../browser/component_updater/cros_component_installer_chromeos_unittest.cc",
@@ -3263,7 +3332,7 @@ test("unit_tests") {
       "../browser/sync/sync_error_notifier_ash_unittest.cc",
       "../browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc",
       "../browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc",
-      "../browser/ui/ash/auto_connect_notifier_unittest.cc",
+      "../browser/ui/ash/browser_image_registrar_unittest.cc",
       "../browser/ui/ash/chrome_keyboard_ui_unittest.cc",
       "../browser/ui/ash/ime_controller_client_unittest.cc",
       "../browser/ui/ash/ksv/keyboard_shortcut_viewer_metadata_unittest.cc",
@@ -3278,6 +3347,7 @@ test("unit_tests") {
       "../browser/ui/ash/network/network_state_notifier_unittest.cc",
       "../browser/ui/ash/network/tether_notification_presenter_unittest.cc",
       "../browser/ui/ash/session_controller_client_unittest.cc",
+      "../browser/ui/ash/shell_state_client_unittest.cc",
       "../browser/ui/ash/tablet_mode_client_unittest.cc",
       "../browser/ui/ash/wallpaper_controller_client_unittest.cc",
       "../browser/ui/window_sizer/window_sizer_ash_unittest.cc",
@@ -3356,6 +3426,7 @@ test("unit_tests") {
       "../browser/extensions/api/chrome_extensions_api_client_unittest.cc",
       "../browser/extensions/api/content_settings/content_settings_store_unittest.cc",
       "../browser/extensions/api/content_settings/content_settings_unittest.cc",
+      "../browser/extensions/api/cookies/cookies_helpers_unittest.cc",
       "../browser/extensions/api/cookies/cookies_unittest.cc",
       "../browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc",
       "../browser/extensions/api/declarative/rules_registry_service_unittest.cc",
@@ -3521,7 +3592,6 @@ test("unit_tests") {
       "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h",
       "../browser/safe_browsing/test_extension_event_observer.cc",
       "../browser/safe_browsing/test_extension_event_observer.h",
-      "../browser/safe_search_api/safe_search_url_checker_unittest.cc",
       "../browser/ssl/ssl_blocking_page_unittest.cc",
       "../browser/sync/glue/extensions_activity_monitor_unittest.cc",
       "../browser/sync_file_system/drive_backend/callback_helper_unittest.cc",
@@ -3576,8 +3646,6 @@ test("unit_tests") {
       "../browser/sync_file_system/sync_file_system_test_util.h",
       "../browser/sync_file_system/sync_process_runner_unittest.cc",
       "../browser/sync_file_system/syncable_file_system_util_unittest.cc",
-      "../browser/web_applications/web_app_mac_unittest.mm",
-      "../browser/web_applications/web_app_unittest.cc",
       "../common/extensions/api/commands/commands_manifest_unittest.cc",
       "../common/extensions/api/common_extension_api_unittest.cc",
       "../common/extensions/api/extension_action/browser_action_manifest_unittest.cc",
@@ -3645,6 +3713,7 @@ test("unit_tests") {
       "../utility/image_writer/image_writer_unittest.cc",
     ]
     deps += [
+      "//chrome/browser/web_applications:unit_tests",
       "//chrome/common/extensions/api",
       "//extensions:extensions_resources",
       "//extensions/browser:test_support",
@@ -3697,8 +3766,11 @@ test("unit_tests") {
       "../browser/password_manager/native_backend_kwallet_x_unittest.cc",
       "../browser/shell_integration_linux_unittest.cc",
       "../browser/ui/input_method/input_method_engine_unittest.cc",
-      "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc",
     ]
+  }
+  if (!is_chromeos && !is_chromecast && is_linux) {
+    sources +=
+        [ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
     deps += [ "//build/config/linux/gtk" ]
   }
 
@@ -3793,7 +3865,6 @@ test("unit_tests") {
       "../browser/safe_browsing/local_database_manager_unittest.cc",
       "../browser/safe_browsing/local_two_phase_testserver.cc",
       "../browser/safe_browsing/local_two_phase_testserver.h",
-      "../browser/safe_browsing/notification_image_reporter_unittest.cc",
       "../browser/safe_browsing/protocol_manager_unittest.cc",
       "../browser/safe_browsing/protocol_parser_unittest.cc",
       "../browser/safe_browsing/safe_browsing_database_unittest.cc",
@@ -3824,7 +3895,7 @@ test("unit_tests") {
     deps += [
       ":test_proto",
       "//chrome/services/file_util/public/cpp:unit_tests",
-      "//components/safe_browsing:base_ping_manager_unittest",
+      "//components/safe_browsing:ping_manager_unittest",
       "//components/safe_browsing/browser:unittests",
       "//components/safe_browsing/db:v4_test_util",
       "//components/safe_browsing/renderer:websocket_sb_handshake_throttle_unittest",
@@ -3986,7 +4057,6 @@ test("unit_tests") {
     # the place this variable is used below.
     if (true) {
       cocoa_test_sources = [
-        "../browser/ui/cocoa/accelerators_cocoa_unittest.mm",
         "../browser/ui/cocoa/animatable_image_unittest.mm",
         "../browser/ui/cocoa/animatable_view_unittest.mm",
         "../browser/ui/cocoa/app_menu/app_menu_button_cell_unittest.mm",
@@ -3994,8 +4064,6 @@ test("unit_tests") {
         "../browser/ui/cocoa/app_menu/menu_tracked_root_view_unittest.mm",
         "../browser/ui/cocoa/autofill/autofill_bubble_controller_unittest.mm",
         "../browser/ui/cocoa/autofill/autofill_tooltip_controller_unittest.mm",
-        "../browser/ui/cocoa/autofill/credit_card_autofill_touch_bar_controller_unittest.mm",
-        "../browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm",
         "../browser/ui/cocoa/background_gradient_view_unittest.mm",
         "../browser/ui/cocoa/base_bubble_controller_unittest.mm",
         "../browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm",
@@ -4025,7 +4093,6 @@ test("unit_tests") {
         "../browser/ui/cocoa/browser_window_cocoa_unittest.mm",
         "../browser/ui/cocoa/browser_window_controller_unittest.mm",
         "../browser/ui/cocoa/browser_window_layout_unittest.mm",
-        "../browser/ui/cocoa/browser_window_touch_bar_unittest.mm",
         "../browser/ui/cocoa/browser_window_utils_unittest.mm",
         "../browser/ui/cocoa/bubble_anchor_helper_views_unittest.mm",
         "../browser/ui/cocoa/bubble_view_unittest.mm",
@@ -4140,6 +4207,9 @@ test("unit_tests") {
         "../browser/ui/cocoa/toolbar/toolbar_button_unittest.mm",
         "../browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm",
         "../browser/ui/cocoa/toolbar/toolbar_view_unittest.mm",
+        "../browser/ui/cocoa/touchbar/browser_window_default_touch_bar_unittest.mm",
+        "../browser/ui/cocoa/touchbar/credit_card_autofill_touch_bar_controller_unittest.mm",
+        "../browser/ui/cocoa/touchbar/suggested_text_touch_bar_controller_unittest.mm",
         "../browser/ui/cocoa/translate/translate_bubble_controller_unittest.mm",
         "../browser/ui/cocoa/url_drop_target_unittest.mm",
         "../browser/ui/cocoa/vertical_gradient_view_unittest.mm",
@@ -4200,8 +4270,8 @@ test("unit_tests") {
     }
 
     sources += [
-      "../browser/notifications/notification_image_retainer_unittest.cc",
-      "../browser/notifications/notification_template_builder_unittest.cc",
+      "../browser/notifications/win/notification_image_retainer_unittest.cc",
+      "../browser/notifications/win/notification_template_builder_unittest.cc",
       "../browser/ui/desktop_ios_promotion/desktop_ios_promotion_bubble_controller_unittest.cc",
       "../browser/ui/desktop_ios_promotion/desktop_ios_promotion_util_unittest.cc",
       "../browser/ui/desktop_ios_promotion/sms_service_unittest.cc",
@@ -4213,7 +4283,6 @@ test("unit_tests") {
       "//chrome/app:chrome_dll_resources",
       "//chrome/install_static:install_static_util",
       "//chrome/installer/util:strings",
-      "//chrome_elf:blacklist_test_dll_1",
       "//third_party/iaccessible2",
       "//third_party/isimpledom",
       "//third_party/wtl",
@@ -4244,9 +4313,12 @@ test("unit_tests") {
       sources += [
         "../browser/conflicts/incompatible_applications_updater_win_unittest.cc",
         "../browser/conflicts/installed_applications_win_unittest.cc",
+        "../browser/conflicts/module_blacklist_cache_updater_win_unittest.cc",
         "../browser/conflicts/module_blacklist_cache_util_win_unittest.cc",
         "../browser/conflicts/module_list_filter_win_unittest.cc",
+        "../browser/conflicts/module_load_attempt_log_listener_win_unittest.cc",
         "../browser/conflicts/registry_key_watcher_win_unittest.cc",
+        "../browser/conflicts/third_party_conflicts_manager_win_unittest.cc",
         "../browser/google/google_update_win_unittest.cc",
       ]
     }
@@ -4261,8 +4333,8 @@ test("unit_tests") {
   if (!is_android && !is_chromeos) {
     sources += [
       "../browser/media/webrtc/native_desktop_media_list_unittest.cc",
-      "../browser/metrics/desktop_session_duration/desktop_session_duration_tracker_unittest.cc",
       "../browser/metrics/upgrade_metrics_provider_unittest.cc",
+      "../browser/policy/machine_level_user_cloud_policy_register_watcher_unittest.cc",
       "../browser/signin/force_signin_verifier_unittest.cc",
       "../browser/signin/signin_global_error_unittest.cc",
       "../browser/signin/signin_ui_util_unittest.cc",
@@ -4288,8 +4360,11 @@ test("unit_tests") {
       "../browser/ui/views/global_error_bubble_view_unittest.cc",
       "../browser/ui/views/harmony/layout_provider_unittest.cc",
       "../browser/ui/views/hover_button_unittest.cc",
+      "../browser/ui/views/media_router/cast_dialog_metrics_unittest.cc",
+      "../browser/ui/views/media_router/cast_dialog_no_sinks_view_unittest.cc",
       "../browser/ui/views/media_router/cast_dialog_sink_button_unittest.cc",
       "../browser/ui/views/media_router/cast_dialog_view_unittest.cc",
+      "../browser/ui/views/media_router/cloud_services_dialog_view_unittest.cc",
       "../browser/ui/views/media_router/media_router_views_ui_unittest.cc",
       "../browser/ui/views/page_info/page_info_bubble_view_unittest.cc",
       "../browser/ui/views/payments/payment_request_item_list_unittest.cc",
@@ -4351,6 +4426,12 @@ test("unit_tests") {
         "../browser/ui/views/toolbar/reload_button_unittest.cc",
         "../browser/ui/views/toolbar/toolbar_action_view_unittest.cc",
         "../browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc",
+
+        # TODO(thestig): Rename toolbar_button_views_unittest.cc to
+        # toolbar_button_unittest.cc once toolbar_button_unittest.mm goes away.
+        # The 2 files cannot co-exist when they both try to generate
+        # toolbar_button_unittest.o.
+        "../browser/ui/views/toolbar/toolbar_button_views_unittest.cc",
         "../browser/ui/views/translate/translate_bubble_view_unittest.cc",
         "../browser/ui/views/webshare/webshare_target_picker_view_unittest.cc",
       ]
@@ -4405,6 +4486,9 @@ test("unit_tests") {
       "../browser/ui/app_list/arc/arc_app_unittest.cc",
       "../browser/ui/app_list/arc/arc_app_utils_unittest.cc",
       "../browser/ui/app_list/arc/arc_vpn_provider_unittest.cc",
+      "../browser/ui/app_list/arc/mock_arc_app_list_prefs_observer.cc",
+      "../browser/ui/app_list/arc/mock_arc_app_list_prefs_observer.h",
+      "../browser/ui/app_list/crostini/crostini_app_model_builder_unittest.cc",
       "../browser/ui/app_list/extension_app_model_builder_unittest.cc",
       "../browser/ui/app_list/internal_app/internal_app_model_builder_unittest.cc",
       "../browser/ui/app_list/search/answer_card/answer_card_result_unittest.cc",
@@ -4430,9 +4514,9 @@ test("unit_tests") {
     deps += [
       # TODO(wutao): Put new icons resources to ash/public/cpp/vector_icons/
       # when UX provides them.
+      "//ash/app_list:test_support",
       "//ash/resources/vector_icons",
       "//components/arc:arc_test_support",
-      "//ui/app_list:test_support",
     ]
   }
 
@@ -4459,7 +4543,7 @@ static_library("test_support_unit") {
     "//chrome:strings",
     "//chrome/browser",
     "//chrome/common",
-    "//mojo/edk/test:test_support",
+    "//mojo/core/test:test_support",
   ]
 
   if (is_win) {
@@ -4467,13 +4551,6 @@ static_library("test_support_unit") {
       "//chrome/install_static/test:test_support",
     ]
   }
-
-  if (is_chromeos) {
-    deps = [
-      "//ash:test_support_with_content",
-      "//ash/public/cpp",
-    ]
-  }
 }
 
 if (is_win) {
@@ -4495,9 +4572,13 @@ if (!is_android) {
       "../browser/permissions/permission_request_manager_test_api.h",
       "../browser/ssl/cert_verifier_browser_test.cc",
       "../browser/ssl/cert_verifier_browser_test.h",
+      "../browser/ui/search/instant_test_utils.cc",
+      "../browser/ui/search/instant_test_utils.h",
+      "../browser/ui/search/local_ntp_test_utils.cc",
+      "../browser/ui/search/local_ntp_test_utils.h",
       "base/in_process_browser_test.cc",
       "base/in_process_browser_test.h",
-      "base/in_process_browser_test_mac.cc",
+      "base/in_process_browser_test_mac.mm",
       "base/javascript_browser_test.cc",
       "base/javascript_browser_test.h",
       "base/mojo_web_ui_browser_test.cc",
@@ -4531,6 +4612,8 @@ if (!is_android) {
       sources += [
         "ppapi/ppapi_test.cc",
         "ppapi/ppapi_test.h",
+        "ppapi/ppapi_test_select_file_dialog_factory.cc",
+        "ppapi/ppapi_test_select_file_dialog_factory.h",
       ]
     }
 
@@ -4606,15 +4689,17 @@ if (!is_android) {
   test("interactive_ui_tests") {
     sources = [
       "../browser/about_flags_browsertest.cc",
-      "../browser/apps/app_browsertest_util.cc",
-      "../browser/apps/app_browsertest_util.h",
-      "../browser/apps/app_pointer_lock_interactive_uitest.cc",
       "../browser/apps/app_shim/app_shim_interactive_uitest_mac.mm",
       "../browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm",
-      "../browser/apps/app_window_interactive_uitest.cc",
-      "../browser/apps/app_window_interactive_uitest.h",
       "../browser/apps/guest_view/web_view_interactive_browsertest.cc",
+      "../browser/apps/platform_apps/app_browsertest_util.cc",
+      "../browser/apps/platform_apps/app_browsertest_util.h",
+      "../browser/apps/platform_apps/app_pointer_lock_interactive_uitest.cc",
+      "../browser/apps/platform_apps/app_window_interactive_uitest.cc",
+      "../browser/apps/platform_apps/app_window_interactive_uitest.h",
       "../browser/autofill/autofill_interactive_uitest.cc",
+      "../browser/autofill/autofill_uitest.cc",
+      "../browser/autofill/autofill_uitest.h",
       "../browser/autofill/autofill_uitest_util.cc",
       "../browser/autofill/autofill_uitest_util.h",
       "../browser/browser_keyevents_browsertest.cc",
@@ -4637,8 +4722,8 @@ if (!is_android) {
       "../browser/extensions/updater/extension_cache_fake.cc",
       "../browser/extensions/updater/extension_cache_fake.h",
       "../browser/extensions/window_open_interactive_apitest.cc",
+      "../browser/global_keyboard_shortcuts_mac_browsertest.mm",
       "../browser/mouse_events_interactive_uitest.cc",
-      "../browser/notifications/message_center_notifications_browsertest.cc",
       "../browser/notifications/platform_notification_service_interactive_uitest.cc",
       "../browser/password_manager/password_generation_interactive_uitest.cc",
       "../browser/password_manager/password_manager_interactive_test_base.cc",
@@ -4659,24 +4744,28 @@ if (!is_android) {
       "../browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc",
       "../browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc",
       "../browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc",
+      "../browser/ui/exclusive_access/fullscreen_interactive_browsertest.cc",
       "../browser/ui/find_bar/find_bar_host_interactive_uitest.cc",
+      "../browser/ui/fullscreen_keyboard_browsertest_base.cc",
+      "../browser/ui/fullscreen_keyboard_browsertest_base.h",
       "../browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc",
+      "../browser/ui/keyboard_lock_interactive_browsertest.cc",
       "../browser/ui/omnibox/omnibox_view_browsertest.cc",
       "../browser/ui/passwords/manage_passwords_test.cc",
       "../browser/ui/passwords/manage_passwords_test.h",
       "../browser/ui/search/instant_extended_interactive_uitest.cc",
       "../browser/ui/search/instant_test_base.cc",
       "../browser/ui/search/instant_test_base.h",
-      "../browser/ui/search/instant_test_utils.cc",
-      "../browser/ui/search/instant_test_utils.h",
       "../browser/ui/search/instant_uitest_base.cc",
       "../browser/ui/search/instant_uitest_base.h",
       "../browser/ui/search/local_ntp_uitest.cc",
       "../browser/ui/send_mouse_move_uitest_win.cc",
+      "../browser/ui/signin_view_controller_interactive_uitest.cc",
       "../browser/ui/startup/startup_browser_creator_interactive_uitest.cc",
       "../browser/ui/tabs/window_activity_watcher_interactive_uitest.cc",
       "../browser/ui/translate/translate_bubble_test_utils.h",
       "../browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc",
+      "../browser/ui/views/permission_bubble/permission_bubble_views_interactive_uitest_mac.mm",
       "../browser/webauth_interactive_uitest.cc",
       "//ui/base/clipboard/clipboard_unittest.cc",
       "base/always_on_top_window_killer_win.cc",
@@ -4764,7 +4853,7 @@ if (!is_android) {
       "//device/fido:test_support",
       "//extensions/buildflags",
       "//google_apis:test_support",
-      "//mojo/edk",
+      "//mojo/core/embedder",
       "//net",
       "//net:net_resources",
       "//net:test_support",
@@ -4803,6 +4892,7 @@ if (!is_android) {
     if (toolkit_views) {
       sources += [
         "../browser/ui/views/menu_controller_interactive_uitest.cc",
+        "../browser/ui/views/menu_interactive_uitest.cc",
         "../browser/ui/views/menu_item_view_interactive_uitest.cc",
         "../browser/ui/views/menu_model_adapter_test.cc",
         "../browser/ui/views/menu_test_base.cc",
@@ -4876,6 +4966,7 @@ if (!is_android) {
 
     if (is_chromeos) {
       sources += [
+        "../browser/chromeos/accessibility/dictation_chromeos_browsertest.cc",
         "../browser/chromeos/accessibility/magnification_controller_browsertest.cc",
         "../browser/chromeos/accessibility/select_to_speak_browsertest.cc",
         "../browser/chromeos/accessibility/spoken_feedback_browsertest.cc",
@@ -4912,27 +5003,32 @@ if (!is_android) {
         "../browser/chromeos/login/test/oobe_base_test.cc",
         "../browser/chromeos/login/test/oobe_base_test.h",
         "../browser/download/notification/download_notification_interactive_uitest.cc",
-        "../browser/ui/app_list/app_list_interactive_uitest.cc",
         "../browser/ui/ash/tab_scrubber_browsertest.cc",
         "../browser/ui/views/apps/chrome_native_app_window_views_aura_ash_interactive_uitest.cc",
         "../browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc",
         "../browser/ui/window_sizer/window_sizer_ash_uitest.cc",
         "//ash/accelerators/accelerator_interactive_uitest_chromeos.cc",
+        "//ash/app_list/app_list_interactive_uitest.cc",
         "//ash/drag_drop/drag_drop_interactive_uitest.cc",
         "//ash/wm/native_cursor_manager_ash_interactive_uitest.cc",
         "data/chromeos/service_login.html",
       ]
+      if (is_chrome_branded) {
+        sources += [
+          # The screen this test is checking exists in official build only.
+          "../browser/chromeos/login/sync_consent_interactive_ui_test.cc",
+        ]
+      }
       sources -= [
         # Use only the _chromeos version on Ash / Chrome OS.
         "base/view_event_test_platform_part_default.cc",
       ]
       deps += [
         "//ash:interactive_ui_test_support",
-        "//ash/app_list/presenter:test_support",
         "//ash/public/interfaces:test_interfaces",
         "//chrome/browser/media/router:test_support",
         "//chromeos",
-        "//mojo/edk",
+        "//mojo/core/embedder",
       ]
 
       data += [
@@ -4954,9 +5050,9 @@ if (!is_android) {
         }
       }
     } else {  # ! is_chromeos
-      # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform
-      # panels).
+      # Non-ChromeOS notifications tests.
       sources += [
+        "../browser/notifications/message_center_notifications_browsertest.cc",
         "../browser/notifications/notification_interactive_uitest.cc",
         "../browser/notifications/notification_interactive_uitest_mac.mm",
         "../browser/notifications/notification_interactive_uitest_support.cc",
@@ -4967,9 +5063,9 @@ if (!is_android) {
     if (is_win) {
       sources += [
         "../browser/downgrade/user_data_downgrade_browsertest.cc",
-        "../browser/notifications/mock_itoastnotifier.cc",
-        "../browser/notifications/mock_itoastnotifier.h",
         "../browser/notifications/notification_platform_bridge_win_interactive_uitest.cc",
+        "../browser/notifications/win/mock_itoastnotifier.cc",
+        "../browser/notifications/win/mock_itoastnotifier.h",
         "../browser/ui/views/touch_events_interactive_uitest_win.cc",
         "//ui/resources/cursors/aliasb.cur",
         "//ui/resources/cursors/cell.cur",
@@ -5020,11 +5116,6 @@ if (!is_android) {
         "//chrome:chrome_framework",
       ]
 
-      if (mac_views_browser) {
-        # Aura depended tests.
-        sources -= [ "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc" ]
-      }
-
       # The browser window can be views or Cocoa on Mac, but this is chosen at
       # runtime. This block captures tests that only run with a Cocoa browser.
       sources += [
@@ -5070,13 +5161,8 @@ if (!is_android) {
         "../browser/notifications/notification_interactive_uitest.cc",
         "../browser/notifications/platform_notification_service_interactive_uitest.cc",
       ]
-    }
-
-    if (is_mac || is_win || (is_linux && !is_chromeos)) {
-      sources += [
-        # Tests for non mobile and non CrOS (includes Linux, Win, Mac).
-        "../browser/metrics/desktop_session_duration/chrome_visibility_observer_interactive_uitest.cc",
-      ]
+    } else {
+      sources += [ "../browser/metrics/desktop_session_duration/chrome_visibility_observer_interactive_uitest.cc" ]
     }
   }
 }
@@ -5302,7 +5388,7 @@ if (!is_android && !is_fuchsia) {
         "../browser/ui/app_list/test/fake_app_list_model_updater.cc",
         "../browser/ui/app_list/test/fake_app_list_model_updater.h",
       ]
-      deps += [ "//ui/app_list:test_support" ]
+      deps += [ "//ash/app_list:test_support" ]
     } else {
       sources -= [
         "../browser/sync/test/integration/sync_app_list_helper.cc",
@@ -5346,6 +5432,7 @@ if (!is_android && !is_fuchsia) {
       "../browser/sync/test/integration/single_client_sessions_sync_test.cc",
       "../browser/sync/test/integration/single_client_themes_sync_test.cc",
       "../browser/sync/test/integration/single_client_typed_urls_sync_test.cc",
+      "../browser/sync/test/integration/single_client_user_consents_sync_test.cc",
       "../browser/sync/test/integration/single_client_user_events_sync_test.cc",
       "../browser/sync/test/integration/single_client_wallet_sync_test.cc",
       "../browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc",
@@ -5565,6 +5652,111 @@ if (!is_android && !is_fuchsia) {
     assert_no_deps = [ "//chrome" ]
   }
 
+  test("ntp_render_browsertests") {
+    sources = [
+      "../browser/ui/search/local_ntp_render_browsertest.cc",
+    ]
+
+    configs += [ "//build/config:precompiled_headers" ]
+
+    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+
+    deps = [
+      ":browser_tests_runner",
+      ":test_support",
+      ":test_support_ui",
+      "//chrome/browser",
+    ]
+  }
+
+  # Tests autofill on captured websites
+  test("autofill_captured_sites_interactive_tests") {
+    sources = [
+      "../browser/autofill/autofill_captured_sites_interactive_uitest.cc",
+      "../browser/autofill/autofill_uitest.cc",
+      "../browser/autofill/autofill_uitest.h",
+      "../browser/autofill/autofill_uitest_util.cc",
+      "../browser/autofill/autofill_uitest_util.h",
+      "base/interactive_test_utils.cc",
+      "base/interactive_test_utils.h",
+      "base/interactive_test_utils_common_views.cc",
+      "base/interactive_test_utils_mac.mm",
+      "base/interactive_test_utils_win.cc",
+      "base/interactive_ui_tests_main.cc",
+    ]
+
+    if (use_aura) {
+      sources += [
+        "base/interactive_test_utils_aura.cc",
+        "base/interactive_test_utils_aura.h",
+      ]
+    }
+
+    if (is_win) {
+      sources += [
+        "base/always_on_top_window_killer_win.cc",
+        "base/always_on_top_window_killer_win.h",
+        "base/save_desktop_snapshot_win.cc",
+        "base/save_desktop_snapshot_win.h",
+      ]
+    }
+
+    configs += [ "//build/config:precompiled_headers" ]
+
+    data = [
+      "//chrome/test/data/autofill/captured_sites/",
+    ]
+
+    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+
+    ldflags = []
+
+    deps = [
+      ":test_support",
+      ":test_support_ui",
+      "//chrome:packed_resources",
+      "//chrome:resources",
+      "//chrome:strings",
+      "//chrome/browser",
+      "//chrome/browser/devtools",
+      "//chrome/renderer",
+      "//components/resources",
+      "//components/sync",
+      "//components/sync:test_support_model",
+      "//content/app/resources",
+      "//content/test:test_support",
+      "//crypto:platform",
+      "//crypto:test_support",
+      "//google_apis:test_support",
+      "//net",
+      "//net:net_resources",
+      "//net:test_support",
+      "//skia",
+      "//testing/gmock",
+      "//testing/gtest",
+      "//third_party/hunspell",
+      "//third_party/icu",
+      "//third_party/libpng",
+      "//third_party/zlib",
+      "//ui/base:test_support",
+      "//ui/resources:ui_test_pak",
+      "//ui/web_dialogs:test_support",
+    ]
+
+    if (is_win) {
+      deps += [
+        "//chrome:other_version",
+        "//third_party/webrtc/modules/desktop_capture",
+        "//third_party/wtl",
+        "//ui/resources",
+      ]
+
+      configs -= [ "//build/config/win:default_incremental_linking" ]
+      configs +=
+          [ "//build/config/win:default_large_module_incremental_linking" ]
+    }
+  }
+
   group("telemetry_unittests") {
     testonly = true
     deps = [