BASELINE: Update Chromium to 83.0.4103.122

Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 741 insertions, 567 deletions

diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn
index 4af881eba8a..fc952779121 100644
--- a/chromium/chrome/test/BUILD.gn
+++ b/chromium/chrome/test/BUILD.gn
@@ -3,25 +3,29 @@
 # found in the LICENSE file.
 
 import("//build/config/allocator.gni")
+import("//build/config/buildflags_paint_preview.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
-import("//build/config/linux/gtk/gtk.gni")
 import("//build/config/ui.gni")
 import("//build/toolchain/toolchain.gni")
 import("//build/util/version.gni")
 import("//chrome/browser/buildflags.gni")
-import("//chrome/chrome_repack_locales.gni")
+import("//chrome/browser/downgrade/buildflags.gni")
+import("//chrome/browser/page_load_metrics/integration_tests/jsdeps.gni")
+import("//chrome/browser/page_load_metrics/integration_tests/sources.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
+import("//chrome/test/include_js_tests.gni")
+import("//chromeos/assistant/assistant.gni")
+import("//components/captive_portal/core/features.gni")
 import("//components/feature_engagement/features.gni")
 import("//components/feed/features.gni")
 import("//components/gwp_asan/buildflags/buildflags.gni")
 import("//components/nacl/features.gni")
 import("//components/offline_pages/buildflags/features.gni")
 import("//components/os_crypt/features.gni")
-import("//components/paint_preview/buildflags/buildflags.gni")
 import("//components/signin/features.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//extensions/buildflags/buildflags.gni")
@@ -43,10 +47,6 @@ if (is_android) {
   import("//build/config/android/rules.gni")
   import("//chrome/android/features/dev_ui/dev_ui_module.gni")
   import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
-} else {
-  # js_tests don't work in cross builds, https://crbug.com/1010561
-  include_js_tests =
-      !(is_asan || is_msan || is_tsan || (is_win && host_os != "win"))
 }
 
 # This target exists to reference other test executables to bring these files
@@ -78,17 +78,13 @@ group("policy_testserver_pyproto") {
 if (is_android) {
   android_library("test_support_java") {
     testonly = true
-    deps = [
-      "//chrome/android:chrome_all_java",
-    ]
-    java_files = [ "android/test_support/src/org/chromium/chrome/test_support/PaymentRequestTestBridge.java" ]
+    deps = [ "//chrome/android:chrome_all_java" ]
+    sources = [ "android/test_support/src/org/chromium/chrome/test_support/PaymentRequestTestBridge.java" ]
   }
 
   generate_jni("test_support_jni_headers") {
     testonly = true
-    sources = [
-      "android/test_support/src/org/chromium/chrome/test_support/PaymentRequestTestBridge.java",
-    ]
+    sources = [ "android/test_support/src/org/chromium/chrome/test_support/PaymentRequestTestBridge.java" ]
   }
 }
 
@@ -101,6 +97,8 @@ static_library("test_support") {
   sources = [
     "../browser/autofill/automated_tests/cache_replayer.cc",
     "../browser/autofill/automated_tests/cache_replayer.h",
+    "../browser/permissions/crowd_deny_fake_safe_browsing_database_manager.cc",
+    "../browser/permissions/crowd_deny_fake_safe_browsing_database_manager.h",
     "base/chrome_render_view_host_test_harness.cc",
     "base/chrome_render_view_host_test_harness.h",
     "base/chrome_test_launcher.cc",
@@ -131,8 +129,6 @@ static_library("test_support") {
     "base/search_test_utils.h",
     "base/test_launcher_utils.cc",
     "base/test_launcher_utils.h",
-    "base/test_service_manager_listener.cc",
-    "base/test_service_manager_listener.h",
     "base/test_switches.cc",
     "base/test_switches.h",
     "base/testing_browser_process.cc",
@@ -157,7 +153,6 @@ static_library("test_support") {
     "logging/win/mof_data_parser.h",
     "logging/win/test_log_collector.cc",
     "logging/win/test_log_collector.h",
-    "payments/payment_request_test_controller.h",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
@@ -173,13 +168,14 @@ static_library("test_support") {
     #"//chrome/app/theme:theme_resources",
     "//chrome/browser:test_support",
     "//chrome/child",
+    "//chrome/common:non_code_constants",
     "//chrome/common:test_support",
     "//chrome/renderer",
     "//chrome/renderer:test_support",
     "//chrome/utility",
     "//components/autofill/core/browser:test_support",
     "//components/bookmarks/test",
-    "//components/captive_portal:test_support",
+    "//components/captive_portal/core:test_support",
     "//components/consent_auditor:test_support",
     "//components/gcm_driver:test_support",
     "//components/gcm_driver/crypto:test_support",
@@ -193,9 +189,10 @@ static_library("test_support") {
     "//components/password_manager/core/browser:test_support",
     "//components/payments/core:test_support",
     "//components/performance_manager/test_support",
+    "//components/permissions:test_support",
     "//components/prefs:test_support",
     "//components/rappor:test_support",
-    "//components/safe_browsing/db:v4_test_util",
+    "//components/safe_browsing/core/db:v4_test_util",
     "//components/search_engines:test_support",
     "//components/sessions:test_support",
     "//components/signin/public/base:test_support",
@@ -238,12 +235,6 @@ static_library("test_support") {
   ]
 
   if (is_android) {
-    sources += [
-      "payments/android/payment_request_test_bridge.cc",
-      "payments/android/payment_request_test_bridge.h",
-      "payments/payment_request_test_controller_android.cc",
-    ]
-    deps += [ ":test_support_jni_headers" ]
     if (enable_vr) {
       public_deps += [ "//chrome/browser/android/vr:test_support" ]
 
@@ -265,7 +256,6 @@ static_library("test_support") {
       "base/dialog_test_browser_window.h",
       "base/test_browser_window.cc",
       "base/test_browser_window.h",
-      "payments/payment_request_test_controller_desktop.cc",
       "pixel/browser_skia_gold_pixel_diff.cc",
       "pixel/browser_skia_gold_pixel_diff.h",
     ]
@@ -282,7 +272,7 @@ static_library("test_support") {
     ]
     deps += [ "//build:branding_buildflags" ]
     public_deps += [
-      "//components/crash/content/app",
+      "//components/crash/core/app",
       "//third_party/breakpad",
     ]
   }
@@ -291,7 +281,7 @@ static_library("test_support") {
     sources += [ "//chrome/app/chrome_crash_reporter_client_win.cc" ]
     public_deps += [
       "//chrome/install_static/test:test_support",
-      "//components/crash/content/app",
+      "//components/crash/core/app",
       "//third_party/wtl",
     ]
   }
@@ -326,7 +316,6 @@ static_library("test_support") {
     public_deps += [
       "//ash",
       "//ash:test_support",
-      "//ash/public/cpp:manifest",
       "//components/ownership",
       "//components/user_manager:test_support",
       "//ui/aura",
@@ -355,7 +344,6 @@ static_library("test_support") {
       "../browser/ui/views/web_apps/web_app_frame_toolbar_test.h",
       "views/accessibility_checker.cc",
       "views/accessibility_checker.h",
-      "views/chrome_test_views_delegate.cc",
       "views/chrome_test_views_delegate.h",
       "views/chrome_views_test_base.cc",
       "views/chrome_views_test_base.h",
@@ -370,6 +358,8 @@ static_library("test_support") {
       "../browser/extensions/extension_browsertest.h",
       "../browser/extensions/permissions_test_util.cc",
       "../browser/extensions/permissions_test_util.h",
+      "../browser/ui/web_applications/test/ssl_test_utils.cc",
+      "../browser/ui/web_applications/test/ssl_test_utils.h",
       "../browser/ui/web_applications/test/web_app_browsertest_util.cc",
       "../browser/ui/web_applications/test/web_app_browsertest_util.h",
       "../browser/ui/web_applications/web_app_controller_browsertest.cc",
@@ -413,9 +403,7 @@ static_library("test_support") {
 
 group("telemetry_gpu_integration_test") {
   testonly = true
-  deps = [
-    "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
-  ]
+  deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
 
   data = [
     # For isolate contract.
@@ -458,27 +446,9 @@ group("telemetry_gpu_integration_test") {
     "//media/test/data/bear-1280x720.mp4",
   ]
 
-  # For pixel_test and maps_pixel_test. Because this links to a CIPD
-  # dependency, which is a symlink on Unix platforms, refer to the
-  # actual executable rather than the whole directory; copying the
-  # whole directory doesn't work, at least with "mb.py zip".
-  if (is_win) {
-    data += [ "//tools/skia_goldctl/win/goldctl.exe" ]
-  } else if (is_mac) {
-    data += [ "//tools/skia_goldctl/mac/goldctl" ]
-  } else {
-    data += [ "//tools/skia_goldctl/linux/goldctl" ]
-  }
-}
-
-group("telemetry_gpu_integration_test_scripts_only") {
-  testonly = true
-  deps = [
-    "//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome",
-  ]
-
-  data = [
-    "//content/test/gpu/",
+  data_deps = [
+    # For anything using Skia Gold (pixel, maps).
+    "//ui/base:goldctl",
   ]
 }
 
@@ -489,9 +459,7 @@ if (is_win) {
       "../browser/ui/startup/credential_provider_signin_dialog_win_test_data.cc",
       "../browser/ui/startup/credential_provider_signin_dialog_win_test_data.h",
     ]
-    deps = [
-      "//base",
-    ]
+    deps = [ "//base" ]
   }
 }
 
@@ -511,12 +479,18 @@ if (is_android) {
       ":android_browsertests_assets",
       ":android_browsertests_java",
       ":browser_tests_runner",
+      ":sync_integration_test_support",
+      ":sync_integration_test_support_java",
       ":test_support",
       ":test_support_java",
       ":test_support_ui_android",
       "//chrome:chrome_android_core",
       "//chrome/android:app_hooks_java",
+      "//chrome/browser/metrics:test_support",
+      "//chrome/browser/payments:browsertests",
+      "//chrome/browser/profiling_host:profiling_browsertests",
       "//components/crash/android:crashpad_main",
+      "//components/games/core/test:test_support",
 
       # TODO(crbug.com/961849): This is needed for ShellManager which is what
       # the ChromeBrowserTestsActivity is using to build the java UI. It's
@@ -527,24 +501,16 @@ if (is_android) {
       "//testing/android/native_test:native_test_support",
     ]
 
-    data_deps = [
-      "//testing/buildbot/filters:android_browsertests_filters",
-    ]
+    data_deps = [ "//testing/buildbot/filters:android_browsertests_filters" ]
 
     sources = [
+      "../browser/android/customtabs/custom_tabs_browsertest.cc",
+      "../browser/android/webapk/webapk_icon_hasher_browsertest.cc",
       "../browser/engagement/important_sites_util_browsertest.cc",
-      "../browser/payments/empty_parameters_browsertest.cc",
-      "../browser/payments/has_enrolled_instrument_browsertest.cc",
-      "../browser/payments/has_enrolled_instrument_query_quota_browsertest.cc",
-      "../browser/payments/hybrid_request_skip_ui_browsertest.cc",
-      "../browser/payments/journey_logger_browsertest.cc",
-      "../browser/payments/payment_handler_change_shipping_address_option_browsertest.cc",
-      "../browser/payments/payment_handler_enable_delegations_browsertest.cc",
-      "../browser/payments/payment_handler_exploit_browsertest.cc",
-      "../browser/payments/payment_handler_just_in_time_installation_browsertest.cc",
-      "../browser/payments/payment_request_can_make_payment_browsertest.cc",
-      "../browser/payments/personal_data_manager_test_util.cc",
-      "../browser/payments/personal_data_manager_test_util.h",
+      "../browser/games/games_service_browsertest.cc",
+      "../browser/metrics/metrics_service_user_demographics_browsertest.cc",
+      "../browser/net/cert_verify_proc_browsertest.cc",
+      "../browser/profiles/profile_browsertest_android.cc",
       "../browser/ssl/crlset_browsertest.cc",
       "android/browsertests_apk/android_browsertests_jni_onload.cc",
       "base/android/android_browser_test_browsertest_android.cc",
@@ -555,8 +521,11 @@ if (is_android) {
       "$root_gen_dir/chrome/android/chrome_apk_paks/locales/en-US.pak",
       "$root_gen_dir/chrome/android/chrome_apk_paks/resources.pak",
       "$root_gen_dir/components/components_resources.pak",
+      "$root_gen_dir/components/dev_ui_components_resources.pak",
       "$root_out_dir/browser_tests.pak",
       "//components/test/data/payments/",
+      "//chrome/test/data/banners/",
+      "//chrome/test/data/android/customtabs/",
       "//chrome/test/data/ssl/",
     ]
   }
@@ -571,9 +540,7 @@ if (is_android) {
       "base/android/android_browser_test.cc",
       "base/android/android_browser_test.h",
     ]
-    public_deps = [
-      "//content/test:test_support",
-    ]
+    public_deps = [ "//content/test:test_support" ]
     deps = [
       "//chrome/browser",
       "//content/public/browser",
@@ -588,7 +555,10 @@ if (is_android) {
 
     # These are grit() rules so they are in $root_gen_dir.
     deps += [ "//components/resources" ]
-    sources += [ "$root_gen_dir/components/components_resources.pak" ]
+    sources += [
+      "$root_gen_dir/components/components_resources.pak",
+      "$root_gen_dir/components/dev_ui_components_resources.pak",
+    ]
 
     # These are repack() rules so they are in $root_out_dir.
     deps += [ "//chrome:browser_tests_pak" ]
@@ -623,9 +593,10 @@ if (is_android) {
       "//testing/android/native_test:native_test_java",
       "//ui/android:ui_full_java",
     ]
-    java_files = [
+    sources = [
       "android/browsertests_apk/src/org/chromium/android_browsertests_apk/ChromeBrowserTestsActivity.java",
       "android/browsertests_apk/src/org/chromium/android_browsertests_apk/ChromeBrowserTestsApplication.java",
+      "android/browsertests_apk/src/org/chromium/android_browsertests_apk/ChromeBrowserTestsInstrumentationTestRunner.java",
     ]
   }
 
@@ -641,9 +612,7 @@ static_library("browser_tests_runner") {
   testonly = true
   sources = []
 
-  deps = [
-    ":test_support",
-  ]
+  deps = [ ":test_support" ]
 
   if (is_chromeos) {
     sources += [ "base/browser_tests_main_chromeos.cc" ]
@@ -663,8 +632,6 @@ if (!is_android) {
       "HAS_OUT_OF_PROC_TEST_RUNNER",
       "CHROME_VERSION_MAJOR=" + chrome_version_major,
     ]
-    allow_circular_includes_from =
-        [ "//chrome/browser/web_applications/extensions:browser_tests" ]
     deps = [
       ":browser_tests_runner",
       ":policy_testserver_pyproto",
@@ -675,27 +642,31 @@ if (!is_android) {
       "//base/test:test_support",
       "//base/util/memory_pressure:test_support",
       "//build:branding_buildflags",
-      "//chrome:browser_tests_pak",
       "//chrome:packed_resources",
       "//chrome:resources",
       "//chrome:strings",
       "//chrome/browser",
       "//chrome/browser/devtools:test_support",
+      "//chrome/browser/image_decoder:browser_tests",
+      "//chrome/browser/metrics:test_support",
       "//chrome/browser/notifications/scheduler/test:test_support",
+      "//chrome/browser/payments:browsertests",
       "//chrome/browser/profiling_host:profiling_browsertests",
       "//chrome/browser/web_applications:browser_tests",
-      "//chrome/browser/web_applications/extensions:browser_tests",
       "//chrome/renderer",
       "//chrome/services/removable_storage_writer:lib",
+      "//chrome/test/data:webui_test_resources",
       "//components/autofill/content/browser:risk_proto",
       "//components/autofill/content/common/mojom",
       "//components/autofill/content/renderer:test_support",
-      "//components/captive_portal:test_support",
+      "//components/captive_portal/core:test_support",
       "//components/cbor",
       "//components/data_reduction_proxy/core/browser:test_support",
       "//components/dom_distiller/content/browser",
+      "//components/dom_distiller/content/browser:test_support",
       "//components/dom_distiller/content/renderer",
       "//components/dom_distiller/core:test_support",
+      "//components/embedder_support",
       "//components/feature_engagement/test:test_support",
       "//components/nacl/common:buildflags",
       "//components/offline_items_collection/core/test_support",
@@ -705,8 +676,7 @@ if (!is_android) {
       "//components/policy:chrome_settings_proto_generated_compile",
       "//components/resources",
       "//components/safe_browsing:buildflags",
-      "//components/safe_browsing/db:test_database_manager",
-      "//components/services/paint_preview_compositor/public/mojom",
+      "//components/safe_browsing/core/db:test_database_manager",
       "//components/services/patch/public/mojom",
       "//components/services/quarantine:test_support",
       "//components/signin/core/browser",
@@ -722,6 +692,7 @@ if (!is_android) {
       "//crypto:platform",
       "//crypto:test_support",
       "//device/bluetooth:mocks",
+      "//device/fido:test_support",
       "//extensions/buildflags",
       "//google_apis:test_support",
       "//media:media_buildflags",
@@ -763,14 +734,15 @@ if (!is_android) {
 
     # Runtime dependencies
     data_deps = [
+      "//chrome:browser_tests_pak",
       "//chrome/browser/resources/media/mei_preload:component",
 
       # TODO(thakis): Why do these need copying in browser_tests?
       # content_browsertests uses the non-copied files instead.
       "//ppapi:copy_test_files",
       "//ppapi:copy_test_files2",
-      "//ppapi:ppapi_tests",
       "//ppapi:power_saver_test_plugin",
+      "//ppapi:ppapi_tests",
       "//testing/buildbot/filters:browser_tests_filters",
       "//testing/buildbot/filters:linux_trusty_rel_browser_tests_filters",
       "//third_party/mesa_headers",
@@ -790,6 +762,7 @@ if (!is_android) {
 
     data = [
       "data/",
+      "//chrome/browser/page_load_metrics/integration_tests/data/",
       "//chrome/common/extensions/docs/examples/apps/calculator/",
       "//components/test/data/arc/",
       "//components/test/data/autofill/",
@@ -806,13 +779,13 @@ if (!is_android) {
       "//testing/test_env.py",
       "//third_party/mocha/mocha.js",
       "//third_party/polymer/v1_0/components-chromium/iron-test-helpers/mock-interactions.js",
-      "//third_party/pywebsocket/src/mod_pywebsocket/",
+      "//third_party/pywebsocket3/src/mod_pywebsocket/",
       "//third_party/simplejson/",
       "//third_party/tlslite/",
       "//ui/webui/resources/",
-      "$root_out_dir/browser_tests.pak",
     ]
     data += js2gtest_js_libraries
+    data += metric_integration_jsdeps
 
     sources = [
       "../../apps/app_restore_service_browsertest.cc",
@@ -856,6 +829,7 @@ if (!is_android) {
       "../browser/banners/test_app_banner_manager_desktop.h",
       "../browser/battery/battery_metrics_browsertest.cc",
       "../browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc",
+      "../browser/bluetooth/web_bluetooth_browsertest.cc",
       "../browser/browser_encoding_browsertest.cc",
       "../browser/browsing_data/browsing_data_cache_storage_helper_browsertest.cc",
       "../browser/browsing_data/browsing_data_database_helper_browsertest.cc",
@@ -883,6 +857,12 @@ if (!is_android) {
       "../browser/chrome_security_exploit_browsertest.cc",
       "../browser/chrome_service_worker_browsertest.cc",
       "../browser/chrome_worker_browsertest.cc",
+      "../browser/chromeos/certificate_provider/test_certificate_provider_extension_login_screen_mixin.cc",
+      "../browser/chromeos/certificate_provider/test_certificate_provider_extension_login_screen_mixin.h",
+      "../browser/chromeos/login/saml/test_client_cert_saml_idp_mixin.cc",
+      "../browser/chromeos/login/saml/test_client_cert_saml_idp_mixin.h",
+      "../browser/chromeos/scoped_test_system_nss_key_slot_mixin.cc",
+      "../browser/chromeos/scoped_test_system_nss_key_slot_mixin.h",
       "../browser/client_hints/client_hints_browsertest.cc",
       "../browser/component_updater/component_patcher_operation_browsertest.cc",
       "../browser/content_index/content_index_browsertest.cc",
@@ -914,6 +894,7 @@ if (!is_android) {
       "../browser/download/download_frame_policy_browsertest.cc",
       "../browser/download/download_started_animation_browsertest.cc",
       "../browser/download/save_page_browsertest.cc",
+      "../browser/enterprise/reporting/report_scheduler_browsertest.cc",
       "../browser/fast_shutdown_browsertest.cc",
       "../browser/favicon/content_favicon_driver_browsertest.cc",
       "../browser/first_run/first_run_browsertest.cc",
@@ -923,7 +904,6 @@ if (!is_android) {
       "../browser/history/history_browsertest.cc",
       "../browser/history/redirect_browsertest.cc",
       "../browser/iframe_browsertest.cc",
-      "../browser/image_decoder_browsertest.cc",
       "../browser/image_fetcher/image_fetcher_impl_browsertest.cc",
       "../browser/importer/edge_importer_browsertest_win.cc",
       "../browser/importer/firefox_importer_browsertest.cc",
@@ -934,8 +914,8 @@ if (!is_android) {
       "../browser/infobars/infobar_observer.h",
       "../browser/infobars/infobars_browsertest.cc",
       "../browser/installable/installable_manager_browsertest.cc",
-      "../browser/invalidation/deprecated_profile_invalidation_provider_factory_browsertest.cc",
       "../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
+      "../browser/large_sticky_ad_browsertest.cc",
       "../browser/lifetime/browser_close_manager_browsertest.cc",
       "../browser/lifetime/browser_shutdown_browsertest.cc",
       "../browser/loader/cors_origin_access_list_browsertest.cc",
@@ -948,11 +928,12 @@ if (!is_android) {
       "../browser/media/defer_background_media_browsertest.cc",
       "../browser/media/encrypted_media_browsertest.cc",
       "../browser/media/encrypted_media_supported_types_browsertest.cc",
+      "../browser/media/feeds/media_feeds_browsertest.cc",
+      "../browser/media/history/media_history_browsertest.cc",
       "../browser/media/media_browsertest.cc",
       "../browser/media/media_browsertest.h",
       "../browser/media/media_engagement_autoplay_browsertest.cc",
       "../browser/media/media_engagement_browsertest.cc",
-      "../browser/media/router/presentation/independent_otr_profile_manager_browsertest.cc",
       "../browser/media/test_license_server.cc",
       "../browser/media/test_license_server.h",
       "../browser/media/test_license_server_config.h",
@@ -991,6 +972,7 @@ if (!is_android) {
       "../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/metrics_service_user_demographics_browsertest.cc",
       "../browser/metrics/oom/out_of_memory_reporter_browsertest.cc",
       "../browser/metrics/process_memory_metrics_emitter_browsertest.cc",
       "../browser/metrics/startup_metrics_browsertest.cc",
@@ -1000,6 +982,8 @@ if (!is_android) {
       "../browser/metrics/variations/force_field_trials_browsertest.cc",
       "../browser/navigation_predictor/navigation_predictor_browsertest.cc",
       "../browser/navigation_predictor/navigation_predictor_preconnect_client_browsertest.cc",
+      "../browser/navigation_predictor/search_engine_preconnector_browsertest.cc",
+      "../browser/net/cert_verify_proc_browsertest.cc",
       "../browser/net/chrome_accept_header_browsertest.cc",
       "../browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc",
       "../browser/net/chrome_network_delegate_browsertest.cc",
@@ -1021,6 +1005,8 @@ if (!is_android) {
       "../browser/net/network_request_metrics_browsertest.cc",
       "../browser/net/nss_context_chromeos_browsertest.cc",
       "../browser/net/profile_network_context_service_browsertest.cc",
+      "../browser/net/profile_network_context_service_test_utils.cc",
+      "../browser/net/profile_network_context_service_test_utils.h",
       "../browser/net/proxy_browsertest.cc",
       "../browser/net/proxy_test_utils.cc",
       "../browser/net/proxy_test_utils.h",
@@ -1044,12 +1030,12 @@ if (!is_android) {
       "../browser/page_load_metrics/observers/data_use_metrics_observer_browsertest.cc",
       "../browser/page_load_metrics/observers/foreground_duration_ukm_observer_browsertest.cc",
       "../browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc",
+      "../browser/page_load_metrics/observers/isolated_prerender_page_load_metrics_observer_browsertest.cc",
       "../browser/page_load_metrics/observers/live_tab_count_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/resource_metrics_observer_browsertest.cc",
       "../browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc",
       "../browser/page_load_metrics/observers/signed_exchange_page_load_metrics_browsertest.cc",
-      "../browser/page_load_metrics/observers/subresource_loading_page_load_metrics_observer_browsertest.cc",
       "../browser/page_load_metrics/observers/third_party_metrics_observer_browsertest.cc",
       "../browser/page_load_metrics/page_load_metrics_browsertest.cc",
       "../browser/password_manager/credential_manager_browsertest.cc",
@@ -1057,7 +1043,10 @@ if (!is_android) {
       "../browser/pdf/pdf_extension_test.cc",
       "../browser/pdf/pdf_extension_test_util.cc",
       "../browser/pdf/pdf_extension_test_util.h",
+      "../browser/performance_manager/background_tab_loading_policy_browsertest.cc",
       "../browser/performance_manager/graph/page_node_impl_browsertest.cc",
+      "../browser/performance_manager/page_load_tracker_decorator_browsertest.cc",
+      "../browser/performance_manager/tab_properties_decorator_browsertest.cc",
       "../browser/permissions/permission_delegation_browsertest.cc",
       "../browser/permissions/permission_manager_browsertest.cc",
       "../browser/permissions/permission_request_manager_browsertest.cc",
@@ -1068,6 +1057,7 @@ if (!is_android) {
       "../browser/plugins/plugin_power_saver_browsertest.cc",
       "../browser/plugins/plugin_response_interceptor_url_loader_throttle_browsertest.cc",
       "../browser/policy/autoplay_policy_browsertest.cc",
+      "../browser/policy/cast_policy_browsertest.cc",
       "../browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc",
       "../browser/policy/cloud/cloud_policy_browsertest.cc",
       "../browser/policy/cloud/cloud_policy_manager_browsertest.cc",
@@ -1075,7 +1065,9 @@ if (!is_android) {
       "../browser/policy/cloud/cloud_policy_test_utils.h",
       "../browser/policy/cloud/component_cloud_policy_browsertest.cc",
       "../browser/policy/cloud/device_management_service_browsertest.cc",
+      "../browser/policy/component_updater_policy_browsertest.cc",
       "../browser/policy/content_settings_policy_browsertest.cc",
+      "../browser/policy/media_stream_policy_browsertest.cc",
       "../browser/policy/policy_browsertest.cc",
       "../browser/policy/policy_initialization_browsertest.cc",
       "../browser/policy/policy_network_browsertest.cc",
@@ -1091,6 +1083,7 @@ if (!is_android) {
       "../browser/prefs/pref_functional_browsertest.cc",
       "../browser/prefs/pref_service_browsertest.cc",
       "../browser/prefs/tracked/pref_hash_browsertest.cc",
+      "../browser/prerender/isolated/isolated_prerender_browsertest.cc",
       "../browser/prerender/prerender_browsertest.cc",
       "../browser/prerender/prerender_nostate_prefetch_browsertest.cc",
       "../browser/prerender/prerender_test_utils.cc",
@@ -1107,6 +1100,7 @@ if (!is_android) {
       "../browser/process_singleton_browsertest.cc",
       "../browser/profile_resetter/profile_resetter_browsertest.cc",
       "../browser/profiles/host_zoom_map_browsertest.cc",
+      "../browser/profiles/independent_otr_profile_manager_browsertest.cc",
       "../browser/profiles/profile_browsertest.cc",
       "../browser/profiles/profile_list_desktop_browsertest.cc",
       "../browser/profiles/profile_manager_browsertest.cc",
@@ -1133,6 +1127,13 @@ if (!is_android) {
       "../browser/resource_coordinator/tab_activity_watcher_browsertest.cc",
       "../browser/resource_coordinator/tab_manager_browsertest.cc",
       "../browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc",
+      "../browser/safe_browsing/cloud_content_scanning/deep_scanning_browsertest_base.cc",
+      "../browser/safe_browsing/cloud_content_scanning/deep_scanning_browsertest_base.h",
+      "../browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_delegate_browsertest.cc",
+      "../browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_views_browsertest.cc",
+      "../browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.cc",
+      "../browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.h",
+      "../browser/safe_browsing/download_protection/deep_scanning_browsertest.cc",
       "../browser/safe_browsing/download_protection/download_protection_service_browsertest.cc",
       "../browser/safe_browsing/test_safe_browsing_database_helper.cc",
       "../browser/safe_browsing/test_safe_browsing_database_helper.h",
@@ -1147,9 +1148,6 @@ if (!is_android) {
       "../browser/sessions/session_restore_observer_browsertest.cc",
       "../browser/sessions/tab_restore_browsertest.cc",
       "../browser/sessions/tab_restore_service_browsertest.cc",
-      "../browser/sessions/tab_restore_service_load_waiter.cc",
-      "../browser/sessions/tab_restore_service_load_waiter.h",
-      "../browser/signin/consistency_cookie_browsertest.cc",
       "../browser/signin/e2e_tests/live_sign_in_test.cc",
       "../browser/signin/e2e_tests/live_test.cc",
       "../browser/signin/e2e_tests/live_test.h",
@@ -1158,6 +1156,7 @@ if (!is_android) {
       "../browser/site_isolation/chrome_site_per_process_test.h",
       "../browser/site_isolation/site_details_browsertest.cc",
       "../browser/ssl/known_interception_disclosure_ui_browsertest.cc",
+      "../browser/ui/blocked_content/popup_opener_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",
@@ -1165,12 +1164,12 @@ if (!is_android) {
       "../browser/ui/manifest_web_app_browsertest.cc",
       "../browser/ui/passwords/google_password_manager_navigation_throttle_browsertest.cc",
       "../browser/ui/tabs/pinned_tab_service_browsertest.cc",
+      "../browser/ui/thumbnails/thumbnail_tab_helper_browsertest.cc",
       "../browser/ui/views/sharing/click_to_call_browsertest.cc",
       "../browser/ui/views/sharing/remote_copy_browsertest.cc",
       "../browser/ui/views/sharing/shared_clipboard_browsertest.cc",
       "../browser/ui/views/sharing/sharing_browsertest.cc",
       "../browser/ui/views/sharing/sharing_browsertest.h",
-      "../browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc",
       "../browser/ui/views/tabs/tab_strip_browsertest.cc",
       "../browser/wake_lock/wake_lock_browsertest.cc",
       "../browser/web_components_browsertest.cc",
@@ -1180,12 +1179,10 @@ if (!is_android) {
       "../browser/speech/extension_api/tts_extension_apitest.cc",
       "../browser/speech/speech_recognition_browsertest.cc",
       "../browser/speech/speech_recognizer_browsertest.cc",
-      "../browser/spellchecker/spellcheck_mac_view_browsertest.mm",
       "../browser/spellchecker/spellcheck_service_browsertest.cc",
       "../browser/ssl/certificate_reporting_test_utils.cc",
       "../browser/ssl/certificate_reporting_test_utils.h",
       "../browser/ssl/chrome_expect_ct_reporter_browsertest.cc",
-      "../browser/ssl/chrome_ssl_host_state_delegate_test.cc",
       "../browser/ssl/connection_help_tab_helper_browsertest.cc",
       "../browser/ssl/crlset_browsertest.cc",
       "../browser/ssl/known_interception_disclosure_infobar_browsertest.cc",
@@ -1193,6 +1190,7 @@ if (!is_android) {
       "../browser/ssl/ssl_browsertest.cc",
       "../browser/ssl/ssl_client_certificate_selector_test.cc",
       "../browser/ssl/ssl_client_certificate_selector_test.h",
+      "../browser/ssl/stateful_ssl_host_state_delegate_test.cc",
       "../browser/ssl/typed_navigation_timing_throttle_browsertest.cc",
       "../browser/storage/durable_storage_browsertest.cc",
       "../browser/subresource_filter/ad_tagging_browsertest.cc",
@@ -1215,12 +1213,12 @@ if (!is_android) {
       "../browser/tab_contents/view_source_browsertest.cc",
       "../browser/task_manager/mock_web_contents_task_manager.cc",
       "../browser/task_manager/mock_web_contents_task_manager.h",
-      "../browser/task_manager/providers/service_worker_task_provider_browsertest.cc",
       "../browser/task_manager/providers/web_contents/background_contents_tag_browsertest.cc",
       "../browser/task_manager/providers/web_contents/devtools_tag_browsertest.cc",
       "../browser/task_manager/providers/web_contents/extension_tag_browsertest.cc",
       "../browser/task_manager/providers/web_contents/subframe_task_browsertest.cc",
       "../browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc",
+      "../browser/task_manager/providers/worker_task_provider_browsertest.cc",
       "../browser/task_manager/task_manager_browsertest.cc",
       "../browser/task_manager/task_manager_browsertest_util.cc",
       "../browser/task_manager/task_manager_browsertest_util.h",
@@ -1233,6 +1231,7 @@ if (!is_android) {
       "../browser/ui/autofill/payments/card_unmask_prompt_view_browsertest.cc",
       "../browser/ui/autofill/payments/card_unmask_prompt_view_tester.h",
       "../browser/ui/autofill/payments/save_card_bubble_controller_impl_browsertest.cc",
+      "../browser/ui/autofill/payments/save_upi_bubble_controller_impl_browsertest.cc",
       "../browser/ui/bookmarks/bookmark_browsertest.cc",
       "../browser/ui/browser_browsertest.cc",
       "../browser/ui/browser_command_controller_browsertest.cc",
@@ -1240,6 +1239,7 @@ if (!is_android) {
       "../browser/ui/browser_navigator_browsertest.cc",
       "../browser/ui/browser_navigator_browsertest.h",
       "../browser/ui/browser_navigator_browsertest_chromeos.cc",
+      "../browser/ui/browser_tab_strip_model_delegate_browsertest.cc",
       "../browser/ui/browser_tabrestore_browsertest.cc",
       "../browser/ui/collected_cookies_browsertest.cc",
       "../browser/ui/content_settings/content_setting_bubble_model_browsertest.cc",
@@ -1249,7 +1249,6 @@ if (!is_android) {
       "../browser/ui/extensions/application_launch_browsertest.cc",
       "../browser/ui/extensions/blocked_action_bubble_browsertest.cc",
       "../browser/ui/extensions/extension_enable_flow_browsertest.cc",
-      "../browser/ui/extensions/extension_installed_bubble_browsertest.cc",
       "../browser/ui/extensions/extension_message_bubble_browsertest.cc",
       "../browser/ui/extensions/extension_message_bubble_browsertest.h",
       "../browser/ui/extensions/hosted_app_browsertest.cc",
@@ -1257,6 +1256,7 @@ if (!is_android) {
       "../browser/ui/find_bar/find_bar_host_browsertest.cc",
       "../browser/ui/find_bar/find_bar_platform_helper_mac_browsertest.mm",
       "../browser/ui/hats/hats_service_browsertest.cc",
+      "../browser/ui/hats/hats_survey_status_checker_browsertest.cc",
       "../browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc",
       "../browser/ui/login/login_handler_browsertest.cc",
       "../browser/ui/native_window_tracker_browsertest.cc",
@@ -1318,23 +1318,29 @@ if (!is_android) {
       "../browser/ui/views/device_chooser_browsertest.cc",
       "../browser/ui/views/hats/hats_browsertest.cc",
       "../browser/ui/views/intent_picker_bubble_view_browsertest.cc",
+      "../browser/ui/views/reader_mode/reader_mode_icon_view_browsertest.cc",
       "../browser/ui/views/try_chrome_dialog_win/try_chrome_dialog_browsertest.cc",
       "../browser/ui/views/web_apps/web_app_frame_toolbar_browsertest.cc",
       "../browser/ui/views/web_apps/web_app_minimal_ui_test.cc",
+      "../browser/ui/views/web_apps/web_app_tab_strip_browsertest.cc",
       "../browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc",
-      "../browser/ui/views/webauthn/authenticator_qr_code_test.cc",
       "../browser/ui/views/webview_accessibility_browsertest.cc",
       "../browser/ui/web_applications/app_browser_controller_browsertest.cc",
+      "../browser/ui/web_applications/create_shortcut_browsertest.cc",
+      "../browser/ui/web_applications/pwa_mixed_content_browsertest.cc",
       "../browser/ui/web_applications/web_app_badging_browsertest.cc",
       "../browser/ui/web_applications/web_app_browsertest.cc",
       "../browser/ui/web_applications/web_app_engagement_browsertest.cc",
       "../browser/ui/web_applications/web_app_file_handling_browsertest.cc",
+      "../browser/ui/web_applications/web_app_navigate_browsertest.cc",
       "../browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc",
+      "../browser/ui/web_applications/web_app_uninstall_browsertest.cc",
       "../browser/ui/webauthn/authenticator_dialog_browsertest.cc",
       "../browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui_browsertest.cc",
       "../browser/ui/webui/bookmarks/bookmarks_browsertest.cc",
       "../browser/ui/webui/bookmarks/bookmarks_browsertest.h",
       "../browser/ui/webui/chrome_url_data_manager_browsertest.cc",
+      "../browser/ui/webui/chrome_webui_navigation_browsertest.cc",
       "../browser/ui/webui/chromeos/account_migration_welcome_ui_test.cc",
       "../browser/ui/webui/chromeos/account_migration_welcome_ui_test.h",
       "../browser/ui/webui/chromeos/bluetooth_pairing_dialog_browsertest-inl.h",
@@ -1358,6 +1364,8 @@ if (!is_android) {
       "../browser/ui/webui/policy_ui_browsertest.cc",
       "../browser/ui/webui/prefs_internals_browsertest.cc",
       "../browser/ui/webui/profile_helper_browsertest.cc",
+      "../browser/ui/webui/settings/settings_clear_browsing_data_handler_browsertest.cc",
+      "../browser/ui/webui/settings/settings_secure_dns_handler_browsertest.cc",
       "../browser/ui/webui/settings/settings_ui_browsertest.cc",
       "../browser/ui/webui/signin/user_manager_ui_browsertest.cc",
       "../browser/ui/webui/webui_load_timer_browsertest.cc",
@@ -1365,7 +1373,7 @@ if (!is_android) {
       "../browser/ui/zoom/zoom_controller_browsertest.cc",
       "../browser/unload_browsertest.cc",
       "../browser/usb/usb_browsertest.cc",
-      "../browser/web_bluetooth_browsertest.cc",
+      "../browser/webauthn/authenticator_extension_browsertest.cc",
       "../common/mac/app_mode_chrome_locator_browsertest.mm",
       "../common/mac/mock_launchd.h",
       "../common/mac/mock_launchd.mm",
@@ -1387,7 +1395,7 @@ if (!is_android) {
       "../renderer/chrome_render_frame_observer_browsertest.cc",
       "../renderer/content_settings_agent_impl_browsertest.cc",
       "../renderer/media/cast_session_browsertest.cc",
-      "../renderer/translate/translate_helper_browsertest.cc",
+      "../renderer/translate/translate_agent_browsertest.cc",
       "../renderer/translate/translate_script_browsertest.cc",
       "base/chrome_render_view_test.cc",
       "base/chrome_render_view_test.h",
@@ -1402,6 +1410,7 @@ if (!is_android) {
       "data/webui/chrome_send_browsertest.h",
       "data/webui/history_ui_browsertest.cc",
       "data/webui/history_ui_browsertest.h",
+      "data/webui/mojo/mojo_web_ui_controller_browsertest.cc",
       "data/webui/ntp4_browsertest.cc",
       "data/webui/ntp4_browsertest.h",
       "data/webui/webui_resource_browsertest.cc",
@@ -1441,8 +1450,8 @@ if (!is_android) {
       ]
 
       data_deps += [
-        "//chrome",
         "//ash/keyboard/ui:resources",
+        "//chrome",
         "//testing/buildbot/filters:chromeos_filters",
         "//ui/file_manager:unit_test_data",
       ]
@@ -1457,11 +1466,7 @@ if (!is_android) {
         "//chrome/browser/chromeos:arc_test_support",
         "//chrome/browser/chromeos:test_support",
         "//chrome/browser/media/router:test_support",
-        "//chrome/browser/resources/chromeos/accessibility/autoclick:browser_tests",
-        "//chrome/browser/resources/chromeos/accessibility/chromevox:browser_tests",
-        "//chrome/browser/resources/chromeos/accessibility/select_to_speak:browser_tests",
-        "//chrome/browser/resources/chromeos/accessibility/switch_access:browser_tests",
-        "//chrome/browser/resources/chromeos/login:browser_tests",
+        "//chrome/browser/resources/chromeos/accessibility:browser_tests",
         "//chrome/services/file_util/public/cpp:browser_tests",
         "//chromeos:test_support",
         "//chromeos/components/drivefs:test_support",
@@ -1488,6 +1493,8 @@ if (!is_android) {
       sources += [
         "../browser/policy/accessibility_policy_browsertest.cc",
         "../browser/policy/arc_policy_browsertest.cc",
+        "../browser/policy/assistant_policy_browsertest.cc",
+        "../browser/renderer_context_menu/quick_answers_menu_observer_browsertest.cc",
       ]
     }
 
@@ -1499,9 +1506,16 @@ if (!is_android) {
       ]
       if (is_chromeos) {
         deps += [
+          "//chrome/browser/resources/gaia_auth_host:browser_tests",
           "//chromeos/components/help_app_ui:browser_tests_js",
           "//chromeos/components/media_app_ui:browser_tests_js",
         ]
+
+        if (!is_official_build) {
+          deps += [
+            "//chromeos/components/sample_system_web_app_ui:browser_tests_js",
+          ]
+        }
       }
     }
 
@@ -1510,12 +1524,7 @@ if (!is_android) {
     }
 
     if (!is_mac) {
-      data += [
-        "$root_out_dir/locales/",
-        "$root_out_dir/chrome_100_percent.pak",
-        "$root_out_dir/chrome_200_percent.pak",
-        "$root_out_dir/resources.pak",
-      ]
+      data_deps += [ "//chrome:packed_resources" ]
     }
 
     if (enable_captive_portal_detection) {
@@ -1559,8 +1568,8 @@ if (!is_android) {
 
       data_deps += [
         "//chrome/test/data/nacl",
-        "//ppapi/native_client:irt",
         "//ppapi:ppapi_nacl_tests_all",
+        "//ppapi/native_client:irt",
         "//ppapi/tests/extensions",
       ]
       if (is_chromeos) {
@@ -1570,9 +1579,9 @@ if (!is_android) {
         ]
         deps += [ "//chrome/browser/chromeos" ]
         data_deps += [
-          "//third_party/liblouis:liblouis_test_data",
           "//components/nacl/loader:nacl_helper",
           "//ppapi/native_client:irt",
+          "//third_party/liblouis:liblouis_test_data",
         ]
         if (enable_nacl_nonsfi) {
           data_deps += [ "//components/nacl/loader:helper_nonsfi" ]
@@ -1592,9 +1601,6 @@ if (!is_android) {
         # TODO(halyavin) NaCl on Windows can't open debug stub socket in
         # browser process as needed by this test. See http://crbug.com/157312.
         sources -= [ "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc" ]
-        configs -= [ "//build/config/win:default_incremental_linking" ]
-        configs +=
-            [ "//build/config/win:default_large_module_incremental_linking" ]
       }
       if (is_linux) {
         data_deps += [ "//components/nacl/loader:nacl_helper" ]
@@ -1617,10 +1623,10 @@ if (!is_android) {
         "../browser/apps/platform_apps/app_browsertest_util.h",
         "../browser/apps/platform_apps/audio_focus_web_contents_observer_browsertest.cc",
         "../browser/extensions/active_tab_apitest.cc",
-        "../browser/extensions/activity_log/activity_log_browsertest.cc",
         "../browser/extensions/alert_apitest.cc",
         "../browser/extensions/all_urls_apitest.cc",
         "../browser/extensions/api/activity_log_private/activity_log_private_apitest.cc",
+        "../browser/extensions/api/alarms/alarms_apitest.cc",
         "../browser/extensions/api/autofill_private/autofill_private_apitest.cc",
         "../browser/extensions/api/automation/automation_apitest.cc",
         "../browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc",
@@ -1665,6 +1671,7 @@ if (!is_android) {
         "../browser/extensions/api/history/history_apitest.cc",
         "../browser/extensions/api/i18n/i18n_apitest.cc",
         "../browser/extensions/api/identity/identity_apitest.cc",
+        "../browser/extensions/api/identity/identity_private_apitest.cc",
         "../browser/extensions/api/idle/idle_get_auto_lock_delay_apitest.cc",
         "../browser/extensions/api/idltest/idltest_apitest.cc",
         "../browser/extensions/api/image_writer_private/image_writer_private_apitest.cc",
@@ -1725,7 +1732,6 @@ if (!is_android) {
         "../browser/extensions/chrome_app_api_browsertest.cc",
         "../browser/extensions/chrome_test_extension_loader_browsertest.cc",
         "../browser/extensions/chrome_theme_url_browsertest.cc",
-        "../browser/extensions/chrome_ui_overrides_browsertest.cc",
         "../browser/extensions/content_capabilities_browsertest.cc",
         "../browser/extensions/content_script_apitest.cc",
         "../browser/extensions/content_security_policy_apitest.cc",
@@ -1733,7 +1739,7 @@ if (!is_android) {
         "../browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc",
         "../browser/extensions/content_verifier_test_utils.cc",
         "../browser/extensions/content_verifier_test_utils.h",
-        "../browser/extensions/cross_origin_read_blocking_browsertest.cc",
+        "../browser/extensions/corb_and_cors_extension_browsertest.cc",
         "../browser/extensions/cross_origin_xhr_apitest.cc",
         "../browser/extensions/crx_installer_browsertest.cc",
         "../browser/extensions/docs/examples/apps/calculator_browsertest.cc",
@@ -1745,6 +1751,7 @@ if (!is_android) {
         "../browser/extensions/extension_apitest.h",
         "../browser/extensions/extension_bindings_apitest.cc",
         "../browser/extensions/extension_bookmarklet_browsertest.cc",
+        "../browser/extensions/extension_browsertest_browsertest.cc",
         "../browser/extensions/extension_context_menu_browsertest.cc",
         "../browser/extensions/extension_csp_bypass_browsertest.cc",
         "../browser/extensions/extension_disabled_ui_browsertest.cc",
@@ -1775,6 +1782,7 @@ if (!is_android) {
         "../browser/extensions/extension_tab_util_browsertest.cc",
         "../browser/extensions/extension_tabs_apitest.cc",
         "../browser/extensions/extension_unload_browsertest.cc",
+        "../browser/extensions/extension_untrusted_webui_apitest.cc",
         "../browser/extensions/extension_url_loader_throttle_browsertest.cc",
         "../browser/extensions/extension_url_rewrite_browsertest.cc",
         "../browser/extensions/extension_view_host_factory_browsertest.cc",
@@ -1786,6 +1794,7 @@ if (!is_android) {
         "../browser/extensions/external_install_error_browsertest.cc",
         "../browser/extensions/fetch_apitest.cc",
         "../browser/extensions/file_iframe_apitest.cc",
+        "../browser/extensions/google_docs_offline_ukm_browsertest.cc",
         "../browser/extensions/gpu_browsertest.cc",
         "../browser/extensions/isolated_app_browsertest.cc",
         "../browser/extensions/lazy_background_page_apitest.cc",
@@ -1835,11 +1844,15 @@ if (!is_android) {
         "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc",
         "../browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h",
         "../browser/ui/views/extensions/extension_dialog_browsertest.cc",
-        "../browser/ui/views/extensions/pwa_confirmation_bubble_view_browsertest.cc",
-        "../browser/ui/web_applications/test/bookmark_app_navigation_browsertest.cc",
-        "../browser/ui/web_applications/test/bookmark_app_navigation_browsertest.h",
+        "../browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc",
+        "../browser/ui/web_applications/test/web_app_navigation_browsertest.cc",
+        "../browser/ui/web_applications/test/web_app_navigation_browsertest.h",
       ]
 
+      if (enable_autofill_assistant_api) {
+        sources += [ "../browser/extensions/api/autofill_assistant_private/autofill_assistant_private_apitest.cc" ]
+      }
+
       if (enable_background_mode) {
         sources += [ "../browser/extensions/background_app_browsertest.cc" ]
       }
@@ -1849,6 +1862,7 @@ if (!is_android) {
           "../browser/accessibility/accessibility_extension_api_browsertest.cc",
           "../browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_apitest.cc",
           "../browser/extensions/api/system_display/system_display_chromeos_apitest.cc",
+          "../browser/extensions/api/terminal/terminal_private_browsertest.cc",
           "../browser/extensions/clipboard_extension_apitest_chromeos.cc",
         ]
       }
@@ -1868,6 +1882,12 @@ if (!is_android) {
         "//extensions/common/api",
       ]
 
+      if (enable_autofill_assistant_api) {
+        deps += [
+          "//components/autofill_assistant/browser:extensions_test_support",
+        ]
+      }
+
       data += [
         "//chrome/test/data/extensions/",
         "//extensions/test/data/",
@@ -1886,21 +1906,6 @@ if (!is_android) {
     }
     if (toolkit_views) {
       sources += [
-        "../browser/payments/empty_parameters_browsertest.cc",
-        "../browser/payments/has_enrolled_instrument_browsertest.cc",
-        "../browser/payments/has_enrolled_instrument_query_quota_browsertest.cc",
-        "../browser/payments/journey_logger_browsertest.cc",
-        "../browser/payments/manifest_verifier_browsertest.cc",
-        "../browser/payments/payment_handler_change_shipping_address_option_browsertest.cc",
-        "../browser/payments/payment_handler_enable_delegations_browsertest.cc",
-        "../browser/payments/payment_handler_exploit_browsertest.cc",
-        "../browser/payments/payment_handler_just_in_time_installation_browsertest.cc",
-        "../browser/payments/payment_manifest_parser_browsertest.cc",
-        "../browser/payments/payment_request_can_make_payment_browsertest.cc",
-        "../browser/payments/personal_data_manager_test_util.cc",
-        "../browser/payments/personal_data_manager_test_util.h",
-        "../browser/payments/service_worker_payment_app_finder_browsertest.cc",
-        "../browser/payments/site_per_process_payments_browsertest.cc",
         "../browser/ui/global_error/global_error_browsertest.cc",
         "../browser/ui/global_error/global_error_service_browsertest.cc",
         "../browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc",
@@ -1909,18 +1914,22 @@ if (!is_android) {
         "../browser/ui/views/autofill/payments/card_unmask_prompt_view_tester_views.h",
         "../browser/ui/views/autofill/payments/local_card_migration_browsertest.cc",
         "../browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc",
+        "../browser/ui/views/autofill/payments/virtual_card_selection_dialog_browsertest.cc",
         "../browser/ui/views/autofill/payments/webauthn_dialog_browsertest.cc",
         "../browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc",
         "../browser/ui/views/bookmarks/bookmark_editor_view_browsertest.cc",
         "../browser/ui/views/certificate_selector_dialog_browsertest.cc",
         "../browser/ui/views/collected_cookies_views_browsertest.cc",
         "../browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc",
-        "../browser/ui/views/extensions/bookmark_override_browsertest.cc",
+        "../browser/ui/views/extensions/extension_install_blocked_dialog_view_browsertest.cc",
         "../browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc",
+        "../browser/ui/views/extensions/extension_installed_bubble_view_browsertest.cc",
         "../browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc",
         "../browser/ui/views/extensions/extension_message_bubble_view_browsertest_views.cc",
         "../browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc",
         "../browser/ui/views/extensions/extensions_menu_view_browsertest.cc",
+        "../browser/ui/views/extensions/extensions_toolbar_browsertest.cc",
+        "../browser/ui/views/extensions/extensions_toolbar_browsertest.h",
         "../browser/ui/views/extensions/media_galleries_dialog_views_browsertest.cc",
         "../browser/ui/views/external_protocol_dialog_browsertest.cc",
         "../browser/ui/views/feature_promos/feature_promo_dialog_browsertest.cc",
@@ -1973,7 +1982,6 @@ if (!is_android) {
         "../browser/ui/views/payments/payment_request_can_make_payment_metrics_browsertest.cc",
         "../browser/ui/views/payments/payment_request_completion_status_metrics_browsertest.cc",
         "../browser/ui/views/payments/payment_request_data_url_browsertest.cc",
-        "../browser/ui/views/payments/payment_request_debit_browsertest.cc",
         "../browser/ui/views/payments/payment_request_journey_logger_browsertest.cc",
         "../browser/ui/views/payments/payment_request_missing_fields_metrics_browsertest.cc",
         "../browser/ui/views/payments/payment_request_no_update_with_browsertest.cc",
@@ -2000,19 +2008,20 @@ if (!is_android) {
         "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_browsertest.cc",
         "../browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc",
         "../browser/ui/views/tabs/tab_group_editor_bubble_view_browsertest.cc",
+        "../browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc",
         "../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",
         "../browser/ui/views/translate/translate_bubble_view_browsertest.cc",
         "../browser/ui/views/translate/translate_language_browsertest.cc",
-        "../browser/ui/views/web_dialog_view_browsertest.cc",
+        "../browser/ui/views/web_apps/web_app_uninstall_dialog_browsertest.cc",
       ]
       if (!is_chromeos) {
         sources += [
           "../browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc",
           "../browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view_browsertest.cc",
           "../browser/ui/views/relaunch_notification/relaunch_required_dialog_view_browsertest.cc",
-          "../browser/ui/views/toolbar/toolbar_account_icon_container_view_browsertest.cc",
+          "../browser/ui/views/toolbar/toolbar_account_icon_container_browsertest.cc",
         ]
       }
       deps += [
@@ -2038,18 +2047,6 @@ if (!is_android) {
           [ "//chrome/browser/internal/resources/signin/test_accounts.json" ]
     }
 
-    # For pixel tests. Because this links to a CIPD
-    # dependency, which is a symlink on Unix platforms, refer to the
-    # actual executable rather than the whole directory; copying the
-    # whole directory doesn't work, at least with "mb.py zip".
-    if (is_win) {
-      data += [ "//tools/skia_goldctl/win/goldctl.exe" ]
-    } else if (is_mac) {
-      data += [ "//tools/skia_goldctl/mac/goldctl" ]
-    } else {
-      data += [ "//tools/skia_goldctl/linux/goldctl" ]
-    }
-
     if (is_chromeos) {
       sources += [
         "../browser/apps/platform_apps/app_window_interactive_uitest_base.cc",
@@ -2079,6 +2076,7 @@ if (!is_android) {
         "../browser/chromeos/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc",
         "../browser/chromeos/arc/enterprise/cert_store/arc_cert_store_bridge_browsertest.cc",
         "../browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc",
+        "../browser/chromeos/arc/intent_helper/custom_tab_session_impl_browsertest.cc",
         "../browser/chromeos/arc/session/arc_session_manager_browsertest.cc",
         "../browser/chromeos/arc/user_session/arc_user_session_service_browsertest.cc",
         "../browser/chromeos/attestation/attestation_policy_browsertest.cc",
@@ -2090,6 +2088,12 @@ if (!is_android) {
         "../browser/chromeos/child_accounts/parent_access_code/parent_access_test_utils.h",
         "../browser/chromeos/child_accounts/screen_time_controller_browsertest.cc",
         "../browser/chromeos/child_accounts/time_limit_test_utils.cc",
+        "../browser/chromeos/child_accounts/time_limits/app_time_browsertest.cc",
+        "../browser/chromeos/child_accounts/time_limits/app_time_limits_policy_builder.cc",
+        "../browser/chromeos/child_accounts/time_limits/app_time_limits_policy_builder.h",
+        "../browser/chromeos/child_accounts/time_limits/app_time_limits_whitelist_policy_test_utils.cc",
+        "../browser/chromeos/child_accounts/time_limits/app_time_limits_whitelist_policy_test_utils.h",
+        "../browser/chromeos/child_accounts/time_limits/web_time_calculation_browsertest.cc",
         "../browser/chromeos/child_accounts/time_limits/web_time_limit_enforcer_browsertest.cc",
         "../browser/chromeos/chrome_content_browser_client_chromeos_part_browsertest.cc",
         "../browser/chromeos/customization/customization_document_browsertest.cc",
@@ -2114,6 +2118,7 @@ if (!is_android) {
         "../browser/chromeos/extensions/login_screen/login/login_apitest.cc",
         "../browser/chromeos/extensions/login_screen/login_screen_apitest_base.cc",
         "../browser/chromeos/extensions/login_screen/login_screen_apitest_base.h",
+        "../browser/chromeos/extensions/login_screen/login_screen_i18n_apitest.cc",
         "../browser/chromeos/extensions/login_screen/login_screen_ui/login_screen_ui_apitest.cc",
         "../browser/chromeos/extensions/login_screen/login_state/login_state_apitest.cc",
         "../browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher_apitest.cc",
@@ -2158,6 +2163,7 @@ if (!is_android) {
         "../browser/chromeos/login/active_directory_login_browsertest.cc",
         "../browser/chromeos/login/arc_terms_of_service_browsertest.cc",
         "../browser/chromeos/login/auto_launched_kiosk_browsertest.cc",
+        "../browser/chromeos/login/challenge_response_auth_keys_loader_browsertest.cc",
         "../browser/chromeos/login/configuration_based_oobe_browsertest.cc",
         "../browser/chromeos/login/crash_restore_browsertest.cc",
         "../browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc",
@@ -2202,10 +2208,13 @@ if (!is_android) {
         "../browser/chromeos/login/reset_browsertest.cc",
         "../browser/chromeos/login/saml/password_change_success_detection_browsertest.cc",
         "../browser/chromeos/login/saml/saml_browsertest.cc",
+        "../browser/chromeos/login/saml/security_token_saml_browsertest.cc",
         "../browser/chromeos/login/screens/app_downloading_screen_browsertest.cc",
         "../browser/chromeos/login/screens/assistant_optin_flow_screen_browsertest.cc",
         "../browser/chromeos/login/screens/fingerprint_setup_browsertest.cc",
+        "../browser/chromeos/login/screens/gesture_navigation_screen_browsertest.cc",
         "../browser/chromeos/login/screens/hid_detection_screen_browsertest.cc",
+        "../browser/chromeos/login/screens/marketing_opt_in_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",
@@ -2221,6 +2230,7 @@ if (!is_android) {
         "../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/packaged_license_screen_browsertest.cc",
         "../browser/chromeos/login/screens/recommend_apps/scoped_test_recommend_apps_fetcher_factory.cc",
         "../browser/chromeos/login/screens/recommend_apps/scoped_test_recommend_apps_fetcher_factory.h",
         "../browser/chromeos/login/screens/recommend_apps_screen_browsertest.cc",
@@ -2301,6 +2311,7 @@ if (!is_android) {
         "../browser/chromeos/policy/device_cloud_external_data_policy_observer_browsertest.cc",
         "../browser/chromeos/policy/device_cloud_policy_browsertest.cc",
         "../browser/chromeos/policy/device_local_account_browsertest.cc",
+        "../browser/chromeos/policy/device_login_screen_policy_browsertest.cc",
         "../browser/chromeos/policy/device_policy_cloud_external_data_manager_browsertest.cc",
         "../browser/chromeos/policy/device_policy_cros_browser_test.cc",
         "../browser/chromeos/policy/device_policy_cros_browser_test.h",
@@ -2338,6 +2349,8 @@ if (!is_android) {
         "../browser/chromeos/printing/test_cups_print_job_manager.h",
         "../browser/chromeos/printing/test_cups_printers_manager.cc",
         "../browser/chromeos/printing/test_cups_printers_manager.h",
+        "../browser/chromeos/printing/test_printer_configurer.cc",
+        "../browser/chromeos/printing/test_printer_configurer.h",
         "../browser/chromeos/profiles/profile_helper_browsertest.cc",
         "../browser/chromeos/shutdown_policy_browsertest.cc",
         "../browser/chromeos/startup_settings_cache_browsertest.cc",
@@ -2345,8 +2358,10 @@ if (!is_android) {
         "../browser/chromeos/system/tray_accessibility_browsertest.cc",
         "../browser/chromeos/web_applications/help_app_integration_browsertest.cc",
         "../browser/chromeos/web_applications/media_app_integration_browsertest.cc",
+        "../browser/chromeos/web_applications/print_management_app_integration_browsertest.cc",
         "../browser/chromeos/web_applications/system_web_app_integration_test.cc",
         "../browser/chromeos/web_applications/system_web_app_integration_test.h",
+        "../browser/chromeos/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service_browsertest.cc",
         "../browser/download/notification/download_notification_browsertest.cc",
         "../browser/drive/drive_notification_manager_factory_browsertest.cc",
         "../browser/extensions/api/certificate_provider/certificate_provider_apitest.cc",
@@ -2367,7 +2382,8 @@ if (!is_android) {
         "../browser/ui/ash/chrome_screenshot_grabber_browsertest.cc",
         "../browser/ui/ash/keyboard/keyboard_controller_browsertest.cc",
         "../browser/ui/ash/keyboard/keyboard_end_to_end_browsertest.cc",
-        "../browser/ui/ash/launcher/app_service_app_window_browsertest.cc",
+        "../browser/ui/ash/launcher/app_service/app_service_app_window_browsertest.cc",
+        "../browser/ui/ash/launcher/app_service/app_service_shelf_context_menu_browsertest.cc",
         "../browser/ui/ash/launcher/arc_app_launcher_browsertest.cc",
         "../browser/ui/ash/launcher/browser_shortcut_launcher_item_controller_browsertest.cc",
         "../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc",
@@ -2384,13 +2400,16 @@ if (!is_android) {
         "../browser/ui/ash/tablet_mode_page_behavior_browsertest.cc",
         "../browser/ui/ash/volume_controller_browsertest.cc",
         "../browser/ui/browser_finder_chromeos_browsertest.cc",
+        "../browser/ui/views/apps/app_dialog/app_dialog_view_browsertest.cc",
+        "../browser/ui/views/apps/app_dialog/app_uninstall_dialog_view_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_ansible_software_config_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_force_close_view_browsertest.cc",
-        "../browser/ui/views/crostini/crostini_installer_view_browsertest.cc",
+        "../browser/ui/views/crostini/crostini_package_install_failure_view_browsertest.cc",
+        "../browser/ui/views/crostini/crostini_recovery_view_browsertest.cc",
         "../browser/ui/views/crostini/crostini_uninstaller_view_browsertest.cc",
         "../browser/ui/views/crostini/crostini_update_component_view_browsertest.cc",
         "../browser/ui/views/crostini/crostini_update_filesystem_view_browsertest.cc",
@@ -2400,7 +2419,8 @@ if (!is_android) {
         "../browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc",
         "../browser/ui/views/frame/system_menu_model_builder_browsertest_chromeos.cc",
         "../browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc",
-        "../browser/ui/views/plugin_vm/plugin_vm_launcher_view_browsertest.cc",
+        "../browser/ui/views/parent_permission_dialog_browsertest.cc",
+        "../browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc",
         "../browser/ui/views/web_apps/web_app_ash_interactive_ui_test.cc",
         "../browser/ui/web_applications/web_app_guest_session_browsertest_chromeos.cc",
         "../browser/ui/webui/chromeos/add_supervision/add_supervision_metrics_recorder_browsertest.cc",
@@ -2416,6 +2436,7 @@ if (!is_android) {
         "../browser/ui/webui/chromeos/login/js_calls_container_test_api.cc",
         "../browser/ui/webui/chromeos/login/js_calls_container_test_api.h",
         "../browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc",
+        "../browser/ui/webui/chromeos/smb_shares/smb_credentials_dialog_browsertest.cc",
         "../browser/ui/webui/chromeos/system_web_dialog_browsertest.cc",
         "../browser/ui/webui/settings/chromeos/account_manager_handler_browsertest.cc",
         "../browser/ui/webui/settings/chromeos/device_power_handler_browsertest.cc",
@@ -2426,9 +2447,32 @@ if (!is_android) {
         "base/interactive_test_utils_aura.h",
         "base/interactive_test_utils_views.cc",
       ]
+      if (!is_official_build) {
+        sources += [ "../browser/chromeos/web_applications/sample_system_web_app_integration_browsertest.cc" ]
+      }
       if (use_cups) {
-        sources +=
-            [ "../browser/chromeos/extensions/printing/printing_apitest.cc" ]
+        sources += [
+          "../browser/chromeos/extensions/printing/fake_print_job_controller.cc",
+          "../browser/chromeos/extensions/printing/fake_print_job_controller.h",
+          "../browser/chromeos/extensions/printing/printing_apitest.cc",
+        ]
+        deps += [ "//printing:test_support" ]
+      }
+      if (enable_assistant_integration_tests) {
+        sources += [
+          "../browser/ui/ash/assistant/assistant_browsertest.cc",
+          "../browser/ui/ash/assistant/assistant_test_mixin.cc",
+          "../browser/ui/ash/assistant/assistant_test_mixin.h",
+          "../browser/ui/ash/assistant/test/fake_s3_server.cc",
+          "../browser/ui/ash/assistant/test/fake_s3_server.h",
+        ]
+
+        deps += [ "//chromeos/assistant/internal:internal" ]
+
+        data += [ "//chromeos/assistant/internal/test_data/" ]
+
+        data_deps +=
+            [ "//chromeos/assistant/internal:build_fake_s3_server_main" ]
       }
       sources -= [
         "../../apps/load_and_launch_browsertest.cc",
@@ -2450,17 +2494,11 @@ if (!is_android) {
         "../browser/ui/webui/signin/user_manager_ui_browsertest.cc",
 
         # chromeos does not support machine level user cloud policies
+        "../browser/enterprise/reporting/report_scheduler_browsertest.cc",
         "../browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc",
-
-        # TODO(1026473): Re-enable these when linux-chromeos-rel breakage is
-        # addressed.
-        "../browser/chromeos/accessibility/spoken_feedback_app_list_browsertest.cc",
-        "../browser/chromeos/accessibility/spoken_feedback_browsertest.cc",
-        "../browser/chromeos/accessibility/spoken_feedback_browsertest.h",
       ]
     } else {  # !is_chromeos
       sources -= [
-        "../browser/invalidation/deprecated_profile_invalidation_provider_factory_browsertest.cc",
         "../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
         "../browser/net/nss_context_chromeos_browsertest.cc",
         "data/webui/certificate_viewer_ui_test-inl.h",
@@ -2487,7 +2525,7 @@ if (!is_android) {
       }
     }
     if (enable_kaleidoscope) {
-      deps += [ "../browser/media/kaleidoscope/internal:browser_tests" ]
+      deps += [ "../browser/media/kaleidoscope/internal:browser_tests_js" ]
     }
     if (enable_legacy_desktop_in_product_help) {
       sources += [
@@ -2501,7 +2539,6 @@ if (!is_android) {
         "../browser/safe_browsing/certificate_reporting_service_browsertest.cc",
         "../browser/safe_browsing/chrome_password_protection_service_browsertest.cc",
         "../browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc",
-        "../browser/safe_browsing/client_side_detection_host_browsertest.cc",
         "../browser/safe_browsing/safe_browsing_blocking_page_test.cc",
         "../browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc",
         "../browser/safe_browsing/safe_browsing_service_browsertest.cc",
@@ -2559,9 +2596,10 @@ if (!is_android) {
 
         # ProcessSingletonMac doesn"t do anything.
         "../browser/process_singleton_browsertest.cc",
-      ]
 
-      data += [ "//testing/buildbot/filters/mac_window_server_killers.browser_tests.filter" ]
+        # TaskManagerView is not used or built on Mac.
+        "../browser/ui/views/task_manager_view_browsertest.cc",
+      ]
 
       if (safe_browsing_mode == 1) {
         sources -= [
@@ -2643,12 +2681,19 @@ if (!is_android) {
       sources += [
         "../browser/supervised_user/logged_in_user_mixin.cc",
         "../browser/supervised_user/logged_in_user_mixin.h",
+        "../browser/supervised_user/navigation_finished_waiter.cc",
+        "../browser/supervised_user/navigation_finished_waiter.h",
         "../browser/supervised_user/permission_request_creator_mock.cc",
         "../browser/supervised_user/permission_request_creator_mock.h",
         "../browser/supervised_user/supervised_user_navigation_throttle_browsertest.cc",
         "../browser/supervised_user/supervised_user_service_browsertest.cc",
         "../browser/supervised_user/supervised_user_url_filter_browsertest.cc",
       ]
+      if (enable_extensions) {
+        sources += [
+          "../browser/supervised_user/supervised_user_extension_browsertest.cc",
+        ]
+      }
     }
     if (is_linux && is_asan && is_lsan) {
       # TODO(crbug.com/793426): Fix the flakiness on Linux Asan Lsan bot.
@@ -2689,8 +2734,16 @@ if (!is_android) {
       }
     }
     if (enable_paint_preview) {
-      sources +=
-          [ "../browser/paint_preview/paint_preview_compositor_browsertest.cc" ]
+      sources += [
+        "../browser/paint_preview/paint_preview_browsertest.cc",
+        "../browser/paint_preview/paint_preview_compositor_browsertest.cc",
+      ]
+      deps += [
+        "//components/paint_preview/browser",
+        "//components/paint_preview/browser:test_support",
+        "//components/paint_preview/common",
+        "//components/services/paint_preview_compositor/public/mojom",
+      ]
     }
     if (enable_service_discovery && !is_mac) {
       sources += [
@@ -2736,13 +2789,18 @@ if (!is_android) {
     }
 
     if (enable_webui_tab_strip) {
-      sources += [ "../browser/ui/webui/tab_strip/tab_strip_ui_browsertest.cc" ]
+      sources += [
+        "../browser/ui/webui/tab_strip/chrome_content_browser_client_tab_strip_part_browsertest.cc",
+        "../browser/ui/webui/tab_strip/tab_strip_ui_browsertest.cc",
+      ]
     }
 
     if (enable_spellcheck) {
       sources +=
           [ "../browser/site_isolation/spellcheck_per_process_browsertest.cc" ]
     }
+
+    sources += metric_integration_sources
   }
 }
 
@@ -2751,9 +2809,7 @@ if (is_linux || is_mac || is_win) {
 
   group("browser_tests_apprtc") {
     testonly = true
-    data_deps = [
-      ":browser_tests",
-    ]
+    data_deps = [ ":browser_tests" ]
     data = [
       "//third_party/webrtc/rtc_tools/testing/browsertest/apprtc/out/app_engine/",
       "//third_party/webrtc/rtc_tools/testing/browsertest/apprtc/temp/google-cloud-sdk/",
@@ -2767,9 +2823,7 @@ if (is_linux || is_mac || is_win) {
   }
 
   sizes_test("chrome_sizes") {
-    data_deps = [
-      "//chrome",
-    ]
+    data_deps = [ "//chrome" ]
     if (is_win) {
       data_deps += [ "//chrome/installer/mini_installer" ]
     }
@@ -2778,9 +2832,7 @@ if (is_linux || is_mac || is_win) {
 
 group("telemetry_perf_unittests") {
   testonly = true
-  deps = [
-    "//tools/perf:perf",
-  ]
+  deps = [ "//tools/perf:perf" ]
 
   data = [
     # For isolate contract.
@@ -2794,14 +2846,15 @@ group("telemetry_perf_unittests") {
     # For tests in tools/perf/process_perf_results_unittest.py
     "//build/android/pylib/",
     "//tools/swarming_client/",
+
+    # For representative perf testing run_rendering_benchmark_with_gated_performance.py
+    "//testing/scripts/run_rendering_benchmark_with_gated_performance.py",
   ]
 }
 
 group("telemetry_perf_tests") {
   testonly = true
-  deps = [
-    "//tools/perf/:perf",
-  ]
+  deps = [ "//tools/perf/:perf" ]
 
   data = [
     # Needed for isolate script to execute.
@@ -2812,15 +2865,17 @@ group("telemetry_perf_tests") {
 
 group("ct_telemetry_perf_tests_without_chrome") {
   testonly = true
-  deps = [
-    "//tools/perf/:perf_without_chrome",
-  ]
+  deps = [ "//tools/perf/:perf_without_chrome" ]
 
   data = [
+    # crbug.com/1048153
+    "//testing/scripts/run_rendering_benchmark_with_gated_performance.py",
+
     "//tools/perf/contrib/cluster_telemetry/",
   ]
 
   data_deps = [
+    "//components/subresource_filter/tools:index_ruleset",
     "//testing:run_perf_test",
   ]
 }
@@ -2829,13 +2884,34 @@ group("ct_telemetry_perf_tests_without_chrome") {
 # is done.
 group("performance_test_suite") {
   testonly = true
-  deps = [
-    "//chrome/test:telemetry_perf_tests",
-  ]
+  deps = [ "//chrome/test:telemetry_perf_tests" ]
 
   data_deps = [
+    "//base:base_perftests",
+    "//chrome/test:angle_perftests",
+    "//chrome/test:dawn_perf_tests",
+    "//components:components_perftests",
+    "//components/tracing:tracing_perftests",
+    "//gpu:command_buffer_perftests",
+    "//gpu:gpu_perftests",
+    "//media:media_perftests",
     "//testing:run_perf_test",
   ]
+
+  if (!is_android && !is_fuchsia) {
+    data_deps += [
+      "//chrome/test:load_library_perf_tests",
+      "//ui/views:views_perftests",
+    ]
+  }
+
+  if (!is_android) {
+    data_deps += [ "//chrome/test:performance_browser_tests" ]
+  }
+
+  if (!is_ios && !is_fuchsia && !is_android) {
+    data_deps += [ "//net:net_perftests" ]
+  }
 }
 
 # Difference between this and performance_test_suite is that this runs a devil
@@ -2843,16 +2919,12 @@ group("performance_test_suite") {
 # //testing/buildbot/gn_isolate_map.pyl
 group("performance_webview_test_suite") {
   testonly = true
-  deps = [
-    "//chrome/test:performance_test_suite",
-  ]
+  deps = [ "//chrome/test:performance_test_suite" ]
 }
 
 group("performance_weblayer_test_suite") {
   testonly = true
-  deps = [
-    "//chrome/test:performance_test_suite",
-  ]
+  deps = [ "//chrome/test:performance_test_suite" ]
 }
 
 # Difference between this and telemetry_perf_tests is that this runs a devil
@@ -2860,16 +2932,12 @@ group("performance_weblayer_test_suite") {
 # //testing/buildbot/gn_isolate_map.pyl
 group("telemetry_perf_webview_tests") {
   testonly = true
-  deps = [
-    "//chrome/test:telemetry_perf_tests",
-  ]
+  deps = [ "//chrome/test:telemetry_perf_tests" ]
 }
 
 group("angle_perftests") {
   testonly = true
-  data_deps = [
-    "//testing:run_perf_test",
-  ]
+  data_deps = [ "//testing:run_perf_test" ]
   if (is_win || is_linux || is_android) {
     data_deps += [ "//third_party/angle/src/tests:angle_perftests" ]
   }
@@ -2877,19 +2945,16 @@ group("angle_perftests") {
 
 group("dawn_perf_tests") {
   testonly = true
-  data_deps = [
-    "//testing:run_perf_test",
-  ]
-  if (use_dawn) {
+  data_deps = [ "//testing:run_perf_test" ]
+  if (build_dawn_tests) {
     data_deps += [ "//third_party/dawn:dawn_perf_tests_temp_group" ]
   }
 }
 
 if (is_mac) {
   mojom("firefox_importer_interface") {
-    sources = [
-      "../utility/importer/firefox_importer_unittest_utils_mac.mojom",
-    ]
+    sources =
+        [ "../utility/importer/firefox_importer_unittest_utils_mac.mojom" ]
     public_deps = [
       "//components/autofill/core/common/mojom:mojo_types",
       "//mojo/public/mojom/base",
@@ -2936,6 +3001,7 @@ test("unit_tests") {
     "../browser/android/explore_sites/image_helper_unittest.cc",
     "../browser/android/explore_sites/import_catalog_task_unittest.cc",
     "../browser/android/explore_sites/increment_shown_count_task_unittest.cc",
+    "../browser/android/explore_sites/most_visited_client_unittest.cc",
     "../browser/android/explore_sites/ntp_json_fetcher_unittest.cc",
     "../browser/android/explore_sites/record_site_click_task_unittest.cc",
     "../browser/android/history_report/data_observer_unittest.cc",
@@ -2956,8 +3022,6 @@ test("unit_tests") {
     "../browser/android/customtabs/detached_resource_request_unittest.cc",
     "../browser/android/favicon_helper_unittest.cc",
     "../browser/android/metrics/background_task_memory_metrics_emitter_unittest.cc",
-    "../browser/android/mock_location_settings.cc",
-    "../browser/android/mock_location_settings.h",
     "../browser/android/oom_intervention/near_oom_monitor_unittest.cc",
     "../browser/android/oom_intervention/oom_intervention_decider_unittest.cc",
     "../browser/android/password_edit_delegate_settings_impl_unittest.cc",
@@ -2965,7 +3029,6 @@ test("unit_tests") {
     "../browser/android/preferences/prefs_unittest.cc",
     "../browser/android/shortcut_info_unittest.cc",
     "../browser/android/signin/signin_manager_android_unittest.cc",
-    "../browser/android/thumbnail/scoped_ptr_expiring_cache_unittest.cc",
     "../browser/android/usage_stats/usage_stats_database_unittest.cc",
     "../browser/android/webapk/webapk_icon_hasher_unittest.cc",
     "../browser/android/webapk/webapk_installer_unittest.cc",
@@ -2988,6 +3051,7 @@ test("unit_tests") {
     "../browser/background_sync/periodic_background_sync_permission_context_unittest.cc",
     "../browser/banners/app_banner_settings_helper_unittest.cc",
     "../browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc",
+    "../browser/bluetooth/bluetooth_chooser_context_unittest.cc",
     "../browser/bookmarks/managed_bookmark_service_unittest.cc",
     "../browser/browser_about_handler_unittest.cc",
     "../browser/browsing_data/browsing_data_appcache_helper_unittest.cc",
@@ -2997,7 +3061,6 @@ test("unit_tests") {
     "../browser/browsing_data/browsing_data_file_system_helper_unittest.cc",
     "../browser/browsing_data/browsing_data_helper_unittest.cc",
     "../browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc",
-    "../browser/browsing_data/browsing_data_local_storage_helper_unittest.cc",
     "../browser/browsing_data/browsing_data_media_license_helper_unittest.cc",
     "../browser/browsing_data/browsing_data_quota_helper_unittest.cc",
     "../browser/browsing_data/browsing_data_service_worker_helper_unittest.cc",
@@ -3019,6 +3082,7 @@ test("unit_tests") {
     "../browser/component_updater/games_component_installer_unittest.cc",
     "../browser/component_updater/optimization_hints_component_installer_unittest.cc",
     "../browser/component_updater/origin_trials_component_installer_unittest.cc",
+    "../browser/component_updater/soda_component_installer_unittest.cc",
     "../browser/component_updater/subresource_filter_component_installer_unittest.cc",
     "../browser/component_updater/sw_reporter_installer_win_unittest.cc",
     "../browser/content_index/content_index_provider_unittest.cc",
@@ -3059,7 +3123,7 @@ test("unit_tests") {
     "../browser/external_protocol/external_protocol_handler_unittest.cc",
     "../browser/file_select_helper_unittest.cc",
     "../browser/font_pref_change_notifier_unittest.cc",
-    "../browser/geolocation/geolocation_permission_context_unittest.cc",
+    "../browser/geolocation/geolocation_permission_context_delegate_unittest.cc",
     "../browser/global_keyboard_shortcuts_mac_unittest.mm",
     "../browser/google/google_search_domain_mixing_metrics_emitter_factory_unittest.cc",
     "../browser/google/google_search_domain_mixing_metrics_emitter_unittest.cc",
@@ -3073,6 +3137,7 @@ test("unit_tests") {
     "../browser/history/android/sqlite_cursor_unittest.cc",
     "../browser/history/android/urls_sql_handler_unittest.cc",
     "../browser/history/android/visit_sql_handler_unittest.cc",
+    "../browser/history/domain_diversity_reporter_unittest.cc",
     "../browser/history/history_tab_helper_unittest.cc",
     "../browser/infobars/mock_infobar_service.cc",
     "../browser/infobars/mock_infobar_service.h",
@@ -3090,7 +3155,9 @@ test("unit_tests") {
     "../browser/mac/keystone_glue_unittest.mm",
     "../browser/media/android/router/media_router_android_unittest.cc",
     "../browser/media/cast_mirroring_service_host_unittest.cc",
-    "../browser/media/history/media_history_keyed_service_factory_unittest.cc",
+    "../browser/media/feeds/media_feeds_fetcher_unittest.cc",
+    "../browser/media/feeds/media_feeds_service_unittest.cc",
+    "../browser/media/history/media_history_keyed_service_unittest.cc",
     "../browser/media/history/media_history_store_unittest.cc",
     "../browser/media/media_engagement_contents_observer_unittest.cc",
     "../browser/media/media_engagement_preloaded_list_unittest.cc",
@@ -3113,6 +3180,8 @@ test("unit_tests") {
     "../browser/metrics/thread_watcher_android_unittest.cc",
     "../browser/metrics/thread_watcher_unittest.cc",
     "../browser/native_file_system/chrome_native_file_system_permission_context_unittest.cc",
+    "../browser/native_file_system/origin_scoped_native_file_system_permission_context_unittest.cc",
+    "../browser/native_file_system/tab_scoped_native_file_system_permission_context_unittest.cc",
     "../browser/navigation_predictor/navigation_predictor_unittest.cc",
     "../browser/net/chrome_network_delegate_unittest.cc",
     "../browser/net/dns_probe_runner_unittest.cc",
@@ -3123,6 +3192,8 @@ test("unit_tests") {
     "../browser/net/probe_message_unittest.cc",
     "../browser/net/referrer_policy_policy_handler_unittest.cc",
     "../browser/net/secure_dns_policy_handler_unittest.cc",
+    "../browser/net/stub_resolver_config_reader_unittest.cc",
+    "../browser/nfc/nfc_permission_context_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",
@@ -3154,6 +3225,7 @@ test("unit_tests") {
     "../browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/document_write_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc",
+    "../browser/page_load_metrics/observers/isolated_prerender_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/live_tab_count_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer_unittest.cc",
@@ -3169,50 +3241,38 @@ test("unit_tests") {
     "../browser/page_load_metrics/observers/security_state_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/service_worker_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/signed_exchange_page_load_metrics_observer_unittest.cc",
-    "../browser/page_load_metrics/observers/subresource_loading_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/tab_restore_page_load_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/third_party_metrics_observer_unittest.cc",
     "../browser/page_load_metrics/observers/ukm_page_load_metrics_observer_unittest.cc",
+    "../browser/paint_preview/services/paint_preview_demo_service_unittest.cc",
+    "../browser/paint_preview/services/paint_preview_tab_service_unittest.cc",
     "../browser/password_manager/chrome_password_manager_client_unittest.cc",
     "../browser/password_manager/password_store_x_unittest.cc",
-    "../browser/payments/payment_handler_permission_context_unittest.cc",
+    "../browser/performance_hints/performance_hints_observer_unittest.cc",
     "../browser/performance_manager/decorators/frame_priority_decorator_unittest.cc",
     "../browser/performance_manager/decorators/frozen_frame_aggregator_unittest.cc",
+    "../browser/performance_manager/decorators/helpers/page_live_state_decorator_helper_unittest.cc",
     "../browser/performance_manager/decorators/page_aggregator_unittest.cc",
-    "../browser/performance_manager/decorators/page_almost_idle_decorator_unittest.cc",
     "../browser/performance_manager/decorators/process_metrics_decorator_unittest.cc",
     "../browser/performance_manager/decorators/process_priority_aggregator_unittest.cc",
     "../browser/performance_manager/graph/policies/dynamic_tcmalloc_policy_linux_unittest.cc",
+    "../browser/performance_manager/graph/policies/high_pmf_memory_pressure_policy_unittest.cc",
     "../browser/performance_manager/graph/policies/working_set_trimmer_policy_chromeos_unittest.cc",
     "../browser/performance_manager/graph/policies/working_set_trimmer_policy_unittest.cc",
     "../browser/performance_manager/mechanisms/working_set_trimmer_win_unittest.cc",
+    "../browser/performance_manager/metrics/memory_pressure_metrics_unittest.cc",
     "../browser/performance_manager/observers/isolation_context_metrics_unittest.cc",
     "../browser/performance_manager/observers/metrics_collector_unittest.cc",
-    "../browser/performance_manager/persistence/site_data/exponential_moving_average_unittest.cc",
-    "../browser/performance_manager/persistence/site_data/leveldb_site_data_store_unittest.cc",
-    "../browser/performance_manager/persistence/site_data/non_recording_site_data_cache_unittest.cc",
-    "../browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc",
-    "../browser/performance_manager/persistence/site_data/site_data_cache_factory_unittest.cc",
-    "../browser/performance_manager/persistence/site_data/site_data_cache_impl_unittest.cc",
-    "../browser/performance_manager/persistence/site_data/site_data_impl_unittest.cc",
-    "../browser/performance_manager/persistence/site_data/site_data_reader_unittest.cc",
-    "../browser/performance_manager/persistence/site_data/site_data_writer_unittest.cc",
-    "../browser/performance_manager/persistence/site_data/unittest_utils.cc",
-    "../browser/performance_manager/persistence/site_data/unittest_utils.h",
     "../browser/performance_manager/render_process_host_proxy_unittest.cc",
+    "../browser/performance_manager/test_support/page_aggregator.cc",
+    "../browser/performance_manager/test_support/page_aggregator.h",
     "../browser/performance_monitor/metric_evaluator_helper_win_unittest.cc",
     "../browser/performance_monitor/system_monitor_unittest.cc",
-    "../browser/permissions/chooser_context_base_mock_permission_observer.cc",
-    "../browser/permissions/chooser_context_base_mock_permission_observer.h",
-    "../browser/permissions/chooser_context_base_unittest.cc",
+    "../browser/permissions/chrome_permission_manager_unittest.cc",
+    "../browser/permissions/chrome_permission_request_manager_unittest.cc",
     "../browser/permissions/crowd_deny_preload_data_unittest.cc",
     "../browser/permissions/crowd_deny_safe_browsing_request_unittest.cc",
     "../browser/permissions/permission_context_base_feature_policy_unittest.cc",
-    "../browser/permissions/permission_context_base_unittest.cc",
-    "../browser/permissions/permission_decision_auto_blocker_unittest.cc",
-    "../browser/permissions/permission_manager_unittest.cc",
-    "../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",
@@ -3226,8 +3286,8 @@ test("unit_tests") {
     "../browser/policy/cloud/user_policy_signin_service_unittest.cc",
     "../browser/policy/developer_tools_policy_handler_unittest.cc",
     "../browser/policy/file_selection_dialogs_policy_handler_unittest.cc",
+    "../browser/policy/homepage_location_policy_handler_unittest.cc",
     "../browser/policy/javascript_policy_handler_unittest.cc",
-    "../browser/policy/managed_bookmarks_policy_handler_unittest.cc",
     "../browser/policy/profile_policy_connector_unittest.cc",
     "../browser/policy/webusb_allow_devices_for_urls_policy_handler_unittest.cc",
     "../browser/predictors/autocomplete_action_predictor_table_unittest.cc",
@@ -3248,6 +3308,10 @@ test("unit_tests") {
     "../browser/prefs/profile_pref_store_manager_unittest.cc",
     "../browser/prefs/proxy_policy_unittest.cc",
     "../browser/prefs/session_startup_pref_unittest.cc",
+    "../browser/prerender/isolated/isolated_prerender_proxy_configurator_unittest.cc",
+    "../browser/prerender/isolated/isolated_prerender_service_workers_observer_unittest.cc",
+    "../browser/prerender/isolated/isolated_prerender_tab_helper_unittest.cc",
+    "../browser/prerender/isolated/isolated_prerender_url_loader_interceptor_unittest.cc",
     "../browser/prerender/prerender_history_unittest.cc",
     "../browser/prerender/prerender_unittest.cc",
     "../browser/prerender/prerender_util_unittest.cc",
@@ -3280,6 +3344,7 @@ test("unit_tests") {
     "../browser/resource_coordinator/tab_load_tracker_unittest.cc",
     "../browser/resources_util_unittest.cc",
     "../browser/search/contextual_search_policy_handler_android_unittest.cc",
+    "../browser/tab/state/tab_state_db_unittest.cc",
 
     # TODO(hashimoto): those tests should be componentized and moved to
     # //components:components_unittests, http://crbug.com/527882.
@@ -3293,6 +3358,16 @@ test("unit_tests") {
     "../browser/sessions/restore_on_startup_policy_handler_unittest.cc",
     "../browser/sessions/session_common_utils_unittest.cc",
     "../browser/sharing/ack_message_handler_unittest.cc",
+    "../browser/sharing/fake_device_info.cc",
+    "../browser/sharing/fake_device_info.h",
+    "../browser/sharing/fake_sharing_handler_registry.cc",
+    "../browser/sharing/fake_sharing_handler_registry.h",
+    "../browser/sharing/mock_sharing_device_source.cc",
+    "../browser/sharing/mock_sharing_device_source.h",
+    "../browser/sharing/mock_sharing_message_handler.cc",
+    "../browser/sharing/mock_sharing_message_handler.h",
+    "../browser/sharing/mock_sharing_message_sender.cc",
+    "../browser/sharing/mock_sharing_message_sender.h",
     "../browser/sharing/mock_sharing_service.cc",
     "../browser/sharing/mock_sharing_service.h",
     "../browser/sharing/sharing_device_registration_unittest.cc",
@@ -3301,11 +3376,14 @@ test("unit_tests") {
     "../browser/sharing/sharing_fcm_handler_unittest.cc",
     "../browser/sharing/sharing_fcm_sender_unittest.cc",
     "../browser/sharing/sharing_handler_registry_impl_unittest.cc",
+    "../browser/sharing/sharing_message_bridge_impl_unittest.cc",
     "../browser/sharing/sharing_message_sender_unittest.cc",
     "../browser/sharing/sharing_service_unittest.cc",
     "../browser/sharing/sharing_sync_preference_unittest.cc",
     "../browser/sharing/sharing_utils_unittest.cc",
     "../browser/sharing/vapid_key_manager_unittest.cc",
+    "../browser/sharing/web_push/json_web_token_util_unittest.cc",
+    "../browser/sharing/web_push/web_push_sender_unittest.cc",
     "../browser/shell_integration_win_unittest.cc",
     "../browser/signin/account_consistency_mode_manager_unittest.cc",
     "../browser/signin/account_id_from_account_info_unittest.cc",
@@ -3316,6 +3394,7 @@ test("unit_tests") {
     "../browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc",
     "../browser/signin/chrome_signin_url_loader_throttle_unittest.cc",
     "../browser/signin/local_auth_unittest.cc",
+    "../browser/signin/reauth_tab_helper_unittest.cc",
     "../browser/signin/signin_profile_attributes_updater_unittest.cc",
     "../browser/signin/signin_status_metrics_provider_chromeos_unittest.cc",
     "../browser/signin/test_signin_client_builder.cc",
@@ -3327,15 +3406,13 @@ test("unit_tests") {
     "../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",
-    "../browser/ssl/ssl_error_assistant_unittest.cc",
-    "../browser/ssl/ssl_error_handler_unittest.cc",
     "../browser/ssl/tls_deprecation_config_unittest.cc",
     "../browser/ssl/typed_navigation_timing_throttle_unittest.cc",
     "../browser/status_icons/status_icon_menu_model_unittest.cc",
     "../browser/status_icons/status_icon_unittest.cc",
     "../browser/status_icons/status_tray_unittest.cc",
     "../browser/storage/durable_storage_permission_context_unittest.cc",
-    "../browser/storage/storage_notification_service_unittest.cc",
+    "../browser/storage_access_api/storage_access_grant_permission_context_unittest.cc",
     "../browser/subresource_filter/subresource_filter_abusive_unittest.cc",
     "../browser/subresource_filter/subresource_filter_configuration_unittest.cc",
     "../browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc",
@@ -3351,24 +3428,22 @@ test("unit_tests") {
     "../browser/tracing/background_tracing_metrics_provider_unittest.cc",
     "../browser/tracing/trace_event_system_stats_monitor_unittest.cc",
     "../browser/translate/android/translate_bridge_unittest.cc",
-    "../browser/translate/translate_fake_page.cc",
+    "../browser/translate/fake_translate_agent.cc",
+    "../browser/translate/fake_translate_agent.h",
     "../browser/translate/translate_service_unittest.cc",
     "../browser/ui/android/tab_model/tab_model_list_unittest.cc",
     "../browser/ui/android/toolbar/location_bar_model_android_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/blocked_content/popup_opener_tab_helper_unittest.cc",
     "../browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc",
     "../browser/ui/chrome_select_file_policy_unittest.cc",
+    "../browser/ui/cookie_controls/cookie_controls_controller_unittest.cc",
+    "../browser/ui/cookie_controls/cookie_controls_service_unittest.cc",
     "../browser/ui/find_bar/find_backend_unittest.cc",
     "../browser/ui/login/login_handler_unittest.cc",
     "../browser/ui/page_info/page_info_unittest.cc",
     "../browser/ui/passwords/manage_passwords_state_unittest.cc",
     "../browser/ui/passwords/manage_passwords_view_utils_unittest.cc",
     "../browser/ui/passwords/password_generation_popup_controller_impl_unittest.cc",
-    "../browser/ui/passwords/settings/password_access_authenticator_unittest.cc",
     "../browser/ui/passwords/settings/password_manager_porter_unittest.cc",
     "../browser/ui/passwords/settings/password_manager_presenter_unittest.cc",
     "../browser/ui/search_engines/keyword_editor_controller_unittest.cc",
@@ -3378,7 +3453,7 @@ test("unit_tests") {
     "../browser/ui/webui/local_state/local_state_ui_unittest.cc",
     "../browser/ui/webui/log_web_ui_url_unittest.cc",
     "../browser/update_client/chrome_update_query_params_delegate_unittest.cc",
-    "../browser/vr/metrics/session_metrics_helper_unittest.cc",
+    "../browser/vr/metrics/session_tracker_unittest.cc",
     "../browser/vr/vr_tab_helper_unittest.cc",
     "../browser/wake_lock/wake_lock_permission_context_unittest.cc",
     "../browser/win/chrome_elf_init_unittest.cc",
@@ -3396,7 +3471,6 @@ test("unit_tests") {
     "../common/ini_parser_unittest.cc",
     "../common/mac/mock_launchd.h",
     "../common/mac/mock_launchd.mm",
-    "../common/mac/staging_watcher_unittest.mm",
     "../common/media_router/issue_unittest.cc",
     "../common/media_router/media_route_unittest.cc",
     "../common/media_router/media_sink_unittest.cc",
@@ -3405,6 +3479,7 @@ test("unit_tests") {
     "../common/origin_trials/chrome_origin_trial_policy_unittest.cc",
     "../common/pref_names_util_unittest.cc",
     "../common/profiler/thread_profiler_unittest.cc",
+    "../common/qr_code_generator/qr_code_generator_unittest.cc",
     "../common/string_matching/fuzzy_tokenized_string_match_unittest.cc",
     "../common/string_matching/sequence_matcher_unittest.cc",
     "../common/string_matching/term_break_iterator_unittest.cc",
@@ -3412,14 +3487,13 @@ test("unit_tests") {
     "../common/string_matching/tokenized_string_match_unittest.cc",
     "../common/string_matching/tokenized_string_unittest.cc",
     "../renderer/chrome_content_renderer_client_unittest.cc",
+    "../renderer/chrome_render_frame_observer_unittest.cc",
     "../renderer/content_settings_agent_impl_unittest.cc",
     "../renderer/instant_restricted_id_cache_unittest.cc",
     "../renderer/media/chrome_key_systems_provider_unittest.cc",
     "../renderer/media/flash_embed_rewrite_unittest.cc",
     "../renderer/net/net_error_helper_core_unittest.cc",
     "../renderer/plugins/plugin_uma_unittest.cc",
-    "../renderer/prerender/prerender_dispatcher_unittest.cc",
-    "../renderer/subresource_redirect/subresource_redirect_experiments_unittest.cc",
     "../renderer/subresource_redirect/subresource_redirect_url_loader_throttle_unittest.cc",
     "../renderer/subresource_redirect/subresource_redirect_util_unittest.cc",
     "../renderer/v8_unwinder_unittest.cc",
@@ -3440,6 +3514,13 @@ test("unit_tests") {
     "../../third_party/zlib/google/zip_unittest.cc",
   ]
 
+  if (enable_downgrade_processing) {
+    sources += [
+      "../browser/downgrade/snapshot_manager_unittest.cc",
+      "../browser/downgrade/user_data_downgrade_unittest.cc",
+    ]
+  }
+
   if (toolkit_views) {
     # Test accessibility checks that audit any UI opened in a browser test.
     sources += [ "views/accessibility_checker_unittest.cc" ]
@@ -3464,7 +3545,12 @@ test("unit_tests") {
 
   if (!is_android) {
     sources += [
+      "../browser/device_identity/device_oauth2_token_service_unittest.cc",
       "../browser/profiles/profile_avatar_icon_util_unittest.cc",
+      "../browser/sharing/webrtc/sharing_service_host_unittest.cc",
+      "../browser/sharing/webrtc/sharing_webrtc_connection_host_unittest.cc",
+      "../browser/sharing/webrtc/webrtc_signalling_host_fcm_unittest.cc",
+      "../browser/tab_contents/form_interaction_tab_helper_unittest.cc",
       "../browser/ui/autofill/payments/autofill_dialog_models_unittest.cc",
       "../browser/ui/bookmarks/bookmark_editor_unittest.cc",
       "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc",
@@ -3475,8 +3561,11 @@ test("unit_tests") {
       "../browser/ui/webui/devtools_ui_data_source_unittest.cc",
       "../browser/ui/webui/discards/graph_dump_impl_unittest.cc",
       "../browser/ui/webui/favicon_source_unittest.cc",
-      "../browser/ui/webui/ntp/cookie_controls_handler_unittest.cc",
       "../browser/ui/webui/signin/sync_confirmation_handler_unittest.cc",
+      "../browser/upgrade_detector/build_state_unittest.cc",
+      "../browser/upgrade_detector/get_installed_version_win_unittest.cc",
+      "../browser/upgrade_detector/mock_build_state_observer.cc",
+      "../browser/upgrade_detector/mock_build_state_observer.h",
       "../browser/webauthn/authenticator_request_scheduler_unittest.cc",
       "../browser/webauthn/chrome_authenticator_request_delegate_unittest.cc",
       "../test/pixel/browser_skia_gold_pixel_diff_unittest.cc",
@@ -3484,11 +3573,18 @@ test("unit_tests") {
   }
   if (is_chromeos) {
     sources += [
+      "../browser/device_identity/chromeos/device_oauth2_token_store_chromeos_unittest.cc",
       "../browser/ui/webui/chromeos/add_supervision/add_supervision_handler_utils_unittest.cc",
+      "../browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc",
       "../renderer/chromeos_delayed_callback_group_unittest.cc",
     ]
   }
 
+  if (enable_webui_tab_strip) {
+    sources +=
+        [ "../browser/ui/webui/tab_strip/tab_strip_ui_handler_unittest.cc" ]
+  }
+
   configs += [ "//build/config:precompiled_headers" ]
 
   if (is_android && notouch_build) {
@@ -3510,7 +3606,7 @@ test("unit_tests") {
     "//extensions/test/data/",
     "//google_apis/test/data/",
     "//net/tools/testserver/",
-    "//third_party/pywebsocket/src/mod_pywebsocket/",
+    "//third_party/pywebsocket3/src/mod_pywebsocket/",
     "//third_party/tlslite/",
     "//third_party/zlib/google/test/data/",
     "//tools/metrics/histograms/enums.xml",
@@ -3524,12 +3620,7 @@ test("unit_tests") {
     ]
   }
   if (is_linux || is_win) {
-    data += [
-      "$root_out_dir/chrome_100_percent.pak",
-      "$root_out_dir/chrome_200_percent.pak",
-      "$root_out_dir/locales/en-US.pak",
-      "$root_out_dir/resources.pak",
-    ]
+    data_deps += [ "//chrome:packed_resources" ]
   }
   if (is_win) {
     data_deps += [ "//chrome" ]
@@ -3550,17 +3641,21 @@ test("unit_tests") {
     "//chrome:strings",
     "//chrome/browser/media/router:unittests",
     "//chrome/browser/notifications:unit_tests",
+    "//chrome/browser/payments:unittests",
+    "//chrome/browser/upboarding:unit_tests",
     "//chrome/browser/updates/announcement_notification:unit_tests",
     "//chrome/common:test_support",
     "//chrome/common/media_router:test_support",
     "//components/account_id",
     "//components/autofill/content/renderer:test_support",
     "//components/browser_sync:test_support",
+    "//components/captive_portal/core:buildflags",
     "//components/component_updater:test_support",
     "//components/content_settings/core/test:test_support",
     "//components/data_reduction_proxy/core/browser:test_support",
     "//components/data_use_measurement/core",
     "//components/favicon/core/test:test_support",
+    "//components/flags_ui:test_support",
     "//components/mirroring:mirroring_tests",
     "//components/nacl/common:buildflags",
     "//components/ntp_snippets:test_support",
@@ -3569,15 +3664,17 @@ test("unit_tests") {
     "//components/optimization_guide",
     "//components/optimization_guide:test_support",
     "//components/os_crypt:test_support",
+    "//components/page_info",
     "//components/page_load_metrics/browser",
     "//components/page_load_metrics/browser:test_support",
     "//components/page_load_metrics/common:test_support",
     "//components/resources",
     "//components/safe_browsing:buildflags",
-    "//components/safe_browsing:features",
-    "//components/safe_browsing/db",
-    "//components/safe_browsing/db:test_database_manager",
-    "//components/safe_browsing/password_protection:mock_password_protection",
+    "//components/safe_browsing/content/password_protection:mock_password_protection",
+    "//components/safe_browsing/core:features",
+    "//components/safe_browsing/core/db",
+    "//components/safe_browsing/core/db:test_database_manager",
+    "//components/schema_org/common:improved_mojom",
     "//components/services/patch/content",
     "//components/services/unzip/content",
     "//components/spellcheck:buildflags",
@@ -3620,6 +3717,7 @@ test("unit_tests") {
     "//third_party/libaddressinput",
     "//third_party/libphonenumber",
     "//third_party/metrics_proto",
+    "//third_party/re2",
     "//third_party/webrtc_overrides:webrtc_component",
     "//third_party/zlib/google:compression_utils",
     "//ui/base:test_support",
@@ -3706,35 +3804,52 @@ test("unit_tests") {
       "../browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc",
       "../browser/autofill/credit_card_accessory_controller_impl_unittest.cc",
       "../browser/autofill/manual_filling_controller_impl_unittest.cc",
+      "../browser/contextmenu/chrome_context_menu_populator_unittest.cc",
+      "../browser/installedapp/installed_app_provider_unittest.cc",
       "../browser/media/android/cdm/media_drm_origin_id_manager_unittest.cc",
       "../browser/metrics/chrome_android_metrics_provider_unittest.cc",
+      "../browser/notifications/notification_platform_bridge_android_unittest.cc",
+      "../browser/omnibox/status/status_mediator_unittest.cc",
+      "../browser/optimization_guide/android/optimization_guide_bridge_unittest.cc",
       "../browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc",
+      "../browser/partnercustomizations/partner_browser_customizations_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/credential_leak_controller_android_unittest.cc",
       "../browser/password_manager/password_accessory_controller_impl_unittest.cc",
       "../browser/password_manager/password_generation_controller_impl_unittest.cc",
       "../browser/password_manager/save_password_infobar_delegate_android_unittest.cc",
-      "../browser/password_manager/touch_to_fill_controller_unittest.cc",
       "../browser/password_manager/update_password_infobar_delegate_android_unittest.cc",
       "../browser/permissions/permission_prompt_android_unittest.cc",
-      "../browser/permissions/permission_request_notification_android_unittest.cc",
-      "../browser/permissions/permission_request_notification_handler_unittest.cc",
+      "../browser/tabmodel/tab_persistent_store_unittest.cc",
+      "../browser/toolbar/toolbar_security_icon_unittest.cc",
+      "../browser/touch_to_fill/touch_to_fill_controller_unittest.cc",
       "../browser/translate/translate_manager_render_view_host_android_unittest.cc",
-      "../browser/updates/update_notification_config_unittest.cc",
     ]
+
+    if (enable_password_change_in_leaked_dialog) {
+      sources += [ "../browser/password_manager/credential_leak_password_change_controller_android_unittest.cc" ]
+    }
     deps += [
       "//base:base_java",
       "//chrome:chrome_android_core",
       "//chrome/android:app_hooks_java",
       "//chrome/android:chrome_java",
+      "//chrome/android:native_j_unittests_jni_headers",
+      "//chrome/android:native_java_unittests_java",
       "//chrome/android/features/media_router:java",
+      "//chrome/browser/optimization_guide/android:native_j_unittests_jni_headers",
+      "//chrome/browser/optimization_guide/android:native_java_unittests",
+      "//chrome/browser/thumbnail:unit_tests",
+      "//chrome/browser/updates:unit_tests",
       "//chrome/services/media_gallery_util:unit_tests",
       "//components/download/internal/common:internal_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",
+      "//components/location/android:test_support",
       "//components/module_installer/android:module_installer_java",
+      "//components/permissions/android:test_support",
       "//content/public/android:content_java",
     ]
     if (use_v8_context_snapshot) {
@@ -3770,15 +3885,19 @@ test("unit_tests") {
       "../browser/diagnostics/diagnostics_model_unittest.cc",
       "../browser/download/download_commands_unittest.cc",
       "../browser/download/download_shelf_unittest.cc",
-      "../browser/enterprise_reporting/browser_report_generator_unittest.cc",
-      "../browser/enterprise_reporting/extension_info_unittest.cc",
-      "../browser/enterprise_reporting/policy_info_unittest.cc",
-      "../browser/enterprise_reporting/profile_report_generator_unittest.cc",
-      "../browser/enterprise_reporting/report_generator_unittest.cc",
-      "../browser/enterprise_reporting/report_request_queue_generator_unittest.cc",
-      "../browser/enterprise_reporting/report_scheduler_unittest.cc",
-      "../browser/enterprise_reporting/report_uploader_unittest.cc",
-      "../browser/enterprise_reporting/request_timer_unittest.cc",
+      "../browser/enterprise/connectors/connectors_manager_unittest.cc",
+      "../browser/enterprise/connectors/enterprise_connectors_policy_handler_unittest.cc",
+      "../browser/enterprise/reporting/browser_report_generator_unittest.cc",
+      "../browser/enterprise/reporting/extension_info_unittest.cc",
+      "../browser/enterprise/reporting/notification/extension_request_notification_unittest.cc",
+      "../browser/enterprise/reporting/notification/extension_request_observer_factory_unittest.cc",
+      "../browser/enterprise/reporting/notification/extension_request_observer_unittest.cc",
+      "../browser/enterprise/reporting/policy_info_unittest.cc",
+      "../browser/enterprise/reporting/profile_report_generator_unittest.cc",
+      "../browser/enterprise/reporting/report_generator_unittest.cc",
+      "../browser/enterprise/reporting/report_request_queue_generator_unittest.cc",
+      "../browser/enterprise/reporting/report_scheduler_unittest.cc",
+      "../browser/enterprise/reporting/report_uploader_unittest.cc",
       "../browser/first_run/first_run_unittest.cc",
       "../browser/font_family_cache_unittest.cc",
 
@@ -3798,6 +3917,7 @@ test("unit_tests") {
       "../browser/media/webrtc/desktop_capture_access_handler_unittest.cc",
       "../browser/media/webrtc/desktop_media_picker_controller_unittest.cc",
       "../browser/media/webrtc/display_media_access_handler_unittest.cc",
+      "../browser/media/webrtc/media_capture_devices_dispatcher_unittest.cc",
       "../browser/media/webrtc/media_stream_capture_indicator_unittest.cc",
       "../browser/media/webrtc/tab_desktop_media_list_unittest.cc",
       "../browser/media/webrtc/webrtc_event_log_manager_common_unittest.cc",
@@ -3807,7 +3927,6 @@ test("unit_tests") {
       "../browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc",
       "../browser/media_galleries/fileapi/native_media_file_util_unittest.cc",
       "../browser/media_galleries/gallery_watch_manager_unittest.cc",
-      "../browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm",
       "../browser/media_galleries/media_file_system_registry_unittest.cc",
       "../browser/media_galleries/media_galleries_dialog_controller_mock.cc",
       "../browser/media_galleries/media_galleries_dialog_controller_mock.h",
@@ -3816,11 +3935,7 @@ test("unit_tests") {
       "../browser/media_galleries/media_galleries_permission_controller_unittest.cc",
       "../browser/media_galleries/media_galleries_permissions_unittest.cc",
       "../browser/media_galleries/media_galleries_preferences_unittest.cc",
-      "../browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc",
-      "../browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc",
       "../browser/memory/enterprise_memory_limit_evaluator_unittest.cc",
-      "../browser/memory/memory_pressure_monitor_utils_unittest.cc",
-      "../browser/memory/memory_pressure_monitor_win_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",
@@ -3829,6 +3944,7 @@ test("unit_tests") {
       "../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",
@@ -3858,6 +3974,26 @@ test("unit_tests") {
       "../browser/resource_coordinator/tracing_lifecycle_unit_observer_unittest.cc",
       "../browser/resource_coordinator/usage_clock_unittest.cc",
 
+      # The site data database isn't supported on Android.
+      "../browser/performance_manager/persistence/site_data/exponential_moving_average_unittest.cc",
+      "../browser/performance_manager/persistence/site_data/leveldb_site_data_store_unittest.cc",
+      "../browser/performance_manager/persistence/site_data/non_recording_site_data_cache_unittest.cc",
+      "../browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc",
+      "../browser/performance_manager/persistence/site_data/site_data_cache_factory_unittest.cc",
+      "../browser/performance_manager/persistence/site_data/site_data_cache_impl_unittest.cc",
+      "../browser/performance_manager/persistence/site_data/site_data_impl_unittest.cc",
+      "../browser/performance_manager/persistence/site_data/site_data_reader_unittest.cc",
+      "../browser/performance_manager/persistence/site_data/site_data_writer_unittest.cc",
+      "../browser/performance_manager/persistence/site_data/unittest_utils.cc",
+      "../browser/performance_manager/persistence/site_data/unittest_utils.h",
+
+      # Urgent discarding from performance_manager isn't supported on Android.
+      "../browser/performance_manager/graph/policies/urgent_page_discarding_policy_unittest.cc",
+
+      # Background tab loading from performance_manager isn't supported on Android.
+      "../browser/performance_manager/graph/policies/background_tab_loading_policy_helpers_unittest.cc",
+      "../browser/performance_manager/graph/policies/background_tab_loading_policy_unittest.cc",
+
       # Android does not use the Message Center notification system.
       "../browser/notifications/notification_ui_manager_unittest.cc",
       "../browser/platform_util_unittest.cc",
@@ -3924,13 +4060,13 @@ test("unit_tests") {
       "../browser/ui/browser_instant_controller_unittest.cc",
       "../browser/ui/browser_unittest.cc",
       "../browser/ui/browser_window_state_unittest.cc",
-      "../browser/ui/chrome_bubble_manager_unittest.cc",
       "../browser/ui/content_settings/content_setting_bubble_model_unittest.cc",
       "../browser/ui/content_settings/content_setting_image_model_unittest.cc",
       "../browser/ui/content_settings/content_setting_media_image_model_unittest.mm",
-      "../browser/ui/cookie_controls/cookie_controls_controller_unittest.cc",
       "../browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc",
       "../browser/ui/extensions/extension_action_view_controller_unittest.cc",
+      "../browser/ui/extensions/extension_installed_bubble_model_unittest.cc",
+      "../browser/ui/extensions/extension_installed_waiter_unittest.cc",
       "../browser/ui/extensions/extension_message_bubble_bridge_unittest.cc",
       "../browser/ui/global_error/global_error_service_unittest.cc",
       "../browser/ui/global_media_controls/cast_media_notification_item_unittest.cc",
@@ -3943,12 +4079,19 @@ test("unit_tests") {
       "../browser/ui/in_product_help/global_media_controls_in_product_help_unittest.cc",
       "../browser/ui/in_product_help/reopen_tab_in_product_help_trigger_unittest.cc",
       "../browser/ui/in_product_help/reopen_tab_in_product_help_unittest.cc",
+      "../browser/ui/manifest_web_app_browser_controller_unittest.cc",
       "../browser/ui/omnibox/chrome_omnibox_navigation_observer_unittest.cc",
       "../browser/ui/omnibox/clipboard_utils_unittest.cc",
       "../browser/ui/page_info/permission_menu_model_unittest.cc",
+      "../browser/ui/passwords/bubble_controllers/auto_sign_in_bubble_controller_unittest.cc",
+      "../browser/ui/passwords/bubble_controllers/generation_confirmation_bubble_controller_unittest.cc",
+      "../browser/ui/passwords/bubble_controllers/items_bubble_controller_unittest.cc",
+      "../browser/ui/passwords/bubble_controllers/save_unsynced_credentials_locally_bubble_controller_unittest.cc",
+      "../browser/ui/passwords/bubble_controllers/save_update_bubble_controller_unittest.cc",
+      "../browser/ui/passwords/bubble_controllers/save_update_with_account_store_bubble_controller_unittest.cc",
+      "../browser/ui/passwords/bubble_controllers/sign_in_promo_bubble_controller_unittest.cc",
       "../browser/ui/passwords/credential_leak_dialog_controller_impl_unittest.cc",
       "../browser/ui/passwords/credential_manager_dialog_controller_impl_unittest.cc",
-      "../browser/ui/passwords/manage_passwords_bubble_model_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",
@@ -3959,6 +4102,7 @@ test("unit_tests") {
       "../browser/ui/tab_contents/chrome_web_contents_view_handle_drop_unittest.cc",
       "../browser/ui/tab_contents/tab_contents_iterator_unittest.cc",
       "../browser/ui/tab_sharing/tab_sharing_infobar_delegate_unittest.cc",
+      "../browser/ui/tabs/existing_window_sub_menu_model_unittest.cc",
       "../browser/ui/tabs/pinned_tab_codec_unittest.cc",
       "../browser/ui/tabs/pinned_tab_service_unittest.cc",
       "../browser/ui/tabs/tab_menu_model_unittest.cc",
@@ -3981,6 +4125,7 @@ test("unit_tests") {
       "../browser/ui/toolbar/toolbar_actions_model_unittest.cc",
       "../browser/ui/web_applications/app_browser_controller_unittest.cc",
       "../browser/ui/web_applications/web_app_launch_utils_unittest.cc",
+      "../browser/ui/webui/components/components_handler_unittest.cc",
       "../browser/ui/webui/downloads/downloads_dom_handler_unittest.cc",
       "../browser/ui/webui/downloads/downloads_list_tracker_unittest.cc",
       "../browser/ui/webui/downloads/mock_downloads_page.cc",
@@ -3990,12 +4135,15 @@ test("unit_tests") {
       "../browser/ui/webui/history/browsing_history_handler_unittest.cc",
       "../browser/ui/webui/managed_ui_handler_unittest.cc",
       "../browser/ui/webui/management_ui_handler_unittest.cc",
+      "../browser/ui/webui/recent_site_settings_helper_unittest.cc",
       "../browser/ui/webui/settings/downloads_handler_unittest.cc",
+      "../browser/ui/webui/settings/hats_handler_unittest.cc",
       "../browser/ui/webui/settings/metrics_reporting_handler_unittest.cc",
       "../browser/ui/webui/settings/on_startup_handler_unittest.cc",
       "../browser/ui/webui/settings/people_handler_unittest.cc",
       "../browser/ui/webui/settings/profile_info_handler_unittest.cc",
       "../browser/ui/webui/settings/reset_settings_handler_unittest.cc",
+      "../browser/ui/webui/settings/safe_browsing_handler_unittest.cc",
       "../browser/ui/webui/settings/safety_check_handler_unittest.cc",
       "../browser/ui/webui/settings/settings_cookies_view_handler_unittest.cc",
       "../browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc",
@@ -4016,6 +4164,7 @@ test("unit_tests") {
       "../browser/usb/usb_chooser_context_unittest.cc",
       "../browser/usb/usb_chooser_controller_unittest.cc",
       "../browser/usb/usb_policy_allowed_devices_unittest.cc",
+      "../browser/usb/usb_tab_helper_unittest.cc",
       "../browser/usb/web_usb_detector_unittest.cc",
       "../browser/usb/web_usb_service_impl_unittest.cc",
       "../browser/webauthn/authenticator_request_dialog_model_unittest.cc",
@@ -4056,6 +4205,7 @@ test("unit_tests") {
       "//chrome/services/app_service/public/cpp:icon_loader_test_support",
       "//chrome/services/app_service/public/cpp:unit_tests",
       "//chrome/services/local_search_service:unit_tests",
+      "//chrome/services/sharing:unit_tests",
       "//components/chrome_cleaner/test:test_name_helper",
       "//components/feature_engagement/test:test_support",
       "//components/send_tab_to_self:test_support",
@@ -4078,19 +4228,22 @@ test("unit_tests") {
       "../browser/apps/app_service/app_service_proxy_unittest.cc",
       "../browser/apps/app_service/app_service_test.cc",
       "../browser/apps/app_service/app_service_test.h",
+      "../browser/apps/app_service/launch_utils_unittest.cc",
       "../browser/apps/intent_helper/apps_navigation_throttle_unittest.cc",
       "../browser/apps/intent_helper/intent_picker_auto_display_service_unittest.cc",
       "../browser/apps/intent_helper/page_transition_util_unittest.cc",
+      "../browser/chooser_controller/mock_chooser_controller_view.cc",
+      "../browser/chooser_controller/mock_chooser_controller_view.h",
       "../browser/devtools/devtools_file_system_indexer_unittest.cc",
       "../browser/devtools/devtools_file_watcher_unittest.cc",
       "../browser/devtools/devtools_ui_bindings_unittest.cc",
       "../browser/devtools/protocol/cast_handler_unittest.cc",
       "../browser/devtools/serialize_host_descriptions_unittest.cc",
       "../browser/download/download_dir_policy_handler_unittest.cc",
+      "../browser/local_search_service/local_search_service_proxy_unittest.cc",
       "../browser/media/webrtc/webrtc_log_uploader_unittest.cc",
       "../browser/media/webrtc/webrtc_rtp_dump_handler_unittest.cc",
       "../browser/media/webrtc/webrtc_rtp_dump_writer_unittest.cc",
-      "../browser/policy/homepage_location_policy_handler_unittest.cc",
       "../browser/policy/local_sync_policy_handler_unittest.cc",
       "../browser/renderer_context_menu/mock_render_view_context_menu.cc",
       "../browser/renderer_context_menu/mock_render_view_context_menu.h",
@@ -4108,6 +4261,8 @@ test("unit_tests") {
       "../browser/sharing/shared_clipboard/shared_clipboard_utils_unittest.cc",
       "../browser/sharing/sms/sms_fetch_request_handler_unittest.cc",
       "../browser/sharing/sms/sms_remote_fetcher_unittest.cc",
+      "../browser/sharing/webrtc/ice_config_fetcher_unittest.cc",
+      "../browser/sharing/webrtc/webrtc_message_handler_unittest.cc",
       "../browser/ui/autofill/payments/local_card_migration_bubble_controller_impl_unittest.cc",
       "../browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc",
       "../browser/ui/bluetooth/bluetooth_chooser_controller_unittest.cc",
@@ -4123,6 +4278,10 @@ test("unit_tests") {
       "../browser/ui/toolbar/media_router_contextual_menu_unittest.cc",
       "../browser/ui/toolbar/mock_media_router_action_controller.cc",
       "../browser/ui/toolbar/mock_media_router_action_controller.h",
+      "../browser/ui/views/passwords/password_bubble_view_test_base.cc",
+      "../browser/ui/views/passwords/password_bubble_view_test_base.h",
+      "../browser/ui/views/passwords/password_save_unsynced_credentials_locally_view_unittest.cc",
+      "../browser/ui/views/passwords/password_save_update_with_account_store_view_unittest.cc",
       "../common/media_router/discovery/media_sink_internal_unittest.cc",
       "../common/media_router/discovery/media_sink_service_base_unittest.cc",
       "../common/media_router/mojom/media_router_mojom_traits_unittest.cc",
@@ -4131,7 +4290,7 @@ test("unit_tests") {
     ]
 
     deps += [
-      "//components/bubble:test_support",
+      "//chrome/services/local_search_service:test_utils",
       "//services/network:test_support",
     ]
 
@@ -4183,10 +4342,10 @@ test("unit_tests") {
     sources += [
       "../browser/component_updater/cros_component_installer_chromeos_unittest.cc",
       "../browser/component_updater/metadata_table_chromeos_unittest.cc",
+      "../browser/enterprise/reporting/android_app_info_generator_unittest.cc",
       "../browser/extensions/api/terminal/crostini_startup_status_unittest.cc",
       "../browser/google/google_brand_code_map_chromeos_unittest.cc",
       "../browser/media/webrtc/desktop_media_list_ash_unittest.cc",
-      "../browser/metrics/perf/heap_collector_unittest.cc",
       "../browser/metrics/perf/metric_collector_unittest.cc",
       "../browser/metrics/perf/metric_provider_unittest.cc",
       "../browser/metrics/perf/perf_events_collector_unittest.cc",
@@ -4195,6 +4354,7 @@ test("unit_tests") {
       "../browser/metrics/perf/profile_provider_chromeos_unittest.cc",
       "../browser/metrics/perf/windowed_incognito_observer_unittest.cc",
       "../browser/notifications/chrome_ash_message_center_client_unittest.cc",
+      "../browser/notifications/web_page_notifier_controller_unittest.cc",
       "../browser/signin/signin_error_notifier_ash_unittest.cc",
       "../browser/speech/tts_chromeos_unittest.cc",
       "../browser/sync/sync_error_notifier_ash_unittest.cc",
@@ -4207,6 +4367,7 @@ test("unit_tests") {
       "../browser/ui/app_list/arc/arc_app_test.h",
       "../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_default_app_list_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",
@@ -4218,12 +4379,15 @@ test("unit_tests") {
       "../browser/ui/app_list/search/arc/arc_app_shortcuts_search_provider_unittest.cc",
       "../browser/ui/app_list/search/arc/arc_playstore_search_provider_unittest.cc",
       "../browser/ui/app_list/search/common/file_icon_util_unittest.cc",
+      "../browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker_unittest.cc",
       "../browser/ui/app_list/search/cros_action_history/cros_action_recorder_unittest.cc",
       "../browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc",
       "../browser/ui/app_list/search/search_result_ranker/app_launch_event_logger_unittest.cc",
+      "../browser/ui/app_list/search/search_result_ranker/app_launch_predictor_test_util.h",
       "../browser/ui/app_list/search/search_result_ranker/app_launch_predictor_unittest.cc",
       "../browser/ui/app_list/search/search_result_ranker/app_list_launch_metrics_provider_unittest.cc",
       "../browser/ui/app_list/search/search_result_ranker/app_search_result_ranker_unittest.cc",
+      "../browser/ui/app_list/search/search_result_ranker/chip_ranker_unittest.cc",
       "../browser/ui/app_list/search/search_result_ranker/frecency_store_unittest.cc",
       "../browser/ui/app_list/search/search_result_ranker/histogram_util_unittest.cc",
       "../browser/ui/app_list/search/search_result_ranker/ml_app_rank_provider_unittest.cc",
@@ -4245,6 +4409,8 @@ test("unit_tests") {
       "../browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc",
       "../browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc",
       "../browser/ui/ash/assistant/assistant_state_client_unittest.cc",
+      "../browser/ui/ash/assistant/conversation_starters_parser_unittest.cc",
+      "../browser/ui/ash/assistant/device_actions_unittest.cc",
       "../browser/ui/ash/ime_controller_client_unittest.cc",
       "../browser/ui/ash/keyboard/chrome_keyboard_ui_unittest.cc",
       "../browser/ui/ash/keyboard/chrome_keyboard_web_contents_unittest.cc",
@@ -4275,6 +4441,8 @@ test("unit_tests") {
       "//ash/strings",
       "//chrome/browser/chromeos:test_support",
       "//chrome/browser/resources/chromeos/zip_archiver/cpp:ziparchiver_unittests",
+      "//chrome/browser/ui/app_list/search/search_result_ranker:app_launch_predictor_proto",
+      "//chrome/browser/ui/app_list/search/search_result_ranker:recurrence_ranker_proto",
       "//chromeos/services/machine_learning/public/cpp:test_support",
       "//components/arc:arc_test_support",
     ]
@@ -4304,6 +4472,20 @@ test("unit_tests") {
       "../tools/convert_dict/convert_dict_unittest.cc",
     ]
 
+    if (!is_mac) {
+      sources += [ "../tools/convert_dict/aff_reader_unittest.cc" ]
+    }
+
+    data += [
+      "data/convert_dict/affix-flags.aff",
+      "data/convert_dict/empty.aff",
+      "data/convert_dict/indexed-affix.aff",
+      "data/convert_dict/leading-comment.aff",
+      "data/convert_dict/other-commands.aff",
+      "data/convert_dict/prefix-suffix.aff",
+      "data/convert_dict/rep.aff",
+    ]
+
     if (use_renderer_spellchecker) {
       sources +=
           [ "../browser/spellchecker/spell_check_host_chrome_impl_unittest.cc" ]
@@ -4320,8 +4502,7 @@ test("unit_tests") {
       "../../apps/saved_files_service_unittest.cc",
       "../../tools/json_schema_compiler/test/features_generation_unittest.cc",
       "../browser/apps/app_shim/app_shim_host_mac_unittest.cc",
-      "../browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc",
-      "../browser/apps/platform_apps/app_shim_registry_mac_unittest.cc",
+      "../browser/apps/app_shim/app_shim_manager_mac_unittest.cc",
       "../browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc",
       "../browser/browsing_data/counters/hosted_apps_counter_unittest.cc",
       "../browser/extensions/active_tab_unittest.cc",
@@ -4353,6 +4534,7 @@ test("unit_tests") {
       "../browser/extensions/api/declarative_content/declarative_content_css_condition_tracker_unittest.cc",
       "../browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker_unittest.cc",
       "../browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker_unittest.cc",
+      "../browser/extensions/api/declarative_net_request/action_tracker_unittest.cc",
       "../browser/extensions/api/declarative_net_request/dnr_test_base.cc",
       "../browser/extensions/api/declarative_net_request/dnr_test_base.h",
       "../browser/extensions/api/declarative_net_request/rule_indexing_unittest.cc",
@@ -4367,6 +4549,7 @@ test("unit_tests") {
       "../browser/extensions/api/extension_action/extension_action_api_unittest.cc",
       "../browser/extensions/api/file_system/file_system_api_unittest.cc",
       "../browser/extensions/api/identity/extension_token_key_unittest.cc",
+      "../browser/extensions/api/identity/gaia_remote_consent_flow_unittest.cc",
       "../browser/extensions/api/identity/gaia_web_auth_flow_unittest.cc",
       "../browser/extensions/api/identity/identity_api_unittest.cc",
       "../browser/extensions/api/identity/identity_mint_queue_unittest.cc",
@@ -4384,6 +4567,7 @@ test("unit_tests") {
       "../browser/extensions/api/management/management_api_unittest.cc",
       "../browser/extensions/api/notifications/extension_notification_handler_unittest.cc",
       "../browser/extensions/api/omnibox/omnibox_unittest.cc",
+      "../browser/extensions/api/passwords_private/password_check_delegate_unittest.cc",
       "../browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc",
       "../browser/extensions/api/passwords_private/passwords_private_utils_unittest.cc",
       "../browser/extensions/api/permissions/permissions_api_helpers_unittest.cc",
@@ -4412,12 +4596,12 @@ test("unit_tests") {
       "../browser/extensions/api/web_request/web_request_permissions_unittest.cc",
       "../browser/extensions/api/webstore_private/extension_install_status_unittest.cc",
       "../browser/extensions/api/webstore_private/webstore_private_unittest.cc",
-      "../browser/extensions/app_data_migrator_unittest.cc",
       "../browser/extensions/blacklist_check_unittest.cc",
       "../browser/extensions/blacklist_state_fetcher_unittest.cc",
       "../browser/extensions/chrome_app_icon_unittest.cc",
       "../browser/extensions/chrome_app_sorting_unittest.cc",
       "../browser/extensions/chrome_component_extension_resource_manager_unittest.cc",
+      "../browser/extensions/chrome_content_verifier_unittest.cc",
       "../browser/extensions/chrome_extension_function_unittest.cc",
       "../browser/extensions/chrome_info_map_unittest.cc",
       "../browser/extensions/component_loader_unittest.cc",
@@ -4497,7 +4681,6 @@ test("unit_tests") {
       "../browser/extensions/webstore_installer_unittest.cc",
       "../browser/extensions/zipfile_installer_unittest.cc",
       "../browser/media/cast_transport_host_filter_unittest.cc",
-      "../browser/media_galleries/chromeos/mtp_device_object_enumerator_unittest.cc",
       "../browser/metrics/extensions_metrics_provider_unittest.cc",
       "../browser/notifications/notification_system_observer_unittest.cc",
       "../browser/policy/chrome_extension_policy_migrator_unittest.cc",
@@ -4579,7 +4762,6 @@ test("unit_tests") {
       "../common/extensions/chrome_manifest_url_handlers_unittest.cc",
       "../common/extensions/command_unittest.cc",
       "../common/extensions/extension_unittest.cc",
-      "../common/extensions/feature_switch_unittest.cc",
       "../common/extensions/manifest_handlers/app_display_mode_manifest_unittest.cc",
       "../common/extensions/manifest_handlers/app_theme_color_manifest_unittest.cc",
       "../common/extensions/manifest_handlers/automation_unittest.cc",
@@ -4588,7 +4770,6 @@ test("unit_tests") {
       "../common/extensions/manifest_handlers/extension_action_handler_unittest.cc",
       "../common/extensions/manifest_handlers/natively_connectable_handler_unittest.cc",
       "../common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc",
-      "../common/extensions/manifest_handlers/ui_overrides_handler_unittest.cc",
       "../common/extensions/manifest_tests/chrome_manifest_test.cc",
       "../common/extensions/manifest_tests/chrome_manifest_test.h",
       "../common/extensions/manifest_tests/extension_manifests_about_unittest.cc",
@@ -4640,6 +4821,10 @@ test("unit_tests") {
       "../utility/image_writer/image_writer_unittest.cc",
     ]
 
+    if (enable_autofill_assistant_api) {
+      sources += [ "../browser/extensions/api/autofill_assistant_private/extension_access_token_fetcher_unittest.cc" ]
+    }
+
     allow_circular_includes_from = [
       "//chrome/browser/web_applications:web_applications_unit_tests",
       "//chrome/browser/web_applications/extensions:unit_tests",
@@ -4671,16 +4856,21 @@ test("unit_tests") {
       sources += [ "../browser/extensions/api/mdns/mdns_api_unittest.cc" ]
     }
     if (is_win) {
-      sources +=
-          [ "../browser/extensions/external_registry_loader_win_unittest.cc" ]
+      sources += [
+        "../browser/extensions/external_registry_loader_win_unittest.cc",
+        "../browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc",
+        "../browser/media_galleries/win/mtp_device_object_enumerator_unittest.cc",
+      ]
     }
     if (is_chromeos) {
       sources += [
+        "../browser/chromeos/extensions/extensions_permissions_tracker_unittest.cc",
         "../browser/chromeos/login/easy_unlock/easy_unlock_auth_attempt_unittest.cc",
         "../browser/chromeos/login/easy_unlock/easy_unlock_notification_controller_chromeos_unittest.cc",
         "../browser/chromeos/login/easy_unlock/easy_unlock_screenlock_state_handler_unittest.cc",
         "../browser/chromeos/login/easy_unlock/easy_unlock_service_regular_unittest.cc",
         "../browser/extensions/api/file_system/consent_provider_unittest.cc",
+        "../browser/media_galleries/chromeos/mtp_device_object_enumerator_unittest.cc",
         "../browser/ui/webui/about_ui_unittest.cc",
       ]
     } else {
@@ -4705,13 +4895,9 @@ test("unit_tests") {
     sources += [
       "../browser/shell_integration_linux_unittest.cc",
       "../browser/ui/input_method/input_method_engine_unittest.cc",
+      "../browser/upgrade_detector/get_installed_version_linux_unittest.cc",
     ]
   }
-  if (use_gtk) {
-    sources +=
-        [ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
-    deps += [ "//build/config/linux/gtk" ]
-  }
 
   if (is_android || is_chromeos) {
     sources += [ "../browser/media/protected_media_identifier_permission_context_unittest.cc" ]
@@ -4729,9 +4915,6 @@ test("unit_tests") {
   if (use_gio) {
     configs += [ "//build/linux:gio_config" ]
   }
-  if (!is_chromeos && !use_ozone && is_linux) {
-    deps += [ "//chrome/browser/ui/libgtkui" ]
-  }
 
   if (enable_service_discovery) {
     sources += [
@@ -4758,29 +4941,37 @@ test("unit_tests") {
   if (safe_browsing_mode > 0) {
     sources += [
       "../browser/safe_browsing/certificate_reporting_service_unittest.cc",
+      "../browser/safe_browsing/chrome_password_protection_service_unittest.cc",
       "../browser/safe_browsing/safe_browsing_blocking_page_unittest.cc",
       "../browser/safe_browsing/threat_details_unittest.cc",
       "../browser/safe_browsing/ui_manager_unittest.cc",
-      "../common/safe_browsing/file_type_policies_test_util.cc",
-      "../common/safe_browsing/file_type_policies_test_util.h",
-      "../common/safe_browsing/file_type_policies_unittest.cc",
     ]
+
+    # TODO(crbug/1056278): Enable this on Fuchsia
+    if (!is_fuchsia) {
+      deps +=
+          [ "//components/safe_browsing/core:file_type_policies_test_support" ]
+    }
   }
+
   if (safe_browsing_mode == 1) {
     # TODO(sgurun): enable tests for safe_browsing==2.
     sources += [
       "../browser/safe_browsing/advanced_protection_status_manager_factory_unittest.cc",
       "../browser/safe_browsing/advanced_protection_status_manager_unittest.cc",
       "../browser/safe_browsing/browser_feature_extractor_unittest.cc",
-      "../browser/safe_browsing/chrome_password_protection_service_unittest.cc",
       "../browser/safe_browsing/client_side_detection_host_unittest.cc",
       "../browser/safe_browsing/client_side_detection_service_unittest.cc",
       "../browser/safe_browsing/client_side_model_loader_unittest.cc",
       "../browser/safe_browsing/cloud_content_scanning/binary_fcm_service_unittest.cc",
       "../browser/safe_browsing/cloud_content_scanning/binary_upload_service_unittest.cc",
       "../browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_delegate_unittest.cc",
+      "../browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.cc",
+      "../browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.h",
       "../browser/safe_browsing/cloud_content_scanning/deep_scanning_utils_unittest.cc",
+      "../browser/safe_browsing/cloud_content_scanning/file_source_request_unittest.cc",
       "../browser/safe_browsing/cloud_content_scanning/multipart_uploader_unittest.cc",
+      "../browser/safe_browsing/download_protection/deep_scanning_request_unittest.cc",
       "../browser/safe_browsing/download_protection/download_feedback_service_unittest.cc",
       "../browser/safe_browsing/download_protection/download_feedback_unittest.cc",
       "../browser/safe_browsing/download_protection/download_item_request_unittest.cc",
@@ -4813,6 +5004,7 @@ test("unit_tests") {
       "../browser/safe_browsing/local_two_phase_testserver.h",
       "../browser/safe_browsing/safe_browsing_navigation_observer_unittest.cc",
       "../browser/safe_browsing/signature_evaluator_mac_unittest.cc",
+      "../browser/safe_browsing/verdict_cache_manager_factory_unittest.cc",
       "../common/safe_browsing/binary_feature_extractor_mac_unittest.cc",
       "../common/safe_browsing/binary_feature_extractor_unittest.cc",
       "../common/safe_browsing/binary_feature_extractor_win_unittest.cc",
@@ -4838,11 +5030,11 @@ test("unit_tests") {
       ":test_proto",
       "../common/safe_browsing:mock_binary_feature_extractor",
       "//chrome/services/file_util/public/cpp:unit_tests",
-      "//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",
-      "//components/safe_browsing/triggers:ad_redirect_trigger",
+      "//components/safe_browsing/content/renderer:websocket_sb_handshake_throttle_unittest",
+      "//components/safe_browsing/content/triggers:ad_redirect_trigger",
+      "//components/safe_browsing/core:ping_manager_unittest",
+      "//components/safe_browsing/core/browser:token_fetcher_unittest",
+      "//components/safe_browsing/core/db:v4_test_util",
     ]
   } else if (safe_browsing_mode == 2) {
     sources += [ "../browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc" ]
@@ -4890,6 +5082,8 @@ test("unit_tests") {
         "../browser/printing/test_printer_query.cc",
         "../browser/printing/test_printer_query.h",
         "../browser/ui/webui/print_preview/extension_printer_handler_unittest.cc",
+        "../browser/ui/webui/print_preview/fake_print_render_frame.cc",
+        "../browser/ui/webui/print_preview/fake_print_render_frame.h",
         "../browser/ui/webui/print_preview/pdf_printer_handler_unittest.cc",
         "../browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc",
         "../browser/ui/webui/print_preview/print_preview_handler_unittest.cc",
@@ -4919,6 +5113,7 @@ test("unit_tests") {
         sources += [
           "../browser/ui/webui/print_preview/local_printer_handler_chromeos_unittest.cc",
           "../browser/ui/webui/settings/chromeos/cups_printers_handler_unittest.cc",
+          "../browser/ui/webui/settings/chromeos/server_printer_url_util_unittest.cc",
         ]
       }
     } else {
@@ -4926,13 +5121,6 @@ test("unit_tests") {
     }
   }
 
-  if (enable_captive_portal_detection) {
-    sources += [
-      "../browser/captive_portal/captive_portal_service_unittest.cc",
-      "../browser/captive_portal/captive_portal_tab_helper_unittest.cc",
-      "../browser/captive_portal/captive_portal_tab_reloader_unittest.cc",
-    ]
-  }
   if (enable_session_service) {
     sources += [
       "../browser/sessions/session_restore_observer_unittest.cc",
@@ -4997,8 +5185,6 @@ test("unit_tests") {
       "../browser/ui/cocoa/scoped_menu_bar_lock_unittest.mm",
       "../browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm",
       "../browser/ui/cocoa/tab_menu_bridge_unittest.mm",
-      "../browser/ui/cocoa/test/cocoa_profile_test.h",
-      "../browser/ui/cocoa/test/cocoa_profile_test.mm",
       "../browser/ui/cocoa/test/run_loop_testing_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",
@@ -5018,7 +5204,7 @@ test("unit_tests") {
     if (is_android) {
       deps += [ "//chrome/android:chrome_apk_paks" ]
     } else {
-      deps += [ "//chrome:packed_resources" ]
+      data_deps += [ "//chrome:packed_resources" ]
     }
   }
   if (is_win || is_mac || is_chromeos) {
@@ -5029,18 +5215,11 @@ test("unit_tests") {
     deps += [ "//rlz:test_support" ]
   }
   if (is_win) {
-    if (!is_component_build) {
-      # The PDB gets too large for incremental linking.
-      configs -= [ "//build/config/win:default_incremental_linking" ]
-      configs +=
-          [ "//build/config/win:default_large_module_incremental_linking" ]
-    }
-
     sources += [
       "../browser/notifications/win/notification_image_retainer_unittest.cc",
       "../browser/notifications/win/notification_template_builder_unittest.cc",
-      "../browser/performance_monitor/wmi_refresher_unittest.cc",
       "../browser/ui/input_method/input_method_engine_unittest.cc",
+      "../browser/ui/views/uninstall_view_unittest.cc",
     ]
     deps += [
       "//chrome:other_version",
@@ -5079,6 +5258,7 @@ test("unit_tests") {
   }
   if (!is_android && !is_chromeos) {
     sources += [
+      "../browser/device_identity/device_oauth2_token_store_desktop_unittest.cc",
       "../browser/media/webrtc/native_desktop_media_list_unittest.cc",
       "../browser/metrics/upgrade_metrics_provider_unittest.cc",
       "../browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc",
@@ -5090,34 +5270,43 @@ test("unit_tests") {
       "../browser/ui/views/sharing/sharing_dialog_view_unittest.cc",
       "../browser/ui/webui/signin/signin_create_profile_handler_unittest.cc",
       "../browser/ui/webui/signin/signin_error_handler_unittest.cc",
+      "../browser/upgrade_detector/installed_version_poller_unittest.cc",
       "../browser/upgrade_detector/upgrade_detector_impl_unittest.cc",
     ]
   }
   if (is_chromeos) {
-    sources +=
-        [ "../browser/upgrade_detector/upgrade_detector_chromeos_unittest.cc" ]
+    sources += [
+      "../browser/upgrade_detector/installed_version_updater_chromeos_unittest.cc",
+      "../browser/upgrade_detector/upgrade_detector_chromeos_unittest.cc",
+    ]
   }
   if (toolkit_views) {
     deps += [
       "//components/web_modal:test_support",
+      "//content/test:test_support",
       "//ui/views",
       "//ui/views:test_support",
+      "//ui/web_dialogs:test_support",
     ]
     sources += [
+      "../../ui/views/controls/webview/web_dialog_view_unittest.cc",
       "../../ui/views/controls/webview/webview_unittest.cc",
       "../browser/ui/views/accelerator_table_unittest.cc",
       "../browser/ui/views/accelerator_table_unittest_mac.mm",
       "../browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc",
       "../browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc",
       "../browser/ui/views/autofill/autofill_popup_view_native_views_unittest.cc",
+      "../browser/ui/views/autofill/autofill_popup_view_utils_unittest.cc",
       "../browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc",
       "../browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc",
       "../browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc",
       "../browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc",
       "../browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc",
       "../browser/ui/views/confirm_bubble_views_unittest.cc",
+      "../browser/ui/views/content_setting_bubble_contents_unittest.cc",
       "../browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc",
       "../browser/ui/views/device_chooser_content_view_unittest.cc",
+      "../browser/ui/views/download/download_in_progress_dialog_view_unittest.cc",
       "../browser/ui/views/download/download_item_view_unittest.cc",
       "../browser/ui/views/extensions/chooser_dialog_view_unittest.cc",
       "../browser/ui/views/extensions/extensions_menu_item_unittest.cc",
@@ -5130,7 +5319,6 @@ test("unit_tests") {
       "../browser/ui/views/frame/test_with_browser_view.h",
       "../browser/ui/views/frame/web_contents_close_handler_unittest.cc",
       "../browser/ui/views/fullscreen_control/fullscreen_control_popup_unittest.cc",
-      "../browser/ui/views/global_error_bubble_view_unittest.cc",
       "../browser/ui/views/global_media_controls/media_notification_container_impl_view_unittest.cc",
       "../browser/ui/views/global_media_controls/media_notification_list_view_unittest.cc",
       "../browser/ui/views/hover_button_unittest.cc",
@@ -5155,6 +5343,7 @@ test("unit_tests") {
       "../browser/ui/views/payments/payment_request_item_list_unittest.cc",
       "../browser/ui/views/payments/validating_textfield_unittest.cc",
       "../browser/ui/views/payments/view_stack_unittest.cc",
+      "../browser/ui/views/permission_bubble/permission_prompt_bubble_view_unittest.cc",
       "../browser/ui/views/profiles/avatar_toolbar_button_unittest.cc",
       "../browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc",
       "../browser/ui/views/relaunch_notification/relaunch_required_timer_internal_unittest.cc",
@@ -5176,19 +5365,23 @@ test("unit_tests") {
       "../browser/ui/views/toolbar/toolbar_button_unittest.cc",
       "../browser/ui/views/translate/translate_bubble_view_unittest.cc",
     ]
-    if (enable_native_window_nav_buttons) {
+    if (is_desktop_linux) {
       sources += [ "../browser/ui/views/frame/desktop_linux_browser_frame_view_layout_unittest.cc" ]
     }
     if (enable_plugins) {
       sources += [ "../browser/ui/views/hung_plugin_tab_helper_unittest.cc" ]
     }
     if (is_mac) {
-      sources += [ "../browser/ui/views/frame/browser_non_client_frame_view_mac_unittest.mm" ]
+      sources += [
+        "../browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm",
+        "../browser/ui/views/frame/browser_non_client_frame_view_mac_unittest.mm",
+      ]
     }
     if (!is_chromeos) {
       sources += [
         "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc",
         "../browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc",
+        "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_unittest.cc",
       ]
     }
     if ((is_linux && !is_chromeos) || is_win) {
@@ -5237,6 +5430,9 @@ test("unit_tests") {
       "//chrome/browser/supervised_user/supervised_user_error_page:unit_tests",
     ]
   }
+  if (enable_supervised_users && is_chromeos) {
+    sources += [ "../browser/supervised_user/child_accounts/secondary_account_consent_logger_unittest.cc" ]
+  }
   if (safe_browsing_mode == 1 && enable_extensions) {
     sources += [ "../browser/extensions/blacklist_unittest.cc" ]
   }
@@ -5281,9 +5477,7 @@ test("unit_tests") {
 
 static_library("test_support_unit") {
   testonly = true
-  sources = [
-    "base/run_all_unittests.cc",
-  ]
+  sources = [ "base/run_all_unittests.cc" ]
 
   public_deps = [
     ":test_support",
@@ -5297,9 +5491,7 @@ static_library("test_support_unit") {
   deps = []
 
   if (is_win) {
-    deps = [
-      "//chrome/install_static/test:test_support",
-    ]
+    deps = [ "//chrome/install_static/test:test_support" ]
   }
 
   if (is_chromeos) {
@@ -5318,8 +5510,6 @@ if (!is_android) {
     testonly = true
 
     sources = [
-      "../browser/permissions/permission_request_manager_test_api.cc",
-      "../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",
@@ -5343,6 +5533,8 @@ if (!is_android) {
       "base/ui_test_utils.h",
       "base/web_ui_browser_test.cc",
       "base/web_ui_browser_test.h",
+      "permissions/permission_request_manager_test_api.cc",
+      "permissions/permission_request_manager_test_api.h",
     ]
 
     configs += [ "//build/config:precompiled_headers" ]
@@ -5355,6 +5547,7 @@ if (!is_android) {
     ]
     deps = [
       "//chrome/common/profiler",
+      "//components/captive_portal/core:buildflags",
       "//components/metrics:test_support",
       "//components/nacl/common:buildflags",
       "//components/os_crypt:test_support",
@@ -5394,9 +5587,7 @@ if (!is_android) {
   import("//third_party/protobuf/proto_library.gni")
 
   proto_library("test_proto") {
-    sources = [
-      "../common/safe_browsing/ipc_protobuf_message_test.proto",
-    ]
+    sources = [ "../common/safe_browsing/ipc_protobuf_message_test.proto" ]
   }
 
   if (is_chromeos) {
@@ -5461,12 +5652,12 @@ if (!is_android) {
   test("interactive_ui_tests") {
     sources = [
       "../browser/about_flags_browsertest.cc",
-      "../browser/apps/app_shim/app_shim_interactive_uitest_mac.mm",
-      "../browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm",
       "../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_shim_interactive_uitest_mac.mm",
+      "../browser/apps/platform_apps/app_shim_quit_interactive_uitest_mac.mm",
       "../browser/apps/platform_apps/app_window_interactive_uitest.cc",
       "../browser/apps/platform_apps/app_window_interactive_uitest_base.cc",
       "../browser/apps/platform_apps/app_window_interactive_uitest_base.h",
@@ -5488,6 +5679,7 @@ if (!is_android) {
       "../browser/extensions/extension_fullscreen_apitest.cc",
       "../browser/extensions/extension_function_test_utils.cc",
       "../browser/extensions/extension_keybinding_apitest.cc",
+      "../browser/extensions/omnibox_focus_interactive_test.cc",
       "../browser/extensions/window_open_interactive_apitest.cc",
       "../browser/global_keyboard_shortcuts_mac_browsertest.mm",
       "../browser/mouse_events_interactive_uitest.cc",
@@ -5496,11 +5688,13 @@ if (!is_android) {
       "../browser/password_manager/password_manager_interactive_test_base.cc",
       "../browser/password_manager/password_manager_interactive_test_base.h",
       "../browser/password_manager/password_manager_interactive_uitest.cc",
+      "../browser/portal/portal_interactive_uittest.cc",
       "../browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc",
       "../browser/renderer_context_menu/render_view_context_menu_browsertest_util.h",
       "../browser/resource_coordinator/tab_metrics_logger_interactive_uitest.cc",
       "../browser/site_isolation/site_per_process_interactive_browsertest.cc",
       "../browser/site_isolation/site_per_process_text_input_browsertest.cc",
+      "../browser/spellchecker/spellcheck_mac_view_interactive_uitest.mm",
       "../browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc",
       "../browser/ui/blocked_content/popup_blocker_browsertest.cc",
       "../browser/ui/browser_command_controller_interactive_browsertest.cc",
@@ -5524,14 +5718,18 @@ if (!is_android) {
       "../browser/ui/search/instant_test_base.cc",
       "../browser/ui/search/instant_test_base.h",
       "../browser/ui/search/local_ntp_uitest.cc",
+      "../browser/ui/search/third_party_ntp_uitest.cc",
       "../browser/ui/send_mouse_move_uitest_win.cc",
       "../browser/ui/signin_view_controller_interactive_uitest.cc",
       "../browser/ui/startup/invalid_user_data_dir_interactive_uitest.cc",
       "../browser/ui/startup/startup_browser_creator_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/ui/views/content_test_utils.cc",
+      "../browser/ui/views/content_test_utils.h",
       "../browser/ui/views/tabs/tab_spinner_interactive_uitest.cc",
+      "../browser/ui/views/web_apps/web_app_frame_toolbar_interactive_uitest.cc",
+      "../browser/ui/views/web_dialog_view_browsertest.cc",
       "../browser/webauth_interactive_uitest.cc",
       "//ui/base/clipboard/clipboard_unittest.cc",
       "base/always_on_top_window_killer_win.cc",
@@ -5570,7 +5768,7 @@ if (!is_android) {
       "//ppapi/tests/test_page.css.mock-http-headers",
       "//third_party/mocha/mocha.js",
       "//third_party/polymer/v1_0/components-chromium/iron-test-helpers/mock-interactions.js",
-      "//third_party/pywebsocket/src/mod_pywebsocket/",
+      "//third_party/pywebsocket3/src/mod_pywebsocket/",
       "//third_party/tlslite/",
       "//third_party/zlib/google/test/data/",
       "//tools/metrics/histograms/enums.xml",
@@ -5579,18 +5777,8 @@ if (!is_android) {
       "$root_out_dir/test_case.html.mock-http-headers",
       "$root_out_dir/test_page.css",
       "$root_out_dir/test_page.css.mock-http-headers",
-      "$root_out_dir/ui_test.pak",
     ]
     data += js2gtest_js_libraries
-    if (is_linux || is_win) {
-      data += [
-        "$root_out_dir/chrome_100_percent.pak",
-        "$root_out_dir/chrome_200_percent.pak",
-        "$root_out_dir/locales/en-US.pak",
-        "$root_out_dir/locales/fr.pak",
-        "$root_out_dir/resources.pak",
-      ]
-    }
     if (is_linux) {
       data += [ "$root_out_dir/libppapi_tests.so" ]
     }
@@ -5637,7 +5825,6 @@ if (!is_android) {
       "//ui/base:test_support",
       "//ui/base/clipboard:clipboard_test_support",
       "//ui/events:events_interactive_ui_tests",
-      "//ui/resources:ui_test_pak",
       "//ui/web_dialogs:test_support",
     ]
 
@@ -5648,8 +5835,13 @@ if (!is_android) {
     # Runtime dependencies
     data_deps = [
       "//ppapi:ppapi_tests",
+      "//testing/buildbot/filters:interactive_ui_tests_filters",
       "//third_party/mesa_headers",
+      "//ui/resources:ui_test_pak_data",
     ]
+    if (is_linux || is_win) {
+      data_deps += [ "//chrome:packed_resources" ]
+    }
 
     if (use_aura) {
       sources += [ "../browser/ui/views/drag_and_drop_interactive_uitest.cc" ]
@@ -5669,6 +5861,7 @@ if (!is_android) {
         "../browser/ui/views/constrained_window_views_browsertest.cc",
         "../browser/ui/views/exclusive_access_bubble_views_interactive_uitest.cc",
         "../browser/ui/views/extensions/extension_dialog_interactive_uitest.cc",
+        "../browser/ui/views/extensions/extensions_toolbar_interactive_ui_test.cc",
         "../browser/ui/views/find_bar_views_interactive_uitest.cc",
         "../browser/ui/views/frame/browser_view_focus_uitest.cc",
         "../browser/ui/views/frame/browser_view_interactive_uitest.cc",
@@ -5688,6 +5881,7 @@ if (!is_android) {
         "../browser/ui/views/omnibox/omnibox_view_views_browsertest.cc",
         "../browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc",
         "../browser/ui/views/passwords/password_bubble_interactive_uitest.cc",
+        "../browser/ui/views/permission_bubble/permission_bubble_interactive_uitest.cc",
         "../browser/ui/views/sad_tab_view_interactive_uitest.cc",
         "../browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc",
         "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc",
@@ -5717,15 +5911,10 @@ if (!is_android) {
           # suites, it seems like one or another starts timing out too.
           "../browser/ui/views/keyboard_access_browsertest.cc",
         ]
-        if (!use_ozone) {
-          sources += [
-            "../browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc",
-          ]
-          deps += [ "//build/config/linux/gtk" ]
-        }
       }
       if (!is_chromeos) {
         sources += [ "../browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc" ]
+        deps += [ "../browser/media/router:test_support" ]
       }
       if (use_aura || is_mac) {
         deps += [ "//ui/touch_selection" ]
@@ -5744,6 +5933,13 @@ if (!is_android) {
       }
     }
 
+    # tab_spinner_interactive_uitest.cc is a UIPerformanceTest, so excluding
+    # it. See below for the details.
+    if (using_sanitizer) {
+      sources -=
+          [ "../browser/ui/views/tabs/tab_spinner_interactive_uitest.cc" ]
+    }
+
     if (is_chromeos) {
       deps += [
         "//chrome/browser/media/router:test_support",
@@ -5755,24 +5951,31 @@ if (!is_android) {
         # Use only the _chromeos version on Ash / Chrome OS.
         "../browser/ui/views/test/view_event_test_platform_part_default.cc",
       ]
-      sources += [
-        "../browser/ui/app_list/app_list_client_interactive_uitest.cc",
-        "../browser/ui/ash/drag_to_overview_interactive_uitest.cc",
-        "../browser/ui/ash/homescreen_interactive_uitest.cc",
-        "../browser/ui/ash/launcher_animations_interactive_uitest.cc",
-        "../browser/ui/ash/launcher_drag_interactive_uitest.cc",
-        "../browser/ui/ash/launcher_page_switches_interactive_uitest.cc",
-        "../browser/ui/ash/overview_animations_interactive_uitest.cc",
-        "../browser/ui/ash/overview_scroll_interactive_uitest.cc",
-        "../browser/ui/ash/overview_window_drag_interactive_uitest.cc",
-        "../browser/ui/ash/screen_rotation_interactive_uitest.cc",
-        "../browser/ui/ash/split_view_interactive_uitest.cc",
-        "../browser/ui/ash/tablet_mode_transition_interactive_uitest.cc",
-        "../browser/ui/ash/window_resize_interactive_uitest.cc",
-        "../browser/ui/views/tabs/tab_hover_interactive_uitest.cc",
-        "base/perf/drag_event_generator.cc",
-        "base/perf/drag_event_generator.h",
-      ]
+      sources +=
+          [ "../browser/ui/app_list/app_list_client_interactive_uitest.cc" ]
+
+      # UIPerformanceTests in interactive_ui_tests. Since flakiness is usually
+      # observed on those tests when sanitizer is enabled, and considering that
+      # their performance numbers won't be useful anyways, these tests are
+      # excluded from builds with sanitizer. See https://crbug.com/1057868.
+      if (!using_sanitizer) {
+        sources += [
+          "../browser/ui/ash/homescreen_interactive_uitest.cc",
+          "../browser/ui/ash/launcher_animations_interactive_uitest.cc",
+          "../browser/ui/ash/launcher_drag_interactive_uitest.cc",
+          "../browser/ui/ash/launcher_page_switches_interactive_uitest.cc",
+          "../browser/ui/ash/overview_animations_interactive_uitest.cc",
+          "../browser/ui/ash/overview_scroll_interactive_uitest.cc",
+          "../browser/ui/ash/overview_window_drag_interactive_uitest.cc",
+          "../browser/ui/ash/screen_rotation_interactive_uitest.cc",
+          "../browser/ui/ash/split_view_interactive_uitest.cc",
+          "../browser/ui/ash/tablet_mode_transition_interactive_uitest.cc",
+          "../browser/ui/ash/window_resize_interactive_uitest.cc",
+          "../browser/ui/views/tabs/tab_hover_interactive_uitest.cc",
+          "base/perf/drag_event_generator.cc",
+          "base/perf/drag_event_generator.h",
+        ]
+      }
     } else {  # ! is_chromeos
       # Non-ChromeOS notifications tests.
       sources += [
@@ -5805,10 +6008,6 @@ if (!is_android) {
         "//ui/resources",
       ]
 
-      configs -= [ "//build/config/win:default_incremental_linking" ]
-      configs +=
-          [ "//build/config/win:default_large_module_incremental_linking" ]
-
       libs = [
         "oleacc.lib",
         "runtimeobject.lib",
@@ -5829,15 +6028,10 @@ if (!is_android) {
         "//chrome",
         "//chrome:chrome_framework",
       ]
+    }
 
-      # 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 += [
-        # Note permission_bubble_cocoa_interactive_uitest tests both Cocoa and
-        # toolkit-views secondary UI. It should not be deleted with the Cocoa
-        # bubble (but it can be deleted with the Cocoa browser window).
-        "../browser/ui/cocoa/permission_bubble/permission_bubble_cocoa_interactive_uitest.mm",
-      ]
+    if (enable_downgrade_processing) {
+      sources += [ "../browser/downgrade/user_data_snapshot_browsertest.cc" ]
     }
 
     if (use_x11) {
@@ -5900,10 +6094,6 @@ test("chrome_app_unittests") {
     "../app/android/chrome_main_delegate_android_unittest.cc",
     "../app/chrome_main_delegate.cc",
     "../app/chrome_main_delegate.h",
-    "../app/chrome_watcher_client_unittest_win.cc",
-    "../app/chrome_watcher_client_win.cc",
-    "../app/chrome_watcher_command_line_win.cc",
-    "../app/chrome_watcher_command_line_win_unittest.cc",
     "../app/resources/resources_unittest.cc",
   ]
   deps = [
@@ -5918,7 +6108,6 @@ test("chrome_app_unittests") {
     "//components/flags_ui:switches",
     "//components/gwp_asan/buildflags",
     "//components/safe_browsing:buildflags",
-    "//components/tracing",
   ]
   if (!is_fuchsia) {
     # TODO(crbug.com/753619): Enable crash reporting on Fuchsia.
@@ -5941,103 +6130,144 @@ if (!is_android) {
   }
 }
 
-if (!is_android && !is_fuchsia) {
-  static_library("sync_integration_test_support") {
+if (is_android) {
+  android_library("sync_integration_test_support_java") {
+    testonly = true
+    deps = [
+      "//chrome/android:chrome_all_java",
+      "//chrome/test/android:chrome_java_test_support",
+      "//components/signin/public/android:java",
+      "//content/public/test/android:content_java_test_support",
+      "//third_party/junit",
+    ]
+    sources = [ "../android/javatests/src/org/chromium/chrome/browser/sync/SyncTestSigninUtils.java" ]
+  }
+
+  generate_jni("sync_integration_test_support_jni_headers") {
+    testonly = true
+    sources = [ "../android/javatests/src/org/chromium/chrome/browser/sync/SyncTestSigninUtils.java" ]
+  }
+}
+
+if (!is_fuchsia) {
+  # For Android, this target as to be built along the
+  # sync_integration_test_support_java target from the test target dependencies.
+  source_set("sync_integration_test_support") {
     testonly = true
     sources = [
-      "../browser/sync/test/integration/apps_helper.cc",
-      "../browser/sync/test/integration/apps_helper.h",
-      "../browser/sync/test/integration/autofill_helper.cc",
-      "../browser/sync/test/integration/autofill_helper.h",
-      "../browser/sync/test/integration/await_match_status_change_checker.cc",
-      "../browser/sync/test/integration/await_match_status_change_checker.h",
-      "../browser/sync/test/integration/bookmarks_helper.cc",
-      "../browser/sync/test/integration/bookmarks_helper.h",
       "../browser/sync/test/integration/configuration_refresher.cc",
       "../browser/sync/test/integration/configuration_refresher.h",
-      "../browser/sync/test/integration/dictionary_helper.cc",
-      "../browser/sync/test/integration/dictionary_helper.h",
-      "../browser/sync/test/integration/dictionary_load_observer.cc",
-      "../browser/sync/test/integration/dictionary_load_observer.h",
-      "../browser/sync/test/integration/encryption_helper.cc",
-      "../browser/sync/test/integration/encryption_helper.h",
-      "../browser/sync/test/integration/extension_settings_helper.cc",
-      "../browser/sync/test/integration/extension_settings_helper.h",
-      "../browser/sync/test/integration/extensions_helper.cc",
-      "../browser/sync/test/integration/extensions_helper.h",
       "../browser/sync/test/integration/fake_server_invalidation_sender.cc",
       "../browser/sync/test/integration/fake_server_invalidation_sender.h",
-      "../browser/sync/test/integration/fake_server_match_status_checker.cc",
-      "../browser/sync/test/integration/fake_server_match_status_checker.h",
-      "../browser/sync/test/integration/feature_toggler.cc",
-      "../browser/sync/test/integration/feature_toggler.h",
-      "../browser/sync/test/integration/migration_waiter.cc",
-      "../browser/sync/test/integration/migration_waiter.h",
-      "../browser/sync/test/integration/migration_watcher.cc",
-      "../browser/sync/test/integration/migration_watcher.h",
       "../browser/sync/test/integration/multi_client_status_change_checker.cc",
       "../browser/sync/test/integration/multi_client_status_change_checker.h",
-      "../browser/sync/test/integration/passwords_helper.cc",
-      "../browser/sync/test/integration/passwords_helper.h",
-      "../browser/sync/test/integration/preferences_helper.cc",
-      "../browser/sync/test/integration/preferences_helper.h",
       "../browser/sync/test/integration/profile_sync_service_harness.cc",
       "../browser/sync/test/integration/profile_sync_service_harness.h",
       "../browser/sync/test/integration/quiesce_status_change_checker.cc",
       "../browser/sync/test/integration/quiesce_status_change_checker.h",
-      "../browser/sync/test/integration/retry_verifier.cc",
-      "../browser/sync/test/integration/retry_verifier.h",
-      "../browser/sync/test/integration/search_engines_helper.cc",
-      "../browser/sync/test/integration/search_engines_helper.h",
-      "../browser/sync/test/integration/secondary_account_helper.cc",
-      "../browser/sync/test/integration/secondary_account_helper.h",
-      "../browser/sync/test/integration/send_tab_to_self_helper.cc",
-      "../browser/sync/test/integration/send_tab_to_self_helper.h",
-      "../browser/sync/test/integration/session_hierarchy_match_checker.cc",
-      "../browser/sync/test/integration/session_hierarchy_match_checker.h",
-      "../browser/sync/test/integration/sessions_helper.cc",
-      "../browser/sync/test/integration/sessions_helper.h",
       "../browser/sync/test/integration/single_client_status_change_checker.cc",
       "../browser/sync/test/integration/single_client_status_change_checker.h",
       "../browser/sync/test/integration/status_change_checker.cc",
       "../browser/sync/test/integration/status_change_checker.h",
-      "../browser/sync/test/integration/sync_app_helper.cc",
-      "../browser/sync/test/integration/sync_app_helper.h",
       "../browser/sync/test/integration/sync_datatype_helper.cc",
       "../browser/sync/test/integration/sync_datatype_helper.h",
-      "../browser/sync/test/integration/sync_extension_helper.cc",
-      "../browser/sync/test/integration/sync_extension_helper.h",
-      "../browser/sync/test/integration/sync_extension_installer.cc",
-      "../browser/sync/test/integration/sync_extension_installer.h",
-      "../browser/sync/test/integration/sync_integration_test_util.cc",
-      "../browser/sync/test/integration/sync_integration_test_util.h",
+      "../browser/sync/test/integration/sync_disabled_checker.cc",
+      "../browser/sync/test/integration/sync_disabled_checker.h",
+      "../browser/sync/test/integration/sync_signin_delegate.cc",
+      "../browser/sync/test/integration/sync_signin_delegate.h",
       "../browser/sync/test/integration/sync_test.cc",
       "../browser/sync/test/integration/sync_test.h",
-      "../browser/sync/test/integration/themes_helper.cc",
-      "../browser/sync/test/integration/themes_helper.h",
-      "../browser/sync/test/integration/typed_urls_helper.cc",
-      "../browser/sync/test/integration/typed_urls_helper.h",
       "../browser/sync/test/integration/updated_progress_marker_checker.cc",
       "../browser/sync/test/integration/updated_progress_marker_checker.h",
-      "../browser/sync/test/integration/user_events_helper.cc",
-      "../browser/sync/test/integration/user_events_helper.h",
-      "../browser/sync/test/integration/wallet_helper.cc",
-      "../browser/sync/test/integration/wallet_helper.h",
-    ]
-    public_deps = [
-      "//chrome/browser",
     ]
+    if (!is_android) {
+      sources += [
+        "../browser/sync/test/integration/apps_helper.cc",
+        "../browser/sync/test/integration/apps_helper.h",
+        "../browser/sync/test/integration/autofill_helper.cc",
+        "../browser/sync/test/integration/autofill_helper.h",
+        "../browser/sync/test/integration/await_match_status_change_checker.cc",
+        "../browser/sync/test/integration/await_match_status_change_checker.h",
+        "../browser/sync/test/integration/bookmarks_helper.cc",
+        "../browser/sync/test/integration/bookmarks_helper.h",
+        "../browser/sync/test/integration/cookie_helper.cc",
+        "../browser/sync/test/integration/cookie_helper.h",
+        "../browser/sync/test/integration/dictionary_helper.cc",
+        "../browser/sync/test/integration/dictionary_helper.h",
+        "../browser/sync/test/integration/dictionary_load_observer.cc",
+        "../browser/sync/test/integration/dictionary_load_observer.h",
+        "../browser/sync/test/integration/encryption_helper.cc",
+        "../browser/sync/test/integration/encryption_helper.h",
+        "../browser/sync/test/integration/extension_settings_helper.cc",
+        "../browser/sync/test/integration/extension_settings_helper.h",
+        "../browser/sync/test/integration/extensions_helper.cc",
+        "../browser/sync/test/integration/extensions_helper.h",
+        "../browser/sync/test/integration/fake_server_match_status_checker.cc",
+        "../browser/sync/test/integration/fake_server_match_status_checker.h",
+        "../browser/sync/test/integration/feature_toggler.cc",
+        "../browser/sync/test/integration/feature_toggler.h",
+        "../browser/sync/test/integration/migration_waiter.cc",
+        "../browser/sync/test/integration/migration_waiter.h",
+        "../browser/sync/test/integration/migration_watcher.cc",
+        "../browser/sync/test/integration/migration_watcher.h",
+        "../browser/sync/test/integration/passwords_helper.cc",
+        "../browser/sync/test/integration/passwords_helper.h",
+        "../browser/sync/test/integration/preferences_helper.cc",
+        "../browser/sync/test/integration/preferences_helper.h",
+        "../browser/sync/test/integration/retry_verifier.cc",
+        "../browser/sync/test/integration/retry_verifier.h",
+        "../browser/sync/test/integration/search_engines_helper.cc",
+        "../browser/sync/test/integration/search_engines_helper.h",
+        "../browser/sync/test/integration/secondary_account_helper.cc",
+        "../browser/sync/test/integration/secondary_account_helper.h",
+        "../browser/sync/test/integration/send_tab_to_self_helper.cc",
+        "../browser/sync/test/integration/send_tab_to_self_helper.h",
+        "../browser/sync/test/integration/session_hierarchy_match_checker.cc",
+        "../browser/sync/test/integration/session_hierarchy_match_checker.h",
+        "../browser/sync/test/integration/sessions_helper.cc",
+        "../browser/sync/test/integration/sessions_helper.h",
+        "../browser/sync/test/integration/sync_app_helper.cc",
+        "../browser/sync/test/integration/sync_app_helper.h",
+        "../browser/sync/test/integration/sync_extension_helper.cc",
+        "../browser/sync/test/integration/sync_extension_helper.h",
+        "../browser/sync/test/integration/sync_extension_installer.cc",
+        "../browser/sync/test/integration/sync_extension_installer.h",
+        "../browser/sync/test/integration/sync_integration_test_util.cc",
+        "../browser/sync/test/integration/sync_integration_test_util.h",
+        "../browser/sync/test/integration/sync_signin_delegate_desktop.cc",
+        "../browser/sync/test/integration/sync_signin_delegate_desktop.h",
+        "../browser/sync/test/integration/themes_helper.cc",
+        "../browser/sync/test/integration/themes_helper.h",
+        "../browser/sync/test/integration/typed_urls_helper.cc",
+        "../browser/sync/test/integration/typed_urls_helper.h",
+        "../browser/sync/test/integration/user_events_helper.cc",
+        "../browser/sync/test/integration/user_events_helper.h",
+        "../browser/sync/test/integration/wallet_helper.cc",
+        "../browser/sync/test/integration/wallet_helper.h",
+      ]
+    } else {
+      sources += [
+        "../browser/sync/test/integration/sync_signin_delegate_android.cc",
+        "../browser/sync/test/integration/sync_signin_delegate_android.h",
+        "../browser/sync/test/integration/sync_test_signin_utils_android.cc",
+        "../browser/sync/test/integration/sync_test_signin_utils_android.h",
+      ]
+    }
+    public_deps = [ "//chrome/browser" ]
     deps = [
       ":test_support",
       "//base",
+      "//components/bookmarks/browser:test_support",
       "//components/invalidation/impl",
       "//components/invalidation/impl:test_support",
       "//components/signin/public/identity_manager:test_support",
       "//components/sync",
       "//components/sync:test_support_model",
       "//components/sync/test/fake_server",
+      "//content/public/browser",
       "//content/test:test_support",
       "//net",
+      "//services/network/public/mojom",
       "//skia",
     ]
 
@@ -6068,20 +6298,27 @@ if (!is_android && !is_fuchsia) {
         "//components/user_manager:test_support",
       ]
     }
+    if (is_android) {
+      deps += [ ":sync_integration_test_support_jni_headers" ]
+    }
   }
+}
 
+if (!is_fuchsia && !is_android) {
   test("sync_integration_tests") {
     sources = [
       "../browser/sync/test/integration/enable_disable_test.cc",
       "../browser/sync/test/integration/local_sync_test.cc",
       "../browser/sync/test/integration/migration_test.cc",
-      "../browser/sync/test/integration/single_client_apps_sync_test.cc",
+      "../browser/sync/test/integration/password_manager_sync_test.cc",
+      "../browser/sync/test/integration/single_client_app_settings_sync_test.cc",
       "../browser/sync/test/integration/single_client_autofill_profile_sync_test.cc",
       "../browser/sync/test/integration/single_client_bookmarks_sync_test.cc",
       "../browser/sync/test/integration/single_client_custom_passphrase_sync_test.cc",
       "../browser/sync/test/integration/single_client_device_info_sync_test.cc",
       "../browser/sync/test/integration/single_client_dictionary_sync_test.cc",
       "../browser/sync/test/integration/single_client_directory_sync_test.cc",
+      "../browser/sync/test/integration/single_client_extension_apps_sync_test.cc",
       "../browser/sync/test/integration/single_client_extensions_sync_test.cc",
       "../browser/sync/test/integration/single_client_history_delete_directives_sync_test.cc",
       "../browser/sync/test/integration/single_client_nigori_sync_test.cc",
@@ -6092,12 +6329,14 @@ if (!is_android && !is_fuchsia) {
       "../browser/sync/test/integration/single_client_secondary_account_sync_test.cc",
       "../browser/sync/test/integration/single_client_send_tab_to_self_sync_test.cc",
       "../browser/sync/test/integration/single_client_sessions_sync_test.cc",
+      "../browser/sync/test/integration/single_client_sharing_message_sync_test.cc",
       "../browser/sync/test/integration/single_client_standalone_transport_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_web_apps_bmo_sync_test.cc",
       "../browser/sync/test/integration/sync_auth_test.cc",
       "../browser/sync/test/integration/sync_errors_test.cc",
       "../browser/sync/test/integration/sync_exponential_backoff_test.cc",
@@ -6123,22 +6362,14 @@ if (!is_android && !is_fuchsia) {
     ]
 
     data = [
+      "//chrome/test/data/password/",
       "//chrome/test/data/sync/",
       "//net/tools/testserver/",
-      "//third_party/pywebsocket/src/mod_pywebsocket/",
+      "//third_party/pywebsocket3/src/mod_pywebsocket/",
       "//third_party/tlslite/",
       "//testing/xvfb.py",
     ]
 
-    if (is_linux || is_win) {
-      data += [
-        "$root_out_dir/chrome_100_percent.pak",
-        "$root_out_dir/chrome_200_percent.pak",
-        "$root_out_dir/locales/en-US.pak",
-        "$root_out_dir/resources.pak",
-      ]
-    }
-
     # TODO(phajdan.jr): Only temporary, to make transition easier.
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
@@ -6164,10 +6395,14 @@ if (!is_android && !is_fuchsia) {
     ]
 
     data_deps = [
-      "//third_party/mesa_headers",
       "//testing/buildbot/filters:e2e_sync_integration_tests_filters",
+      "//third_party/mesa_headers",
     ]
 
+    if (is_linux || is_win) {
+      data_deps += [ "//chrome:packed_resources" ]
+    }
+
     if (is_mac) {
       # Dictionary sync is disabled on Mac.
       sources -= [
@@ -6186,10 +6421,6 @@ if (!is_android && !is_fuchsia) {
         "//third_party/wtl",
         "//ui/resources",
       ]
-
-      configs -= [ "//build/config/win:default_incremental_linking" ]
-      configs +=
-          [ "//build/config/win:default_large_module_incremental_linking" ]
     }
     if (is_chromeos) {
       sources += [
@@ -6237,6 +6468,7 @@ if (!is_android && !is_fuchsia) {
       "//crypto:platform",
       "//testing/gmock",
       "//testing/gtest",
+      "//testing/perf",
     ]
 
     if (is_mac) {
@@ -6254,9 +6486,6 @@ if (!is_android && !is_fuchsia) {
         "//third_party/wtl",
         "//ui/resources",
       ]
-      configs -= [ "//build/config/win:default_incremental_linking" ]
-      configs +=
-          [ "//build/config/win:default_large_module_incremental_linking" ]
     }
 
     if (toolkit_views) {
@@ -6269,9 +6498,7 @@ if (!is_android && !is_fuchsia) {
 
   # Executable to measure time to load libraries.
   test("load_library_perf_tests") {
-    sources = [
-      "../browser/load_library_perf_test.cc",
-    ]
+    sources = [ "../browser/load_library_perf_test.cc" ]
 
     # This test deliberately does not depend in chrome's test support targets.
     # This is a small test and Chrome's test support targets bring in the
@@ -6286,9 +6513,7 @@ if (!is_android && !is_fuchsia) {
       "//third_party/widevine/cdm:buildflags",
     ]
 
-    data_deps = [
-      "//testing:run_perf_test",
-    ]
+    data_deps = [ "//testing:run_perf_test" ]
 
     if (enable_library_cdms) {
       deps += [ "//media/cdm:cdm_paths" ]
@@ -6303,9 +6528,7 @@ if (!is_android && !is_fuchsia) {
   }
 
   test("ntp_render_browsertests") {
-    sources = [
-      "../browser/ui/search/local_ntp_render_browsertest.cc",
-    ]
+    sources = [ "../browser/ui/search/local_ntp_render_browsertest.cc" ]
 
     configs += [ "//build/config:precompiled_headers" ]
 
@@ -6368,12 +6591,7 @@ if (!is_android && !is_fuchsia) {
     ]
 
     if (is_linux || is_win) {
-      data += [
-        "$root_out_dir/chrome_100_percent.pak",
-        "$root_out_dir/chrome_200_percent.pak",
-        "$root_out_dir/locales/en-US.pak",
-        "$root_out_dir/resources.pak",
-      ]
+      data_deps = [ "//chrome:packed_resources" ]
     }
 
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
@@ -6428,18 +6646,12 @@ if (!is_android && !is_fuchsia) {
         "//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 = [
-      "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
-    ]
+    deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
 
     data = [
       "//third_party/catapult/telemetry/telemetry/internal/bin/",
@@ -6454,15 +6666,14 @@ if (!is_android && !is_fuchsia) {
 
   group("telemetry_gpu_unittests_run") {
     testonly = true
-    deps = [
-      ":telemetry_gpu_unittests",
-    ]
+    deps = [ ":telemetry_gpu_unittests" ]
   }
 
   group("telemetry_gpu_unittests") {
     testonly = true
     deps = [
       "//third_party/catapult:telemetry_chrome_test_support",
+      "//tools/metrics:metrics_python_tests",
     ]
     data = [
       # TODO(kbr): refactor the telemetry dependencies more cleanly.
@@ -6499,7 +6710,7 @@ if (is_win) {
     ]
     deps = [
       "//base",
-      "//components/safe_browsing:csd_proto",
+      "//components/safe_browsing/core:csd_proto",
       "//crypto",
     ]
     libs = [ "wintrust.lib" ]
@@ -6512,43 +6723,26 @@ if (is_win) {
 
 if (is_chromeos) {
   fuzzer_test("tokenized_string_fuzzer") {
-    sources = [
-      "../common/string_matching/tokenized_string_fuzzer.cc",
-    ]
+    sources = [ "../common/string_matching/tokenized_string_fuzzer.cc" ]
     deps = [
-      "//ash/public/cpp",
       "//base",
+      "//chrome/common/string_matching",
     ]
   }
 }
 
 if (is_win) {
   test("pixel_browser_tests") {
-    sources = [
-      "pixel/demo/skia_gold_demo_pixeltest.cc",
-    ]
+    sources = [ "pixel/demo/skia_gold_demo_pixeltest.cc" ]
     configs += [ "//build/config:precompiled_headers" ]
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
     deps = [
       ":browser_tests_runner",
       ":test_support",
+      "//ui/base:pixel_diff_test_support",
     ]
-    if (is_win) {
-      data = [
-        "//tools/skia_goldctl/goldctl.exe",
-      ]
-    } else {
-      data = [
-        "//tools/skia_goldctl/goldctl",
-      ]
-    }
     if (!is_mac) {
-      data += [
-        "$root_out_dir/locales/",
-        "$root_out_dir/chrome_100_percent.pak",
-        "$root_out_dir/chrome_200_percent.pak",
-        "$root_out_dir/resources.pak",
-      ]
+      data_deps = [ "//chrome:packed_resources" ]
     }
   }
 }
@@ -6594,9 +6788,7 @@ if (is_chromeos) {
 
   proto_library("consistency_golden_proto") {
     visibility = [ ":usage_time_limit_unittests" ]
-    sources = [
-      "../browser/chromeos/child_accounts/time_limit_consistency_test/goldens/consistency_golden.proto",
-    ]
+    sources = [ "../browser/chromeos/child_accounts/time_limit_consistency_test/goldens/consistency_golden.proto" ]
     generate_python = false
   }
 }
@@ -6604,9 +6796,7 @@ if (is_chromeos) {
 if (is_mac || is_win || is_android) {
   group("rendering_representative_perf_tests") {
     testonly = true
-    deps = [
-      "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
-    ]
+    deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
     data = [
       "//build/android/pylib",
       "//chrome/test/data/perf",
@@ -6623,9 +6813,7 @@ if (is_mac || is_win || is_android) {
 if (is_win) {
   test("delayloads_unittests") {
     output_name = "delayloads_unittests"
-    sources = [
-      "delayload/delayloads_unittest.cc",
-    ]
+    sources = [ "delayload/delayloads_unittest.cc" ]
 
     defines = []
     if (is_multi_dll_chrome) {
@@ -6646,9 +6834,7 @@ if (is_win) {
     # the //chrome target to bundle up both initial/chrome.exe and chrome.exe.
     # As a workaround, explicitly include a data dep on just chrome.exe, and
     # add //chrome to deps above to make sure it's been built.
-    data = [
-      "$root_out_dir/chrome.exe",
-    ]
+    data = [ "$root_out_dir/chrome.exe" ]
 
     # Don't want the test-specific dependencies to affect load tests.
     # In particular, a few system DLLs cause user32 to be loaded, which is bad.
@@ -6664,8 +6850,8 @@ group("closure_compile") {
   testonly = true
 
   deps = [
+    "base:closure_compile",
     "data:closure_compile",
-    # TODO(crbug/1000989): Add a dep for base/js2gtest.js.
   ]
 }
 
@@ -6693,9 +6879,7 @@ if (!is_android) {
 
   test("xr_browser_tests_binary") {
     testonly = true
-    deps = [
-      ":xr_browser_tests_common",
-    ]
+    deps = [ ":xr_browser_tests_common" ]
 
     # Most tests require VR to be enabled.
     if (enable_vr) {
@@ -6730,7 +6914,6 @@ if (!is_android) {
 
     deps = [
       "//base",
-      "//chrome:packed_resources",
       "//chrome/test:browser_tests_runner",
       "//device/base",
       "//services/service_manager/sandbox",
@@ -6747,12 +6930,7 @@ if (!is_android) {
     ]
 
     if (!is_mac) {
-      data += [
-        "$root_out_dir/locales/",
-        "$root_out_dir/chrome_100_percent.pak",
-        "$root_out_dir/chrome_200_percent.pak",
-        "$root_out_dir/resources.pak",
-      ]
+      data_deps = [ "//chrome:packed_resources" ]
     }
   }
 
@@ -6760,11 +6938,7 @@ if (!is_android) {
   # once the functionality is available on all platforms.
   copy("xr_browser_tests_runner") {
     testonly = true
-    sources = [
-      "//chrome/browser/vr/test/run_xr_browser_tests.py",
-    ]
-    outputs = [
-      "$root_out_dir/run_xr_browser_tests.py",
-    ]
+    sources = [ "//chrome/browser/vr/test/run_xr_browser_tests.py" ]
+    outputs = [ "$root_out_dir/run_xr_browser_tests.py" ]
   }
 }