diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
| commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
| tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/chrome/test/BUILD.gn | |
| parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
| download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz | |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/test/BUILD.gn')
| -rw-r--r-- | chromium/chrome/test/BUILD.gn | 2621 |
1 files changed, 1364 insertions, 1257 deletions
diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn index d349a6e3378..dfb45720d8a 100644 --- a/chromium/chrome/test/BUILD.gn +++ b/chromium/chrome/test/BUILD.gn @@ -17,6 +17,7 @@ import("//components/signin/features.gni") import("//components/spellcheck/spellcheck_build_features.gni") import("//extensions/features/features.gni") import("//media/media_options.gni") +import("//mojo/public/tools/bindings/mojom.gni") import("//ppapi/features/features.gni") import("//remoting/remoting_enable.gni") import("//rlz/features/features.gni") @@ -24,6 +25,7 @@ import("//services/service_manager/public/service_manifest.gni") import("//services/catalog/public/tools/catalog.gni") import("//testing/test.gni") import("//ui/base/ui_features.gni") +import("//ui/views/features.gni") import("//v8/gni/v8.gni") if (is_android) { @@ -72,6 +74,8 @@ static_library("test_support") { "base/test_browser_window.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", @@ -127,6 +131,7 @@ static_library("test_support") { "//components/password_manager/core/browser:test_support", "//components/prefs:test_support", "//components/rappor:test_support", + "//components/safe_browsing/db:v4_test_util", "//components/search_engines:test_support", "//components/sessions:test_support", "//components/signin/core/browser:test_support", @@ -169,14 +174,6 @@ static_library("test_support") { "//ui/gl", ] - if (enable_plugins) { - public_deps += [ "//ppapi/shared_impl" ] - } - - if (enable_message_center) { - public_deps += [ "//ui/message_center:test_support" ] - } - if (is_android) { sources -= [ "base/dialog_test_browser_window.cc", @@ -188,22 +185,10 @@ static_library("test_support") { public_deps += [ "//components/zoom:test_support" ] } - if (enable_extensions) { - public_deps += [ - "//apps:test_support", - "//chrome/common/extensions/api", - "//components/guest_view/browser:test_support", - "//extensions:test_support", - ] - } - - if (enable_offline_pages) { - public_deps += [ "//components/offline_pages/core:test_support" ] - } - if (is_linux) { public_deps += [ "//crypto:platform" ] } + if (is_mac) { sources += [ "//chrome/app/chrome_crash_reporter_client.cc", @@ -215,6 +200,7 @@ static_library("test_support") { "//third_party/ocmock", ] } + if (is_win) { sources += [ "//chrome/app/chrome_crash_reporter_client_win.cc" ] public_deps += [ @@ -224,6 +210,7 @@ static_library("test_support") { "//third_party/wtl", ] } + if (is_chromeos) { sources += [ "../browser/chromeos/accessibility/speech_monitor.cc", @@ -259,6 +246,31 @@ static_library("test_support") { "views/chrome_views_test_base.h", ] } + + if (enable_extensions) { + public_deps += [ + "//apps:test_support", + "//chrome/common/extensions/api", + "//components/guest_view/browser:test_support", + "//extensions:test_support", + ] + } + + if (enable_message_center) { + public_deps += [ "//ui/message_center:test_support" ] + } + + if (enable_offline_pages) { + public_deps += [ "//components/offline_pages/core:test_support" ] + } + + if (enable_plugins) { + public_deps += [ "//ppapi/shared_impl" ] + } + + if (enable_print_preview && !is_chromeos) { + public_deps += [ "//chrome/service" ] + } } group("telemetry_gpu_integration_test") { @@ -299,766 +311,6 @@ group("telemetry_gpu_integration_test") { ] } -if (!is_android) { - static_library("test_support_ui") { - defines = [] - testonly = true - - sources = [ - "../browser/permissions/permission_request_manager_test_api.cc", - "../browser/permissions/permission_request_manager_test_api.h", - "base/in_process_browser_test.cc", - "base/in_process_browser_test.h", - "base/in_process_browser_test_mac.cc", - "base/javascript_browser_test.cc", - "base/javascript_browser_test.h", - "base/test_chrome_web_ui_controller_factory.cc", - "base/test_chrome_web_ui_controller_factory.h", - "base/ui_test_utils.cc", - "base/ui_test_utils.h", - "base/web_ui_browser_test.cc", - "base/web_ui_browser_test.h", - ] - - configs += [ "//build/config:precompiled_headers" ] - - public_deps = [ - "//chrome/browser:test_support_ui", - "//content/public/browser", - ] - deps = [ - "//components/metrics:test_support", - "//components/nacl/common:features", - "//components/os_crypt:test_support", - "//content/public/browser:browser", - "//skia", - "//testing/gtest", - "//third_party/WebKit/public:blink_headers", - ] - - if (enable_plugins) { - sources += [ - "ppapi/ppapi_test.cc", - "ppapi/ppapi_test.h", - ] - } - } - - import("//third_party/protobuf/proto_library.gni") - - proto_library("test_proto") { - sources = [ - "../common/safe_browsing/ipc_protobuf_message_test.proto", - ] - } - - if (is_chromeos) { - # These tests are only meant to run on an FYI bot because they - # test against live sites, as a way to catch potential regressions. - test("accessibility_live_site_tests") { - sources = [ - "../browser/chromeos/accessibility/select_to_speak_live_site_browsertest.cc", - "base/interactive_test_utils.cc", - "base/interactive_test_utils.h", - "base/interactive_test_utils_aura.cc", - "base/interactive_test_utils_aura.h", - "base/interactive_test_utils_common_views.cc", - "base/interactive_ui_tests_main.cc", - ] - configs += [ "//build/config:precompiled_headers" ] - - data_deps = [ - "//testing/buildbot/filters:interactive_ui_tests_filters", - ] - - defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] - ldflags = [] - - deps = [ - ":test_support", - ":test_support_ui", - "//chrome:packed_resources", - "//chrome:resources", - "//chrome:strings", - "//chrome/browser", - "//chrome/browser/devtools", - "//chrome/renderer", - "//components/resources", - "//components/sync", - "//components/sync:test_support_model", - "//content/app/resources", - "//content/test:test_support", - "//crypto:platform", - "//crypto:test_support", - "//google_apis:test_support", - "//net", - "//net:net_resources", - "//net:test_support", - "//skia", - "//testing/gmock", - "//testing/gtest", - "//third_party/hunspell", - "//third_party/icu", - "//third_party/libpng", - "//third_party/zlib", - "//ui/base:test_support", - "//ui/resources:ui_test_pak", - "//ui/web_dialogs:test_support", - ] - if (enable_extensions) { - deps += [ "//extensions/features" ] - } - } - } - - test("interactive_ui_tests") { - sources = [ - "../browser/apps/app_browsertest_util.cc", - "../browser/apps/app_browsertest_util.h", - "../browser/apps/app_pointer_lock_interactive_uitest.cc", - "../browser/apps/app_shim/app_shim_interactive_uitest_mac.mm", - "../browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm", - "../browser/apps/app_window_interactive_uitest.cc", - "../browser/apps/app_window_interactive_uitest.h", - "../browser/apps/guest_view/web_view_interactive_browsertest.cc", - "../browser/autofill/autofill_interactive_uitest.cc", - "../browser/autofill/autofill_uitest_util.cc", - "../browser/autofill/autofill_uitest_util.h", - "../browser/browser_keyevents_browsertest.cc", - "../browser/devtools/devtools_sanity_interactive_browsertest.cc", - "../browser/extensions/api/extension_action/browser_action_interactive_test.cc", - "../browser/extensions/api/notifications/notifications_apitest.cc", - "../browser/extensions/api/omnibox/omnibox_api_interactive_test.cc", - "../browser/extensions/api/tabs/tabs_interactive_test.cc", - "../browser/extensions/browsertest_util.cc", - "../browser/extensions/chrome_extension_test_notification_observer.cc", - "../browser/extensions/chrome_extension_test_notification_observer.h", - "../browser/extensions/clipboard_extension_apitest_chromeos.cc", - "../browser/extensions/extension_apitest.cc", - "../browser/extensions/extension_browsertest.cc", - "../browser/extensions/extension_commands_global_registry_apitest.cc", - "../browser/extensions/extension_crash_recovery_browsertest.cc", - "../browser/extensions/extension_fullscreen_apitest.cc", - "../browser/extensions/extension_function_test_utils.cc", - "../browser/extensions/extension_keybinding_apitest.cc", - "../browser/extensions/updater/extension_cache_fake.cc", - "../browser/extensions/updater/extension_cache_fake.h", - "../browser/extensions/window_open_interactive_apitest.cc", - "../browser/mouseleave_browsertest.cc", - "../browser/notifications/message_center_notifications_browsertest.cc", - "../browser/password_manager/password_generation_interactive_uitest.cc", - "../browser/password_manager/password_manager_interactive_uitest.cc", - "../browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc", - "../browser/renderer_context_menu/render_view_context_menu_browsertest_util.h", - "../browser/renderer_host/site_per_process_text_input_browsertest.cc", - "../browser/site_per_process_interactive_browsertest.cc", - "../browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc", - "../browser/ui/blocked_content/popup_blocker_browsertest.cc", - "../browser/ui/blocked_content/popup_tracker_browsertest.cc", - "../browser/ui/blocked_content/tab_under_blocker_browsertest.cc", - "../browser/ui/browser_command_controller_interactive_browsertest.cc", - "../browser/ui/browser_focus_uitest.cc", - "../browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm", - "../browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm", - "../browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm", - "../browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc", - "../browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc", - "../browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc", - "../browser/ui/find_bar/find_bar_host_interactive_uitest.cc", - "../browser/ui/omnibox/omnibox_view_browsertest.cc", - "../browser/ui/passwords/manage_passwords_test.cc", - "../browser/ui/passwords/manage_passwords_test.h", - "../browser/ui/search/instant_extended_interactive_uitest.cc", - "../browser/ui/search/instant_test_base.cc", - "../browser/ui/search/instant_test_base.h", - "../browser/ui/search/instant_test_utils.cc", - "../browser/ui/search/instant_test_utils.h", - "../browser/ui/search/instant_uitest_base.cc", - "../browser/ui/search/instant_uitest_base.h", - "../browser/ui/search/local_ntp_uitest.cc", - "../browser/ui/send_mouse_move_uitest_win.cc", - "../browser/ui/startup/startup_browser_creator_interactive_uitest.cc", - "../browser/ui/translate/translate_bubble_test_utils.h", - "../browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc", - "//ui/base/clipboard/clipboard_unittest.cc", - "base/always_on_top_window_killer_win.cc", - "base/always_on_top_window_killer_win.h", - "base/interactive_test_utils.cc", - "base/interactive_test_utils.h", - "base/interactive_test_utils_aura.cc", - "base/interactive_test_utils_aura.h", - "base/interactive_test_utils_common_views.cc", - "base/interactive_test_utils_mac.mm", - "base/interactive_test_utils_win.cc", - "base/interactive_ui_tests_main.cc", - "base/view_event_test_platform_part.h", - "base/view_event_test_platform_part_chromeos.cc", - "base/view_event_test_platform_part_default.cc", - "ppapi/ppapi_interactive_browsertest.cc", - ] - - configs += [ "//build/config:precompiled_headers" ] - - data_deps = [ - "//testing/buildbot/filters:interactive_ui_tests_filters", - ] - - data = [ - "data/", - "//chrome/third_party/mock4js/", - "//content/test/data/", - "//net/tools/testserver/", - "//ppapi/tests/test_case.html", - "//ppapi/tests/test_case.html.mock-http-headers", - "//ppapi/tests/test_page.css", - "//ppapi/tests/test_page.css.mock-http-headers", - "//third_party/accessibility-audit/axs_testing.js", - "//third_party/chaijs/chai.js", - "//third_party/mocha/mocha.js", - "//third_party/polymer/v1_0/components-chromium/iron-test-helpers/mock-interactions.js", - "//third_party/pyftpdlib/", - "//third_party/pywebsocket/", - "//third_party/tlslite/", - "//third_party/zlib/google/test/data/", - "//tools/metrics/histograms/enums.xml", - "//ui/webui/resources/js/", - "$root_out_dir/pyproto/google/", - "$root_out_dir/test_case.html", - "$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", - ] - 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" ] - } - - defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] - ldflags = [] - - deps = [ - ":test_support", - ":test_support_ui", - "//chrome:packed_resources", - "//chrome:resources", - "//chrome:strings", - "//chrome/browser", - "//chrome/browser/devtools", - "//chrome/renderer", - "//components/keep_alive_registry", - "//components/resources", - "//components/sync", - "//components/sync:test_support_model", - "//content/app/resources", - "//content/test:test_support", - "//crypto:platform", - "//crypto:test_support", - "//extensions/features", - "//google_apis:test_support", - "//mojo/edk/system", - "//net", - "//net:net_resources", - "//net:test_support", - "//skia", - "//testing/gmock", - "//testing/gtest", - "//third_party/hunspell", - "//third_party/icu", - "//third_party/libpng", - "//third_party/zlib", - "//ui/base:test_support", - "//ui/resources:ui_test_pak", - "//ui/web_dialogs:test_support", - ] - - if (include_js_tests) { - deps += [ "//chrome/test/data/webui:interactive_ui_tests_js_webui" ] - } - - # Runtime dependencies - data_deps += [ - "//ppapi:ppapi_tests", - "//third_party/mesa:osmesa", - ] - - if (use_aura) { - sources += [ "../browser/ui/views/drag_and_drop_interactive_uitest.cc" ] - } else { - sources -= [ - "base/interactive_test_utils_aura.cc", - "base/interactive_test_utils_aura.h", - ] - } - - if (toolkit_views) { - sources += [ - "../browser/ui/views/menu_controller_interactive_uitest.cc", - "../browser/ui/views/menu_item_view_interactive_uitest.cc", - "../browser/ui/views/menu_model_adapter_test.cc", - "../browser/ui/views/menu_test_base.cc", - "../browser/ui/views/menu_test_base.h", - "../browser/ui/views/menu_view_drag_and_drop_test.cc", - "../browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc", - "../browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc", - "base/view_event_test_base.cc", - "base/view_event_test_base.h", - ] - deps += [ - "//ui/views", - "//ui/views:test_support", - "//ui/views:views_interactive_ui_tests", - "//ui/views/controls/webview:test_support", - ] - if (!is_mac || mac_views_browser) { - # TODO(tapted): Move these to chrome_interactive_ui_test_views_sources - # when the corresponding files are moved in chrome_browser_ui.gypi - # (i.e. out of chrome_browser_ui_views_non_mac_sources). - sources += [ - "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", - "../browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h", - "../browser/ui/views/certificate_selector_browsertest.cc", - "../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/find_bar_views_interactive_uitest.cc", - "../browser/ui/views/frame/browser_view_focus_uitest.cc", - "../browser/ui/views/frame/browser_view_interactive_uitest.cc", - "../browser/ui/views/fullscreen_control/fullscreen_control_view_interactive_uitest.cc", - "../browser/ui/views/keyboard_access_browsertest.cc", - "../browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc", - "../browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc", - "../browser/ui/views/location_bar/star_view_browsertest.cc", - "../browser/ui/views/omnibox/omnibox_view_views_browsertest.cc", - "../browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc", - "../browser/ui/views/ssl_client_certificate_selector_browsertest.cc", - "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc", - "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h", - "../browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc", - "../browser/ui/views/toolbar/toolbar_button_interactive_uitest.cc", - "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc", - "../browser/ui/views/translate/translate_bubble_test_utils_views.cc", - "base/interactive_test_utils_views.cc", - ] - } - if (is_linux) { - if (!is_chromeos) { - # Desktop linux. - sources -= [ - # TODO(port): This times out. Attempts have been made to fix the - # individual failures, but each time I disable a test from these - # 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 (use_aura || is_mac) { - deps += [ "//ui/touch_selection" ] - } - } - - if (is_chromeos) { - sources += [ - "../browser/chromeos/accessibility/accessibility_highlight_manager_interactive_uitest.cc", - "../browser/chromeos/accessibility/magnification_controller_browsertest.cc", - "../browser/chromeos/accessibility/select_to_speak_browsertest.cc", - "../browser/chromeos/accessibility/spoken_feedback_browsertest.cc", - "../browser/chromeos/accessibility/sticky_keys_browsertest.cc", - "../browser/chromeos/input_method/textinput_browsertest.cc", - "../browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc", - "../browser/chromeos/input_method/textinput_test_helper.cc", - "../browser/chromeos/input_method/textinput_test_helper.h", - "../browser/chromeos/login/active_directory_login_browsertest.cc", - "../browser/chromeos/login/lock/screen_locker_browsertest.cc", - "../browser/chromeos/login/lock/screen_locker_tester.cc", - "../browser/chromeos/login/lock/screen_locker_tester.h", - "../browser/chromeos/login/login_browsertest.cc", - "../browser/chromeos/login/login_manager_test.cc", - "../browser/chromeos/login/login_manager_test.h", - "../browser/chromeos/login/login_ui_browsertest.cc", - "../browser/chromeos/login/mixin_based_browser_test.cc", - "../browser/chromeos/login/mixin_based_browser_test.h", - "../browser/chromeos/login/oobe_browsertest.cc", - "../browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric.h", - "../browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric_cpu.cpp", - "../browser/chromeos/login/screenshot_testing/SkImageDiffer.cpp", - "../browser/chromeos/login/screenshot_testing/SkImageDiffer.h", - "../browser/chromeos/login/screenshot_testing/SkPMetric.cpp", - "../browser/chromeos/login/screenshot_testing/SkPMetric.h", - "../browser/chromeos/login/screenshot_testing/SkPMetricUtil_gen.h", - "../browser/chromeos/login/screenshot_testing/login_screen_areas.h", - "../browser/chromeos/login/screenshot_testing/screenshot_tester.cc", - "../browser/chromeos/login/screenshot_testing/screenshot_tester.h", - "../browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.cc", - "../browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h", - "../browser/chromeos/login/test/https_forwarder.cc", - "../browser/chromeos/login/test/https_forwarder.h", - "../browser/chromeos/login/test/oobe_base_test.cc", - "../browser/chromeos/login/test/oobe_base_test.h", - "../browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc", - "../browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc", - "../browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h", - "../browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc", - "../browser/ui/ash/app_list/app_list_interactive_uitest.cc", - "../browser/ui/views/apps/chrome_native_app_window_views_aura_ash_interactive_uitest.cc", - "../browser/ui/views/ash/tab_scrubber_browsertest.cc", - "../browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc", - "../browser/ui/window_sizer/window_sizer_ash_uitest.cc", - "//ash/accelerators/accelerator_interactive_uitest_chromeos.cc", - "//ash/drag_drop/drag_drop_interactive_uitest.cc", - "//ash/wm/native_cursor_manager_ash_interactive_uitest.cc", - "data/chromeos/service_login.html", - ] - sources -= [ - # Use only the _chromeos version on Ash / Chrome OS. - "base/view_event_test_platform_part_default.cc", - ] - deps += [ - "//ash:interactive_ui_test_support", - "//ash/resources", - "//chrome/browser/media/router:test_support", - "//chromeos", - "//mojo/edk/system", - "//ui/app_list/presenter:test_support", - ] - - data += [ - "//chrome/browser/chromeos/login/test/https_forwarder.py", - "//google_apis/test/", - "$root_out_dir/resources/chromeos/", - ] - - data_deps += [ "//ui/keyboard:resources" ] - - if (enable_nacl) { - data_deps += [ - "//components/nacl/loader:nacl_helper", - "//ppapi/native_client:irt", - ] - - if (enable_nacl_nonsfi) { - data_deps += [ "//components/nacl/loader:helper_nonsfi" ] - } - } - } else { # ! is_chromeos - # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform - # panels). - sources += [ - "../browser/notifications/notification_interactive_uitest.cc", - "../browser/notifications/notification_interactive_uitest_mac.mm", - "../browser/notifications/notification_interactive_uitest_support.cc", - "../browser/notifications/notification_interactive_uitest_support.h", - "../browser/notifications/platform_notification_service_interactive_uitest.cc", - ] - } - - if (is_win) { - sources += [ - "../browser/downgrade/user_data_downgrade_browsertest.cc", - "../browser/ui/views/touch_events_interactive_uitest_win.cc", - "//ui/resources/cursors/aliasb.cur", - "//ui/resources/cursors/cell.cur", - "//ui/resources/cursors/col_resize.cur", - "//ui/resources/cursors/copy.cur", - "//ui/resources/cursors/none.cur", - "//ui/resources/cursors/row_resize.cur", - "//ui/resources/cursors/vertical_text.cur", - "//ui/resources/cursors/zoom_in.cur", - "//ui/resources/cursors/zoom_out.cur", - "data/resource.rc", - ] - deps += [ - "//chrome:other_version", - "//chrome/app:chrome_dll_resources", - "//chrome/install_static:install_static_util", - "//third_party/isimpledom", - "//third_party/webrtc/modules/desktop_capture", - "//third_party/wtl", - "//ui/resources", - ] - - configs -= [ "//build/config/win:default_incremental_linking" ] - configs += - [ "//build/config/win:default_large_module_incremental_linking" ] - - libs = [ "oleacc.lib" ] - } - - if (is_mac) { - data_deps += [ - "//chrome", - "//chrome:chrome_framework", - ] - - # The browser window can be views or Cocoa on Mac. Test accordingly. - if (mac_views_browser) { - # Aura depended tests. - sources -= [ "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc" ] - } else { - sources += [ - "../browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm", - "../browser/ui/cocoa/permission_bubble/permission_bubble_cocoa_interactive_uitest.mm", - "../browser/ui/cocoa/translate/translate_bubble_test_utils_cocoa.mm", - "base/interactive_test_utils_cocoa.mm", - ] - } - } - - if (use_x11) { - configs += [ "//build/config/linux:xtst" ] - } - - if (enable_app_list) { - sources += - [ "../browser/ui/app_list/app_list_service_interactive_uitest.cc" ] - } - - if (enable_extensions) { - # TODO(rockot) bug 505926: The chrome_extensions_interactive_uitests - # target should be deleted and this line removed. See the - # chrome_extensions_interactive_uitests target for more. - deps += [ "//extensions:chrome_extensions_interactive_uitests" ] - } - - if (!enable_native_notifications) { - sources += [ "../browser/notifications/message_center_notification_manager_interactive_uitest.cc" ] - } - - if (is_android) { - sources -= [ - # Android does not use the message center-based Notification system. - "../browser/notifications/message_center_notifications_browsertest.cc", - - # TODO(peter): Enable the Notification browser tests. - "../browser/notifications/notification_interactive_uitest.cc", - "../browser/notifications/platform_notification_service_interactive_uitest.cc", - ] - } - } - - # TODO(jamescook): is_chromeos implies enable_app_list, so collapse them. - if (enable_app_list && is_chromeos) { - static_library("test_support_applist_chromeos") { - defines = [] - testonly = true - - sources = [ - "../browser/ui/ash/app_list/test/app_list_service_ash_test_api.cc", - "../browser/ui/ash/app_list/test/app_list_service_ash_test_api.h", - ] - deps = [ - "//chrome/browser/ui", - "//ui/app_list/presenter:test_support", - ] - } - } -} - -if (!is_android && !is_fuchsia) { - static_library("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/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/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_service.cc", - "../browser/sync/test/integration/fake_server_invalidation_service.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/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/p2p_invalidation_forwarder.cc", - "../browser/sync/test/integration/p2p_invalidation_forwarder.h", - "../browser/sync/test/integration/p2p_sync_refresher.cc", - "../browser/sync/test/integration/p2p_sync_refresher.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/printers_helper.cc", - "../browser/sync/test/integration/printers_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/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_app_list_helper.cc", - "../browser/sync/test/integration/sync_app_list_helper.h", - "../browser/sync/test/integration/sync_arc_package_helper.cc", - "../browser/sync/test/integration/sync_arc_package_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_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/wifi_credentials_helper.cc", - "../browser/sync/test/integration/wifi_credentials_helper.h", - "../browser/sync/test/integration/wifi_credentials_helper_chromeos.cc", - "../browser/sync/test/integration/wifi_credentials_helper_chromeos.h", - ] - public_deps = [ - "//chrome/browser", - ] - deps = [ - ":test_support", - "//base", - "//components/invalidation/impl", - "//components/invalidation/impl:test_support", - "//components/sync", - "//components/sync:test_support_fake_server", - "//components/sync:test_support_model", - "//components/sync:test_support_testserver", - "//content/test:test_support", - "//net", - "//skia", - ] - - if (is_mac) { - sources -= [ - "../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", - ] - } - if (enable_app_list) { - deps += [ "//ui/app_list:test_support" ] - } else { - sources -= [ - "../browser/sync/test/integration/sync_app_list_helper.cc", - "../browser/sync/test/integration/sync_app_list_helper.h", - ] - } - if (!is_chromeos) { - sources -= [ - "../browser/sync/test/integration/printers_helper.cc", - "../browser/sync/test/integration/printers_helper.h", - "../browser/sync/test/integration/sync_arc_package_helper.cc", - "../browser/sync/test/integration/sync_arc_package_helper.h", - "../browser/sync/test/integration/wifi_credentials_helper.cc", - "../browser/sync/test/integration/wifi_credentials_helper.h", - ] - } - if (is_chromeos) { - deps += [ - "//components/arc:arc_test_support", - "//components/user_manager:test_support", - ] - } - } - - group("telemetry_unittests") { - testonly = true - deps = [ - "//tools/perf/chrome_telemetry_build:telemetry_chrome_test", - ] - - data = [ - "//tools/perf/run_telemetry_tests", - - # For isolate contract. - "//testing/scripts/common.py", - "//testing/xvfb.py", - "//testing/scripts/run_telemetry_as_googletest.py", - ] - - if (enable_package_mash_services) { - deps += [ "//chrome:chrome_test" ] - data_deps = [ - "//chrome:chrome_test", - ] - } - } - - group("telemetry_gpu_unittests_run") { - testonly = true - deps = [ - ":telemetry_gpu_unittests", - ] - } - - group("telemetry_gpu_unittests") { - deps = [ - "//third_party/catapult/telemetry:telemetry_test_support", - ] - data = [ - # TODO(kbr): refactor the telemetry dependencies more cleanly. - "//content/test/gpu/", - "//content/test/data/gpu/", - - # For GpuProcess.video - "//content/test/data/media/bear.ogv", - - # For webgl_conformance_expectations_unittest - "//third_party/webgl/src/sdk/tests/", - - # For resolve the imports in content/test/gpu/run_gpu_test.py - "//tools/perf/core/", - "//tools/perf/chrome_telemetry_build/", - - # From telemetry_gpu_unittests.isolate - "//third_party/pylint/", - "//third_party/logilab/", - "//testing/scripts/common.py", - "//testing/xvfb.py", - "//testing/scripts/run_telemetry_as_googletest.py", - ] - } -} - static_library("browser_tests_runner") { testonly = true sources = [] @@ -1067,7 +319,7 @@ static_library("browser_tests_runner") { ":test_support", ] - if (is_chromeos && enable_package_mash_services) { + if (is_chromeos && enable_mus) { sources += [ "base/browser_tests_main_chromeos.cc", "base/mash_browser_tests_main.cc", @@ -1139,7 +391,7 @@ test("browser_tests") { data_deps += [ # Needed for --run-in-mash, which triggers launching chrome. # TODO(sky): this seems wrong, figure a better way to get resources. - "//ash/mus:resources", + "//ash:ash_service_resources", "//chrome", "//ui/keyboard:resources", ] @@ -1193,6 +445,7 @@ test("browser_tests") { "../browser/banners/app_banner_manager_browsertest.cc", "../browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc", "../browser/browser_encoding_browsertest.cc", + "../browser/browser_shutdown_browsertest.cc", "../browser/browsing_data/autofill_counter_browsertest.cc", "../browser/browsing_data/browsing_data_cache_storage_helper_browsertest.cc", "../browser/browsing_data/browsing_data_database_helper_browsertest.cc", @@ -1209,6 +462,7 @@ test("browser_tests") { "../browser/browsing_data/sync_aware_counter_browsertest.cc", "../browser/budget_service/budget_manager_browsertest.cc", "../browser/chrome_content_browser_client_browsertest.cc", + "../browser/chrome_content_browser_client_browsertest_chromeos.cc", "../browser/chrome_find_request_manager_browsertest.cc", "../browser/chrome_main_browsertest.cc", "../browser/chrome_navigation_browsertest.cc", @@ -1218,12 +472,13 @@ test("browser_tests") { "../browser/chrome_service_worker_browsertest.cc", "../browser/chrome_site_per_process_browsertest.cc", "../browser/client_hints/client_hints_browsertest.cc", - "../browser/component_updater/component_patcher_operation_out_of_process_browsertest.cc", + "../browser/component_updater/component_patcher_operation_browsertest.cc", "../browser/content_settings/content_settings_browsertest.cc", "../browser/crash_recovery_browsertest.cc", "../browser/custom_handlers/protocol_handler_registry_browsertest.cc", "../browser/data_saver/data_saver_browsertest.cc", "../browser/data_saver/data_saver_holdback_browsertest.cc", + "../browser/data_saver/data_saver_webapis_browsertest.cc", "../browser/devtools/device/adb/adb_client_socket_browsertest.cc", "../browser/devtools/device/adb/mock_adb_server.cc", "../browser/devtools/device/adb/mock_adb_server.h", @@ -1244,13 +499,9 @@ test("browser_tests") { "../browser/download/download_danger_prompt_browsertest.cc", "../browser/download/download_started_animation_browsertest.cc", "../browser/download/save_page_browsertest.cc", - "../browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc", "../browser/fast_shutdown_browsertest.cc", "../browser/favicon/content_favicon_driver_browsertest.cc", "../browser/first_run/first_run_browsertest.cc", - "../browser/gcm/fake_gcm_profile_service.cc", - "../browser/gcm/fake_gcm_profile_service.h", - "../browser/geolocation/access_token_store_browsertest.cc", "../browser/geolocation/geolocation_browsertest.cc", "../browser/global_keyboard_shortcuts_mac_browsertest.mm", "../browser/history/history_browsertest.cc", @@ -1313,9 +564,12 @@ test("browser_tests") { "../browser/media_galleries/media_galleries_dialog_controller_mock.h", "../browser/metrics/metrics_memory_details_browsertest.cc", "../browser/metrics/metrics_service_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", "../browser/metrics/tab_reactivation_tracker_browsertest.cc", + "../browser/metrics/tab_stats_data_store_unittests.cc", + "../browser/metrics/tab_stats_tracker_unittests.cc", "../browser/metrics/ukm_browsertest.cc", "../browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc", "../browser/net/chrome_network_delegate_browsertest.cc", @@ -1362,8 +616,6 @@ test("browser_tests") { "../browser/policy/policy_prefs_browsertest.cc", "../browser/policy/policy_startup_browsertest.cc", "../browser/policy/site_isolation_policy_browsertest.cc", - "../browser/predictors/loading_test_util.cc", - "../browser/predictors/loading_test_util.h", "../browser/predictors/resource_prefetch_predictor_browsertest.cc", "../browser/prefetch/prefetch_browsertest.cc", "../browser/prefs/pref_functional_browsertest.cc", @@ -1374,12 +626,8 @@ test("browser_tests") { "../browser/prerender/prerender_nostate_prefetch_browsertest.cc", "../browser/prerender/prerender_test_utils.cc", "../browser/prerender/prerender_test_utils.h", + "../browser/previews/previews_browsertest.cc", "../browser/previews/previews_service_browser_test.cc", - "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc", - "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc", - "../browser/printing/print_browsertest.cc", - "../browser/printing/print_preview_dialog_controller_browsertest.cc", - "../browser/printing/print_preview_pdf_generated_browsertest.cc", "../browser/printing/pwg_raster_converter_browsertest.cc", "../browser/process_singleton_browsertest.cc", "../browser/profile_resetter/profile_resetter_browsertest.cc", @@ -1387,7 +635,6 @@ test("browser_tests") { "../browser/profiles/profile_browsertest.cc", "../browser/profiles/profile_list_desktop_browsertest.cc", "../browser/profiles/profile_manager_browsertest.cc", - "../browser/profiles/profile_window_browsertest.cc", "../browser/push_messaging/push_messaging_browsertest.cc", "../browser/referrer_policy_browsertest.cc", "../browser/renderer_context_menu/mock_render_view_context_menu.cc", @@ -1401,16 +648,16 @@ test("browser_tests") { "../browser/renderer_host/render_process_host_chrome_browsertest.cc", "../browser/repost_form_warning_browsertest.cc", "../browser/resource_coordinator/resource_coordinator_render_process_probe_browsertest.cc", + "../browser/resource_coordinator/tab_lifecycle_observer_browsertest.cc", "../browser/resource_coordinator/tab_manager_browsertest.cc", - "../browser/resource_coordinator/tab_manager_observer_browsertest.cc", "../browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc", "../browser/safe_browsing/test_safe_browsing_database_helper.cc", "../browser/safe_browsing/test_safe_browsing_database_helper.h", "../browser/safe_json_parser_browsertest.cc", - "../browser/search/hotword_installer_browsertest.cc", + "../browser/safe_xml_parser_browsertest.cc", "../browser/search/suggestions/image_fetcher_impl_browsertest.cc", "../browser/search_engines/template_url_scraper_browsertest.cc", - "../browser/service_process/service_process_control_browsertest.cc", + "../browser/secure_origin_whitelist_browsertest.cc", "../browser/sessions/better_session_restore_browsertest.cc", "../browser/sessions/persistent_tab_restore_service_browsertest.cc", "../browser/sessions/session_restore_browsertest.cc", @@ -1418,20 +665,24 @@ test("browser_tests") { "../browser/sessions/session_restore_observer_browsertest.cc", "../browser/sessions/tab_restore_browsertest.cc", "../browser/site_details_browsertest.cc", + "../browser/thumbnails/thumbnail_browsertest.cc", + "../browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc", # If this list is used on Android in the future, these browser/speech/* # files will probably not be applicable. + "../browser/net/network_connection_tracker_browsertest.cc", "../browser/speech/extension_api/tts_extension_apitest.cc", "../browser/speech/speech_recognition_browsertest.cc", + "../browser/spellchecker/spellcheck_mac_view_browsertest.mm", "../browser/spellchecker/spellcheck_service_browsertest.cc", "../browser/ssl/cert_verifier_browser_test.cc", "../browser/ssl/cert_verifier_browser_test.h", "../browser/ssl/certificate_reporting_test_utils.cc", "../browser/ssl/certificate_reporting_test_utils.h", - "../browser/ssl/chrome_expect_ct_reporter_browser_tests.cc", + "../browser/ssl/chrome_expect_ct_reporter_browsertest.cc", "../browser/ssl/chrome_ssl_host_state_delegate_test.cc", - "../browser/ssl/security_state_tab_helper_browser_tests.cc", - "../browser/ssl/ssl_browser_tests.cc", + "../browser/ssl/security_state_tab_helper_browsertest.cc", + "../browser/ssl/ssl_browsertest.cc", "../browser/ssl/ssl_client_certificate_selector_test.cc", "../browser/ssl/ssl_client_certificate_selector_test.h", "../browser/storage/durable_storage_browsertest.cc", @@ -1439,13 +690,12 @@ test("browser_tests") { "../browser/subresource_filter/subresource_filter_browser_test_harness.h", "../browser/subresource_filter/subresource_filter_browsertest.cc", "../browser/subresource_filter/subresource_filter_devtools_browsertest.cc", + "../browser/subresource_filter/subresource_filter_intercepting_browsertest.cc", "../browser/subresource_filter/subresource_filter_popup_browsertest.cc", "../browser/subresource_filter/subresource_filter_settings_browsertest.cc", "../browser/subresource_filter/subresource_filter_special_subframe_navigations_browsertest.cc", "../browser/subresource_filter/subresource_filter_web_socket_browsertest.cc", "../browser/subresource_filter/subresource_filter_worker_browsertest.cc", - "../browser/subresource_filter/test_ruleset_publisher.cc", - "../browser/subresource_filter/test_ruleset_publisher.h", "../browser/sync_file_system/mock_local_change_processor.cc", "../browser/sync_file_system/mock_local_change_processor.h", "../browser/sync_file_system/mock_remote_file_sync_service.cc", @@ -1473,6 +723,7 @@ test("browser_tests") { "../browser/ui/autofill/card_unmask_prompt_view_tester.h", "../browser/ui/autofill/password_generation_popup_view_browsertest.cc", "../browser/ui/autofill/password_generation_popup_view_tester.h", + "../browser/ui/autofill/save_card_bubble_controller_impl_browsertest.cc", "../browser/ui/bookmarks/bookmark_browsertest.cc", "../browser/ui/browser_browsertest.cc", "../browser/ui/browser_command_controller_browsertest.cc", @@ -1484,20 +735,19 @@ test("browser_tests") { "../browser/ui/content_settings/content_setting_bubble_model_browsertest.cc", "../browser/ui/content_settings/content_setting_image_model_browsertest.cc", "../browser/ui/exclusive_access/fullscreen_controller_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", + "../browser/ui/find_bar/find_bar_controller_browsertest.cc", "../browser/ui/find_bar/find_bar_host_browsertest.cc", + "../browser/ui/hung_renderer_browsertest.cc", "../browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc", "../browser/ui/location_bar/location_bar_browsertest.cc", "../browser/ui/login/login_handler_browsertest.cc", "../browser/ui/native_window_tracker_browsertest.cc", "../browser/ui/passwords/manage_passwords_test.cc", - "../browser/ui/permission_bubble/mock_permission_prompt.cc", - "../browser/ui/permission_bubble/mock_permission_prompt.h", - "../browser/ui/permission_bubble/mock_permission_prompt_factory.cc", - "../browser/ui/permission_bubble/mock_permission_prompt_factory.h", "../browser/ui/permission_bubble/permission_bubble_browser_test_util.cc", "../browser/ui/permission_bubble/permission_bubble_browser_test_util.h", "../browser/ui/prefs/prefs_tab_helper_browsertest.cc", @@ -1506,7 +756,14 @@ test("browser_tests") { "../browser/ui/search/instant_test_base.h", "../browser/ui/search/instant_test_utils.cc", "../browser/ui/search/instant_test_utils.h", + "../browser/ui/search/instant_theme_browsertest.cc", "../browser/ui/search/local_ntp_browsertest.cc", + "../browser/ui/search/local_ntp_doodle_browsertest.cc", + "../browser/ui/search/local_ntp_js_browsertest.cc", + "../browser/ui/search/local_ntp_one_google_bar_browsertest.cc", + "../browser/ui/search/local_ntp_test_utils.cc", + "../browser/ui/search/local_ntp_test_utils.h", + "../browser/ui/search/local_ntp_voice_search_browsertest.cc", "../browser/ui/search/new_tab_page_interceptor_browsertest.cc", "../browser/ui/search_engines/search_engine_tab_helper_browsertest.cc", "../browser/ui/settings_window_manager_browsertest_chromeos.cc", @@ -1520,6 +777,8 @@ test("browser_tests") { "../browser/ui/test/browser_dialog_browsertest.cc", "../browser/ui/test/test_browser_dialog.cc", "../browser/ui/test/test_browser_dialog.h", + "../browser/ui/test/test_browser_dialog_mac.h", + "../browser/ui/test/test_browser_dialog_mac.mm", "../browser/ui/toolbar/browser_actions_bar_browsertest.cc", "../browser/ui/toolbar/browser_actions_bar_browsertest.h", "../browser/ui/toolbar/component_toolbar_actions_browsertest.cc", @@ -1528,12 +787,12 @@ test("browser_tests") { "../browser/ui/update_chrome_dialog_browsertest.cc", "../browser/ui/views/apps/app_info_dialog/app_info_dialog_views_browsertest.cc", "../browser/ui/views/chrome_cleaner_dialog_browsertest_win.cc", - "../browser/ui/views/extensions/chooser_dialog_view_browsertest.cc", - "../browser/ui/views/hung_renderer_view_browsertest.cc", - "../browser/ui/views/try_chrome_dialog_browsertest.cc", + "../browser/ui/views/chrome_cleaner_reboot_dialog_browsertest_win.cc", + "../browser/ui/views/device_chooser_browsertest.cc", + "../browser/ui/views/try_chrome_dialog_win/try_chrome_dialog_browsertest.cc", "../browser/ui/webui/bookmarks_ui_browsertest.cc", "../browser/ui/webui/chrome_url_data_manager_browsertest.cc", - "../browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h", + "../browser/ui/webui/chromeos/bluetooth_pairing_dialog_browsertest-inl.h", "../browser/ui/webui/constrained_web_dialog_ui_browsertest.cc", "../browser/ui/webui/extensions/extension_settings_browsertest.cc", "../browser/ui/webui/extensions/extension_settings_browsertest.h", @@ -1551,7 +810,6 @@ test("browser_tests") { "../browser/ui/webui/policy_tool_ui_browsertest.cc", "../browser/ui/webui/policy_ui_browsertest.cc", "../browser/ui/webui/prefs_internals_browsertest.cc", - "../browser/ui/webui/print_preview/print_preview_ui_browsertest.cc", "../browser/ui/webui/profile_helper_browsertest.cc", "../browser/ui/webui/set_as_default_browser_ui_browsertest_win.cc", "../browser/ui/webui/settings/md_settings_ui_browsertest.cc", @@ -1577,7 +835,7 @@ test("browser_tests") { "../renderer/autofill/form_autocomplete_browsertest.cc", "../renderer/autofill/form_autofill_browsertest.cc", "../renderer/autofill/form_classifier_browsertest.cc", - "../renderer/autofill/page_click_tracker_browsertest.cc", + "../renderer/autofill/form_control_click_detection_browsertest.cc", "../renderer/autofill/page_passwords_analyser_browsertest.cc", "../renderer/autofill/password_autofill_agent_browsertest.cc", "../renderer/autofill/password_generation_agent_browsertest.cc", @@ -1608,7 +866,7 @@ test("browser_tests") { "gpu/webgl_infobar_browsertest.cc", "ppapi/ppapi_browsertest.cc", "ppapi/ppapi_filechooser_browsertest.cc", - "v8/wasm_trap_handler.cc", + "v8/wasm_trap_handler_browsertest.cc", ] deps += [ @@ -1628,6 +886,7 @@ test("browser_tests") { "//components/dom_distiller/content/renderer", "//components/dom_distiller/core:test_support", "//components/feature_engagement/test:test_support", + "//components/optimization_guide:test_support", "//components/policy:chrome_settings_proto_generated_compile", "//components/resources", "//components/safe_browsing/db:test_database_manager", @@ -1729,7 +988,6 @@ test("browser_tests") { "$root_out_dir/resources.pak", ] } - if (enable_captive_portal_detection) { sources += [ "../browser/ssl/captive_portal_blocking_page_browsertest.cc" ] @@ -1823,7 +1081,6 @@ test("browser_tests") { "../browser/extensions/api/browser/browser_apitest.cc", "../browser/extensions/api/browsing_data/browsing_data_test.cc", "../browser/extensions/api/cast_streaming/cast_streaming_apitest.cc", - "../browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc", "../browser/extensions/api/command_line_private/command_line_private_apitest.cc", "../browser/extensions/api/commands/command_service_browsertest.cc", "../browser/extensions/api/content_settings/content_settings_apitest.cc", @@ -1835,6 +1092,7 @@ test("browser_tests") { "../browser/extensions/api/declarative_content/declarative_content_apitest.cc", "../browser/extensions/api/declarative_content/request_content_script_apitest.cc", "../browser/extensions/api/declarative_content/set_icon_apitest.cc", + "../browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc", "../browser/extensions/api/desktop_capture/desktop_capture_apitest.cc", "../browser/extensions/api/developer_private/developer_private_apitest.cc", "../browser/extensions/api/dial/dial_apitest.cc", @@ -1901,6 +1159,7 @@ test("browser_tests") { "../browser/extensions/api/webrtc_from_web_accessible_resource_browsertest.cc", "../browser/extensions/api/webrtc_logging_private/webrtc_event_log_apitest.cc", "../browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc", + "../browser/extensions/api/webrtc_logging_private/webrtc_logging_private_browsertest.cc", "../browser/extensions/api/webstore_private/webstore_private_apitest.cc", "../browser/extensions/api_binding_perf_browsertest.cc", "../browser/extensions/app_background_page_apitest.cc", @@ -1974,7 +1233,6 @@ test("browser_tests") { "../browser/extensions/external_install_error_browsertest.cc", "../browser/extensions/fetch_apitest.cc", "../browser/extensions/gpu_browsertest.cc", - "../browser/extensions/hotword_browsertest.cc", "../browser/extensions/isolated_app_browsertest.cc", "../browser/extensions/lazy_background_page_apitest.cc", "../browser/extensions/lazy_background_page_test_util.h", @@ -1996,6 +1254,7 @@ test("browser_tests") { "../browser/extensions/updater/extension_cache_fake.h", "../browser/extensions/view_extension_source_browsertest.cc", "../browser/extensions/wake_event_page_apitest.cc", + "../browser/extensions/wasm_app_browsertest.cc", "../browser/extensions/web_contents_browsertest.cc", "../browser/extensions/webstore_inline_installer_browsertest.cc", "../browser/extensions/webstore_installer_browsertest.cc", @@ -2005,6 +1264,9 @@ test("browser_tests") { "../browser/extensions/webstore_startup_installer_browsertest.cc", "../browser/extensions/window_open_apitest.cc", "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_dialog_controller_impl_browsertest_win.cc", + "../browser/safe_browsing/chrome_cleaner/chrome_cleaner_reboot_dialog_controller_impl_browsertest_win.cc", + "../browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_controller_win.cc", + "../browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_controller_win.h", "../browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc", "../browser/safe_browsing/settings_reset_prompt/default_settings_fetcher_browsertest.cc", "../browser/safe_browsing/settings_reset_prompt/settings_reset_dependency_browsertest_win.cc", @@ -2027,7 +1289,10 @@ test("browser_tests") { "//extensions/common/api", ] - data += [ "//extensions/test/data/" ] + data += [ + "//chrome/test/data/extensions/", + "//extensions/test/data/", + ] } if (use_aura) { @@ -2043,13 +1308,18 @@ test("browser_tests") { if (toolkit_views) { sources += [ "../browser/payments/manifest_verifier_browsertest.cc", - "../browser/payments/payment_manifest_parser_host_browsertest.cc", + "../browser/payments/payment_manifest_parser_browsertest.cc", + "../browser/payments/service_worker_payment_app_factory_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/views/autofill/card_unmask_prompt_view_tester_views.cc", + "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h", + "../browser/ui/views/autofill/dialog_event_waiter.h", "../browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc", "../browser/ui/views/bookmarks/bookmark_editor_view_browsertest.cc", "../browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc", + "../browser/ui/views/extensions/pwa_confirmation_view_browsertest.cc", "../browser/ui/views/external_protocol_dialog_browsertest.cc", "../browser/ui/views/first_run_bubble_browsertest.cc", "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win.cc", @@ -2075,6 +1345,7 @@ test("browser_tests") { "../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_no_update_with_browsertest.cc", "../browser/ui/views/payments/payment_request_payment_app_browsertest.cc", "../browser/ui/views/payments/payment_request_payment_response_browsertest.cc", "../browser/ui/views/payments/payment_request_shipping_address_instance_browsertest.cc", @@ -2083,18 +1354,19 @@ test("browser_tests") { "../browser/ui/views/payments/profile_list_view_controller_browsertest.cc", "../browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc", "../browser/ui/views/payments/shipping_option_view_controller_browsertest.cc", + "../browser/ui/views/profiles/profile_chooser_view_browsertest.cc", "../browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog_browsertest.cc", "../browser/ui/views/select_file_dialog_extension_browsertest.cc", "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_browsertest.cc", ] deps += [ + "//components/payments/core:test_support", "//ui/views", "//url", ] if (!is_chromeos && (!is_mac || mac_views_browser)) { sources += [ "../browser/ui/views/profiles/forced_reauthentication_dialog_view_browsertest.cc", - "../browser/ui/views/profiles/profile_chooser_view_browsertest.cc", "../browser/ui/views/toolbar/outdated_upgrade_bubble_view_browsertest.cc", ] } @@ -2105,8 +1377,6 @@ test("browser_tests") { # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979. "../browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc", "../browser/ui/views/autofill/autofill_popup_view_views_browsertest.cc", - "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc", - "../browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h", "../browser/ui/views/autofill/password_generation_popup_view_tester_views.cc", "../browser/ui/views/autofill/password_generation_popup_view_tester_views.h", "../browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc", @@ -2141,6 +1411,7 @@ test("browser_tests") { } if (is_chromeos) { + assert(enable_app_list) sources += [ "../browser/chromeos/accessibility/accessibility_manager_browsertest.cc", "../browser/chromeos/accessibility/magnification_manager_browsertest.cc", @@ -2162,9 +1433,6 @@ test("browser_tests") { "../browser/chromeos/attestation/attestation_policy_browsertest.cc", "../browser/chromeos/customization/customization_document_browsertest.cc", "../browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc", - "../browser/chromeos/device/input_service_proxy_browsertest.cc", - "../browser/chromeos/device/input_service_test_helper.cc", - "../browser/chromeos/device/input_service_test_helper.h", "../browser/chromeos/display/quirks_browsertest.cc", "../browser/chromeos/drive/drive_integration_service_browsertest.cc", "../browser/chromeos/extensions/accessibility_features_apitest.cc", @@ -2195,7 +1463,6 @@ test("browser_tests") { "../browser/chromeos/file_manager/mount_test_util.cc", "../browser/chromeos/file_manager/mount_test_util.h", "../browser/chromeos/file_manager/video_player_browsertest.cc", - "../browser/chromeos/file_manager/zip_file_creator_browsertest.cc", "../browser/chromeos/first_run/chromeos_first_run_browsertest.cc", "../browser/chromeos/first_run/drive_first_run_browsertest.cc", "../browser/chromeos/first_run/goodies_displayer_browsertest.cc", @@ -2290,6 +1557,7 @@ test("browser_tests") { "../browser/chromeos/policy/power_policy_browsertest.cc", "../browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc", "../browser/chromeos/policy/signin_profile_apps_policy_browsertest.cc", + "../browser/chromeos/policy/unaffiliated_arc_allowed_browsertest.cc", "../browser/chromeos/policy/user_affiliation_browsertest.cc", "../browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc", "../browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc", @@ -2305,8 +1573,10 @@ test("browser_tests") { "../browser/download/notification/download_notification_browsertest.cc", "../browser/drive/drive_notification_manager_factory_browsertest.cc", "../browser/extensions/api/certificate_provider/certificate_provider_apitest.cc", - "../browser/extensions/api/hotword_private/hotword_private_apitest.cc", + "../browser/extensions/api/networking_private/networking_private_apitest.cc", + "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", "../browser/extensions/api/vpn_provider/vpn_provider_apitest.cc", + "../browser/signin/chromeos_mirror_account_consistency_browsertest.cc", "../browser/ui/ash/accelerator_commands_browsertest.cc", "../browser/ui/ash/app_list/app_list_browsertest.cc", "../browser/ui/ash/chrome_new_window_client_browsertest.cc", @@ -2338,9 +1608,11 @@ test("browser_tests") { # chromeos does not support profile list avatar menu "../browser/profiles/profile_list_desktop_browsertest.cc", - "../browser/service_process/service_process_control_browsertest.cc", "../browser/ui/views/external_protocol_dialog_browsertest.cc", + # chromeos does not use the profile chooser view + "../browser/ui/views/profiles/profile_chooser_view_browsertest.cc", + # inline login UI is disabled on chromeos "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_browsertest.cc", "../browser/ui/webui/profile_helper_browsertest.cc", @@ -2350,13 +1622,15 @@ test("browser_tests") { "../browser/ui/webui/signin/user_manager_ui_browsertest.cc", ] deps += [ + ":test_support_applist_chromeos", "//ash:test_support_with_content", "//ash/public/interfaces:test_interfaces", "//chrome/browser/chromeos:arc_test_support", + "//chrome/services/file_util/public/cpp:browser_tests", "//components/arc:arc_test_support", "//components/prefs", "//components/user_manager:test_support", - "//mojo/public/cpp/test_support:test_utils", + "//services/network/public/interfaces", "//services/preferences/public/cpp", "//services/preferences/public/interfaces", "//services/service_manager/public/cpp", @@ -2364,9 +1638,6 @@ test("browser_tests") { "//ui/login:resources", "//url", ] - if (enable_app_list) { - deps += [ ":test_support_applist_chromeos" ] - } if (use_dbus) { deps += [ "//dbus:test_support" ] } @@ -2376,6 +1647,7 @@ test("browser_tests") { "../browser/net/nss_context_chromeos_browsertest.cc", "data/webui/certificate_viewer_ui_test-inl.h", ] + sources += [ "../browser/profiles/profile_window_browsertest.cc" ] if (enable_extensions) { sources -= [ "../browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc", @@ -2385,24 +1657,31 @@ test("browser_tests") { ] } if (toolkit_views) { - sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] + sources -= [ + "../browser/ui/views/select_file_dialog_extension_browsertest.cc", + ] } if (is_win || is_linux) { - sources += [ - "../browser/feature_engagement/incognito_window/incognito_window_tracker_browsertest.cc", - "../browser/feature_engagement/new_tab/new_tab_tracker_browsertest.cc", - "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc", - ] + sources += + [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ] } } + if (enable_desktop_in_product_help) { + sources += [ + "../browser/feature_engagement/incognito_window/incognito_window_tracker_browsertest.cc", + "../browser/feature_engagement/new_tab/new_tab_tracker_browsertest.cc", + ] + } if (safe_browsing_mode == 1) { sources += [ "../browser/safe_browsing/certificate_reporting_service_browsertest.cc", "../browser/safe_browsing/chrome_password_protection_service_browsertest.cc", + "../browser/safe_browsing/client_side_detection_host_browsertest.cc", "../browser/safe_browsing/permission_reporter_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", + "../browser/safe_browsing/v4_embedded_test_server_browsertest.cc", "../renderer/safe_browsing/phishing_classifier_browsertest.cc", "../renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc", "../renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc", @@ -2437,6 +1716,7 @@ test("browser_tests") { } } if (is_win) { + sources += [ "../browser/printing/pdf_to_emf_converter_browsertest.cc" ] deps += [ "//chrome:other_version", "//chrome/app:command_ids", @@ -2477,6 +1757,7 @@ test("browser_tests") { "../browser/ui/cocoa/applescript/bookmark_folder_applescript_browsertest.mm", "../browser/ui/cocoa/applescript/bookmark_item_applescript_browsertest.mm", "../browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm", + "../browser/ui/cocoa/applescript/tab_applescript_browsertest.mm", "../browser/ui/cocoa/applescript/window_applescript_test.mm", "../browser/ui/cocoa/certificate_viewer_mac_browsertest.mm", "../browser/ui/cocoa/share_menu_controller_browsertest.mm", @@ -2565,26 +1846,23 @@ test("browser_tests") { if (!is_posix || is_chromeos) { sources -= [ "../common/time_format_browsertest.cc" ] } - if (is_chromeos) { - sources += [ - "../browser/extensions/api/networking_private/networking_private_apitest.cc", - "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", - ] - } + if (is_mac || is_win || (is_linux && !is_chromeos)) { sources += [ # Tests for non mobile and non CrOS (includes Linux, Win, Mac). "../browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc", "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc", "../browser/metrics/desktop_session_duration/chrome_visibility_observer_browsertest.cc", - "../browser/metrics/tab_stats_data_store_unittests.cc", - "../browser/metrics/tab_stats_tracker_unittests.cc", "../browser/profiles/profile_statistics_browsertest.cc", ] } if (is_mac || is_win || is_chromeos) { sources += [ "../browser/extensions/api/networking_cast_private/networking_cast_private_apitest.cc" ] } + if (is_desktop_linux || is_mac) { + sources += + [ "../browser/first_run/first_run_internal_posix_browsertest.cc" ] + } if (enable_app_list) { sources += [ "../browser/apps/drive/drive_app_converter_browsertest.cc", @@ -2612,33 +1890,35 @@ test("browser_tests") { "//third_party/widevine/cdm:widevinecdmadapter", ] } - if (!enable_print_preview) { - sources -= [ + if (enable_print_preview) { + sources += [ "../browser/printing/print_browsertest.cc", "../browser/printing/print_preview_dialog_controller_browsertest.cc", "../browser/printing/print_preview_pdf_generated_browsertest.cc", - "../browser/service_process/service_process_control_browsertest.cc", "../browser/ui/webui/print_preview/print_preview_ui_browsertest.cc", ] - if (enable_extensions) { - sources -= [ "../browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc" ] + if (enable_extensions && !is_chromeos) { + sources += [ "../browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc" ] + } + if (!is_mac && !is_chromeos) { + sources += [ + # This test depends on GetCommandLineForRelaunch, which is not + # available on Mac. It is also not intended to run on ChromeOS. + "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc", + ] + } + if (!is_chromeos) { + sources += [ + # Not intended to run on ChromeOS. + "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc", + "../browser/service_process/service_process_control_browsertest.cc", + ] } - } - if (!enable_print_preview || is_mac || is_chromeos) { - sources -= [ - # This test depends on GetCommandLineForRelaunch, which is not - # available on Mac. It is also not intended to run on ChromeOS. - "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc", - ] - } - if (!enable_print_preview || is_chromeos) { - sources -= [ - # Not intended to run on ChromeOS. - "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc", - ] } if (enable_mdns) { - sources += [ "../browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc" ] + sources += [ + "../browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc", + ] } if (use_brlapi) { deps += [ "//build/linux/libbrlapi" ] @@ -2692,7 +1972,7 @@ test("browser_tests") { ] } if (!is_chromeos) { - sources += [ "../browser/ui/views/message_center/web_notification_tray_browsertest.cc" ] + sources += [ "../browser/ui/views/message_center/popups_only_ui_delegate_browsertest.cc" ] } } @@ -2702,253 +1982,6 @@ test("browser_tests") { } } -if (!is_android && !is_fuchsia) { - test("sync_integration_tests") { - sources = [ - "../app/chrome_version.rc.version", - "../browser/sync/test/integration/enable_disable_test.cc", - "../browser/sync/test/integration/migration_test.cc", - "../browser/sync/test/integration/single_client_app_list_sync_test.cc", - "../browser/sync/test/integration/single_client_apps_sync_test.cc", - "../browser/sync/test/integration/single_client_arc_package_sync_test.cc", - "../browser/sync/test/integration/single_client_bookmarks_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_extensions_sync_test.cc", - "../browser/sync/test/integration/single_client_passwords_sync_test.cc", - "../browser/sync/test/integration/single_client_preferences_sync_test.cc", - "../browser/sync/test/integration/single_client_printers_sync_test.cc", - "../browser/sync/test/integration/single_client_search_engines_sync_test.cc", - "../browser/sync/test/integration/single_client_sessions_sync_test.cc", - "../browser/sync/test/integration/single_client_supervised_user_settings_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_events_sync_test.cc", - "../browser/sync/test/integration/single_client_wallet_sync_test.cc", - "../browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc", - "../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", - "../browser/sync/test/integration/two_client_app_list_sync_test.cc", - "../browser/sync/test/integration/two_client_apps_sync_test.cc", - "../browser/sync/test/integration/two_client_arc_package_sync_test.cc", - "../browser/sync/test/integration/two_client_autofill_sync_test.cc", - "../browser/sync/test/integration/two_client_bookmarks_sync_test.cc", - "../browser/sync/test/integration/two_client_dictionary_sync_test.cc", - "../browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc", - "../browser/sync/test/integration/two_client_extensions_sync_test.cc", - "../browser/sync/test/integration/two_client_passwords_sync_test.cc", - "../browser/sync/test/integration/two_client_preferences_sync_test.cc", - "../browser/sync/test/integration/two_client_printers_sync_test.cc", - "../browser/sync/test/integration/two_client_search_engines_sync_test.cc", - "../browser/sync/test/integration/two_client_sessions_sync_test.cc", - "../browser/sync/test/integration/two_client_themes_sync_test.cc", - "../browser/sync/test/integration/two_client_typed_urls_sync_test.cc", - "../browser/sync/test/integration/two_client_uss_sync_test.cc", - "../browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc", - "data/resource.rc", - ] - - data = [ - "//chrome/test/data/sync/", - "//net/tools/testserver/", - "//components/sync/tools/testserver/", - "//third_party/pyftpdlib/", - "//third_party/pywebsocket/", - "//third_party/tlslite/", - "$root_out_dir/pyproto/", - "//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" ] - - deps = [ - ":browser_tests_runner", - ":sync_integration_test_support", - ":test_support", - ":test_support_ui", - "//chrome:packed_resources", - "//chrome:resources", - "//chrome:strings", - "//chrome/app:chrome_dll_resources", - "//chrome/app:command_ids", - "//chrome/common", - "//chrome/renderer", - "//components/sync", - "//crypto:platform", - "//testing/gmock", - "//testing/gtest", - "//third_party/WebKit/public:blink", - "//third_party/icu", - "//third_party/leveldatabase", - ] - - data_deps = [ - "//third_party/mesa:osmesa", - ] - - if (is_mac) { - # Dictionary sync is disabled on Mac. - sources -= [ - "../browser/sync/test/integration/single_client_dictionary_sync_test.cc", - "../browser/sync/test/integration/two_client_dictionary_sync_test.cc", - ] - - data_deps += [ - "//chrome", - "//chrome:chrome_framework", - ] - } - if (is_win) { - deps += [ - "//chrome:other_version", - "//third_party/wtl", - "//ui/resources", - ] - - configs -= [ "//build/config/win:default_incremental_linking" ] - configs += - [ "//build/config/win:default_large_module_incremental_linking" ] - } else { - sources -= [ "../app/chrome_version.rc.version" ] - } - if (!is_chromeos) { - sources -= [ - "../browser/sync/test/integration/single_client_arc_package_sync_test.cc", - "../browser/sync/test/integration/single_client_printers_sync_test.cc", - "../browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc", - "../browser/sync/test/integration/two_client_arc_package_sync_test.cc", - "../browser/sync/test/integration/two_client_printers_sync_test.cc", - "../browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc", - ] - } - - if (toolkit_views) { - deps += [ "//ui/views" ] - } - if (enable_basic_printing || enable_print_preview) { - deps += [ "//printing" ] - } - if (!enable_app_list) { - sources -= [ - "../browser/sync/test/integration/single_client_app_list_sync_test.cc", - "../browser/sync/test/integration/two_client_app_list_sync_test.cc", - ] - } - if (!enable_supervised_users) { - sources -= [ "../browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc" ] - } - } - - test("sync_performance_tests") { - sources = [ - "../app/chrome_version.rc.version", - "../browser/sync/test/integration/performance/autofill_sync_perf_test.cc", - "../browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc", - "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc", - "../browser/sync/test/integration/performance/extensions_sync_perf_test.cc", - "../browser/sync/test/integration/performance/passwords_sync_perf_test.cc", - "../browser/sync/test/integration/performance/sessions_sync_perf_test.cc", - "../browser/sync/test/integration/performance/sync_timing_helper.cc", - "../browser/sync/test/integration/performance/sync_timing_helper.h", - "../browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc", - "base/browser_perf_tests_main.cc", - "data/resource.rc", - ] - - defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] - - deps = [ - ":sync_integration_test_support", - ":test_support_ui", - "//chrome/app:chrome_dll_resources", - "//chrome/app:command_ids", - "//components/sync", - "//crypto:platform", - "//testing/gmock", - "//testing/gtest", - ] - - if (is_mac) { - # Dictionary sync is disabled on Mac. - sources -= [ "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc" ] - - # The sync_performance_tests do not run on mac without this flag. - # Search for comments about "xcode_settings" elsewhere in this file. - ldflags = [ "-Wl,-ObjC" ] - } - if (is_win) { - deps += [ - "//chrome:other_version", - "//chrome/installer/util:strings", - "//third_party/wtl", - "//ui/resources", - ] - configs -= [ "//build/config/win:default_incremental_linking" ] - configs += - [ "//build/config/win:default_large_module_incremental_linking" ] - } else { - sources -= [ "../app/chrome_version.rc.version" ] - } - - if (toolkit_views) { - deps += [ "//ui/views" ] - } - - # This target should not require the Chrome executable to run. - assert_no_deps = [ "//chrome" ] - } - - # Executable to measure time to load libraries. - test("load_library_perf_tests") { - 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 - # world, causing link time to explode. Please don't add more dependencies - # here without understanding how it affects link time (and factor them - # differently if possible). - deps = [ - "//base/test:test_support_perf", - "//media:media_features", - "//testing/gtest", - "//testing/perf", - "//third_party/widevine/cdm:headers", - ] - - if (enable_library_cdms) { - deps += [ "//media/cdm:cdm_paths" ] - data_deps = [ - "//media/cdm/ppapi:clearkeycdmadapter", - "//third_party/widevine/cdm:widevinecdmadapter", - ] - } - - data = [ - # Needed for isolate script to execute. - "//testing/scripts/common.py", - "//testing/xvfb.py", - "//testing/scripts/run_gtest_perf_test.py", - "//tools/perf/generate_legacy_perf_dashboard_json.py", - ] - - # This target should not require the Chrome executable to run. - assert_no_deps = [ "//chrome" ] - } -} - group("telemetry_perf_unittests") { testonly = true deps = [ @@ -2968,7 +2001,7 @@ group("telemetry_perf_unittests") { "//testing/scripts/run_multiple_telemetry_benchmarks_as_googletest.py", ] - if (enable_package_mash_services) { + if (enable_mus) { deps += [ "//chrome:chrome_test" ] data_deps = [ "//chrome:chrome_test", @@ -3032,6 +2065,17 @@ group("angle_perftests") { ] } +if (is_mac) { + mojom("firefox_importer_interface") { + sources = [ + "../utility/importer/firefox_importer_unittest_utils_mac.mojom", + ] + public_deps = [ + "//components/autofill/content/common:mojo_types", + ] + } +} + test("unit_tests") { sources = [ # enums.xml is analyzed by AboutFlagsHistogramTest, so this @@ -3069,9 +2113,11 @@ test("unit_tests") { "../browser/android/net/external_estimate_provider_android_unittest.cc", "../browser/android/ntp/content_suggestions_notifier_service_unittest.cc", "../browser/android/ntp/content_suggestions_notifier_unittest.cc", + "../browser/android/oom_intervention/near_oom_monitor_unittest.cc", "../browser/android/physical_web/eddystone_encoder_bridge_unittest.cc", "../browser/android/physical_web/physical_web_data_source_android_unittest.cc", "../browser/android/preferences/pref_service_bridge_unittest.cc", + "../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", @@ -3104,6 +2150,7 @@ test("unit_tests") { "../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", + "../browser/browsing_data/browsing_data_shared_worker_helper_unittest.cc", "../browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc", "../browser/browsing_data/cookies_tree_model_unittest.cc", "../browser/browsing_data/site_data_counting_helper_unittest.cc", @@ -3113,9 +2160,10 @@ test("unit_tests") { "../browser/budget_service/budget_manager_unittest.cc", "../browser/chrome_content_browser_client_unittest.cc", "../browser/chrome_process_singleton_win_unittest.cc", - "../browser/command_updater_unittest.cc", + "../browser/command_updater_impl_unittest.cc", "../browser/component_updater/chrome_component_updater_configurator_unittest.cc", "../browser/component_updater/component_installer_errors_unittest.cc", + "../browser/component_updater/optimization_hints_component_installer_unittest.cc", "../browser/component_updater/origin_trials_component_installer_unittest.cc", "../browser/component_updater/sth_set_component_installer_unittest.cc", "../browser/component_updater/subresource_filter_component_installer_unittest.cc", @@ -3163,11 +2211,10 @@ test("unit_tests") { "../browser/engagement/site_engagement_helper_unittest.cc", "../browser/engagement/site_engagement_score_unittest.cc", "../browser/engagement/site_engagement_service_unittest.cc", + "../browser/engagement/top_sites/site_engagement_top_sites_provider_unittest.cc", "../browser/external_protocol/external_protocol_handler_unittest.cc", "../browser/file_select_helper_unittest.cc", "../browser/font_pref_change_notifier_unittest.cc", - "../browser/gcm/fake_gcm_profile_service.cc", - "../browser/gcm/fake_gcm_profile_service.h", "../browser/geolocation/geolocation_permission_context_unittest.cc", "../browser/global_keyboard_shortcuts_mac_unittest.mm", "../browser/google/google_update_settings_unittest.cc", @@ -3189,7 +2236,6 @@ test("unit_tests") { "../browser/installable/installable_manager_unittest.cc", "../browser/installable/installable_task_queue_unittest.cc", "../browser/internal_auth_unittest.cc", - "../browser/io_thread_unittest.cc", "../browser/language/language_model_factory_unittest.cc", "../browser/language/url_language_histogram_factory_unittest.cc", "../browser/loader/chrome_navigation_data_unittest.cc", @@ -3202,24 +2248,27 @@ test("unit_tests") { "../browser/media/media_engagement_contents_observer_unittest.cc", "../browser/media/media_engagement_score_unittest.cc", "../browser/media/media_engagement_service_unittest.cc", + "../browser/media/media_engagement_session_unittest.cc", "../browser/media/media_storage_id_salt_unittest.cc", "../browser/media/midi_permission_context_unittest.cc", "../browser/media/midi_sysex_permission_context_unittest.cc", "../browser/media/router/browser_presentation_connection_proxy_unittest.cc", "../browser/media/router/issue_manager_unittest.cc", + "../browser/media/router/local_presentation_manager_factory_unittest.cc", + "../browser/media/router/local_presentation_manager_unittest.cc", "../browser/media/router/media_router_base_unittest.cc", "../browser/media/router/media_router_dialog_controller_unittest.cc", "../browser/media/router/media_router_factory_unittest.cc", "../browser/media/router/media_router_metrics_unittest.cc", "../browser/media/router/media_sinks_observer_unittest.cc", - "../browser/media/router/offscreen_presentation_manager_factory_unittest.cc", - "../browser/media/router/offscreen_presentation_manager_unittest.cc", "../browser/media/router/presentation_media_sinks_observer_unittest.cc", "../browser/media/router/presentation_service_delegate_impl_unittest.cc", "../browser/media/webrtc/media_stream_device_permission_context_unittest.cc", "../browser/metrics/antivirus_metrics_provider_win_unittest.cc", "../browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc", "../browser/metrics/chrome_metrics_service_accessor_unittest.cc", + "../browser/metrics/chrome_metrics_service_client_unittest.cc", + "../browser/metrics/oom/out_of_memory_reporter_unittest.cc", "../browser/metrics/perf/perf_provider_chromeos_unittest.cc", "../browser/metrics/process_memory_metrics_emitter_unittest.cc", "../browser/metrics/subprocess_metrics_provider_unittest.cc", @@ -3240,6 +2289,7 @@ test("unit_tests") { "../browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc", "../browser/net/url_info_unittest.cc", "../browser/notifications/desktop_notification_profile_util_unittest.cc", + "../browser/notifications/metrics/notification_metrics_logger_unittest.cc", "../browser/notifications/notification_channels_provider_android_unittest.cc", "../browser/notifications/notification_permission_context_unittest.cc", "../browser/notifications/notification_platform_bridge_mac_unittest.mm", @@ -3266,11 +2316,12 @@ test("unit_tests") { "../browser/page_load_metrics/observers/lofi_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/media_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer_unittest.cc", + "../browser/page_load_metrics/observers/noscript_preview_page_load_metrics_observer_unittest.cc", + "../browser/page_load_metrics/observers/offline_page_previews_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc", "../browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h", "../browser/page_load_metrics/observers/page_load_metrics_observer_tester.cc", "../browser/page_load_metrics/observers/page_load_metrics_observer_tester.h", - "../browser/page_load_metrics/observers/previews_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/previews_ukm_observer_unittest.cc", "../browser/page_load_metrics/observers/protocol_page_load_metrics_observer_unittest.cc", "../browser/page_load_metrics/observers/service_worker_page_load_metrics_observer_unittest.cc", @@ -3309,8 +2360,6 @@ test("unit_tests") { "../browser/predictors/loading_predictor_config_unittest.cc", "../browser/predictors/loading_predictor_unittest.cc", "../browser/predictors/loading_stats_collector_unittest.cc", - "../browser/predictors/loading_test_util.cc", - "../browser/predictors/loading_test_util.h", "../browser/predictors/preconnect_manager_unittest.cc", "../browser/predictors/resource_prefetch_predictor_tables_unittest.cc", "../browser/predictors/resource_prefetch_predictor_unittest.cc", @@ -3342,13 +2391,13 @@ test("unit_tests") { "../browser/profiles/profile_manager_unittest.cc", "../browser/profiles/profile_shortcut_manager_unittest_win.cc", "../browser/profiling_host/background_profiling_triggers_unittest.cc", + "../browser/profiling_host/profiling_process_host_unittest.cc", "../browser/push_messaging/push_messaging_app_identifier_unittest.cc", "../browser/push_messaging/push_messaging_notification_manager_unittest.cc", "../browser/push_messaging/push_messaging_service_unittest.cc", "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm", "../browser/resources_util_unittest.cc", "../browser/search/contextual_search_policy_handler_android_unittest.cc", - "../browser/search/iframe_source_unittest.cc", "../browser/search/thumbnail_source_unittest.cc", # TODO(hashimoto): those tests should be componentized and moved to @@ -3362,12 +2411,11 @@ test("unit_tests") { "../browser/sessions/restore_on_startup_policy_handler_unittest.cc", "../browser/sessions/session_common_utils_unittest.cc", "../browser/shell_integration_win_unittest.cc", - "../browser/signin/account_reconcilor_unittest.cc", + "../browser/signin/account_consistency_mode_manager_unittest.cc", "../browser/signin/chrome_signin_client_unittest.cc", "../browser/signin/chrome_signin_helper_unittest.cc", "../browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc", "../browser/signin/local_auth_unittest.cc", - "../browser/signin/signin_manager_unittest.cc", "../browser/signin/signin_status_metrics_provider_chromeos_unittest.cc", "../browser/signin/signin_tracker_unittest.cc", "../browser/signin/test_signin_client_builder.cc", @@ -3375,18 +2423,20 @@ test("unit_tests") { "../browser/ssl/chrome_expect_ct_reporter_unittest.cc", "../browser/ssl/insecure_sensitive_input_driver_unittest.cc", "../browser/ssl/security_state_tab_helper_unittest.cc", + "../browser/ssl/ssl_error_assistant_unittest.cc", "../browser/ssl/ssl_error_handler_unittest.cc", + "../browser/ssl/ssl_error_navigation_throttle_unittest.cc", + "../browser/ssl/ssl_error_tab_helper_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/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", "../browser/subresource_filter/subresource_filter_test_harness.cc", "../browser/subresource_filter/subresource_filter_test_harness.h", "../browser/subresource_filter/subresource_filter_unittest.cc", - "../browser/subresource_filter/test_ruleset_publisher.cc", - "../browser/subresource_filter/test_ruleset_publisher.h", "../browser/sync/chrome_sync_client_unittest.cc", "../browser/sync/profile_sync_service_factory_unittest.cc", "../browser/sync/sessions/sync_sessions_web_contents_router_unittest.cc", @@ -3411,14 +2461,12 @@ test("unit_tests") { "../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/destination_file_system_unittest.cc", "../browser/ui/passwords/manage_passwords_state_unittest.cc", "../browser/ui/passwords/manage_passwords_view_utils_unittest.cc", + "../browser/ui/passwords/password_access_authenticator_unittest.cc", "../browser/ui/passwords/password_manager_porter_unittest.cc", "../browser/ui/passwords/password_manager_presenter_unittest.cc", - "../browser/ui/permission_bubble/mock_permission_prompt.cc", - "../browser/ui/permission_bubble/mock_permission_prompt.h", - "../browser/ui/permission_bubble/mock_permission_prompt_factory.cc", - "../browser/ui/permission_bubble/mock_permission_prompt_factory.h", "../browser/ui/search_engines/keyword_editor_controller_unittest.cc", "../browser/ui/sync/profile_signin_confirmation_helper_unittest.cc", "../browser/ui/sync/sync_promo_ui_unittest.cc", @@ -3447,7 +2495,6 @@ test("unit_tests") { "../common/mac/cfbundle_blocker_unittest.mm", "../common/mac/mock_launchd.cc", "../common/mac/mock_launchd.h", - "../common/media_router/discovery/media_sink_internal_unittest.cc", "../common/media_router/issue_unittest.cc", "../common/media_router/media_route_unittest.cc", "../common/media_router/media_sink_unittest.cc", @@ -3460,7 +2507,6 @@ test("unit_tests") { "../common/pref_names_util_unittest.cc", "../common/search/search_urls_unittest.cc", "../common/secure_origin_whitelist_unittest.cc", - "../common/switch_utils_unittest.cc", "../renderer/app_categorizer_unittest.cc", "../renderer/chrome_content_renderer_client_unittest.cc", "../renderer/content_settings_observer_unittest.cc", @@ -3473,9 +2519,6 @@ test("unit_tests") { "../renderer/page_load_metrics/page_timing_metrics_sender_unittest.cc", "../renderer/plugins/plugin_uma_unittest.cc", "../renderer/prerender/prerender_dispatcher_unittest.cc", - "../renderer/searchbox/search_bouncer_unittest.cc", - "../renderer/searchbox/searchbox_extension_unittest.cc", - "../renderer/searchbox/searchbox_unittest.cc", "../renderer/web_apps_unittest.cc", "../test/base/chrome_render_view_test.cc", "../test/base/chrome_render_view_test.h", @@ -3494,6 +2537,13 @@ test("unit_tests") { "../../third_party/zlib/google/zip_unittest.cc", ] + if (is_win) { + sources += [ + "../browser/notifications/mock_notification_image_retainer.cc", + "../browser/notifications/mock_notification_image_retainer.h", + ] + } + configs += [ "//build/config:precompiled_headers" ] data_deps = [ @@ -3545,6 +2595,7 @@ test("unit_tests") { "//chrome:strings", "//chrome/browser/media/router:test_support", "//chrome/common:test_support", + "//chrome/common/profiling:unit_tests", "//chrome/profiling:unit_tests", "//components/autofill/content/renderer:test_support", "//components/browser_sync:test_support", @@ -3552,15 +2603,14 @@ test("unit_tests") { "//components/content_settings/core/test:test_support", "//components/data_reduction_proxy/core/browser:test_support", "//components/data_use_measurement/core", - "//components/metrics/proto", "//components/nacl/common:features", "//components/ntp_snippets:test_support", + "//components/optimization_guide", "//components/os_crypt:test_support", "//components/resources", "//components/safe_browsing:features", "//components/safe_browsing/db", "//components/safe_browsing/db:test_database_manager", - "//components/safe_json:test_support", "//components/spellcheck:build_features", "//components/strings", "//components/subresource_filter/core/browser:test_support", @@ -3586,6 +2636,7 @@ test("unit_tests") { "//net", "//net:test_support", "//ppapi/features", + "//services/data_decoder/public/cpp:test_support", "//skia", "//testing/gmock", "//testing/gtest", @@ -3595,6 +2646,7 @@ test("unit_tests") { "//third_party/libaddressinput", "//third_party/libphonenumber", "//third_party/libxml", + "//third_party/metrics_proto", "//third_party/webrtc/modules/desktop_capture", "//third_party/webrtc_overrides", "//ui/base:test_support", @@ -3610,7 +2662,11 @@ test("unit_tests") { } if (enable_dice_support) { - sources += [ "../browser/signin/dice_response_handler_unittest.cc" ] + sources += [ + "../browser/signin/dice_response_handler_unittest.cc", + "../browser/signin/dice_tab_helper_unittest.cc", + "../browser/signin/process_dice_header_delegate_impl_unittest.cc", + ] } if (enable_offline_pages) { @@ -3622,6 +2678,7 @@ test("unit_tests") { "../browser/offline_pages/offline_page_utils_unittest.cc", "../browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc", "../browser/offline_pages/prefetch/prefetch_background_task_handler_impl_unittest.cc", + "../browser/offline_pages/prefetch/prefetch_importer_impl_unittest.cc", "../browser/offline_pages/prefetch/prefetch_instance_id_proxy_unittest.cc", "../browser/offline_pages/prefetch/prefetched_pages_notifier_unittest.cc", "../browser/offline_pages/recent_tab_helper_unittest.cc", @@ -3640,7 +2697,7 @@ test("unit_tests") { if (is_android) { sources += [ - "../browser/android/search_geolocation/search_geolocation_service_unittest.cc", + "../browser/android/search_permissions/search_permissions_service_unittest.cc", "../browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc", "../browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc", "../browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc", @@ -3695,8 +2752,11 @@ test("unit_tests") { "../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/swap_thrashing_monitor_delegate_win_unittest.cc", "../browser/page_load_metrics/observers/session_restore_page_load_metrics_observer_unittest.cc", "../browser/resource_coordinator/background_tab_navigation_throttle_unittest.cc", + "../browser/resource_coordinator/lifecycle_unit_unittest.cc", + "../browser/resource_coordinator/tab_lifecycle_unit_unittest.cc", "../browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc", "../browser/resource_coordinator/tab_manager_stats_collector_unittest.cc", "../browser/resource_coordinator/tab_manager_unittest.cc", @@ -3705,7 +2765,6 @@ test("unit_tests") { # Android does not use the Message Center notification system. "../browser/net/firefox_proxy_settings_unittest.cc", "../browser/notifications/message_center_notifications_unittest.cc", - "../browser/notifications/message_center_settings_controller_unittest.cc", "../browser/platform_util_unittest.cc", "../browser/policy/policy_path_parser_unittest.cc", "../browser/process_singleton_posix_unittest.cc", @@ -3718,6 +2777,7 @@ test("unit_tests") { "../browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc", "../browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.h", "../browser/safe_browsing/chrome_cleaner/srt_field_trial_win_unittest.cc", + "../browser/search/iframe_source_unittest.cc", "../browser/search/instant_service_unittest.cc", "../browser/search/instant_unittest_base.cc", "../browser/search/instant_unittest_base.h", @@ -3727,6 +2787,7 @@ test("unit_tests") { "../browser/search/search_unittest.cc", "../browser/sessions/persistent_tab_restore_service_unittest.cc", "../browser/signin/mutable_profile_oauth2_token_service_delegate_unittest.cc", + "../browser/signin/signin_promo_unittest.cc", "../browser/speech/extension_api/extension_manifests_tts_unittest.cc", "../browser/speech/tts_controller_unittest.cc", "../browser/sync/sessions/browser_list_router_helper_unittest.cc", @@ -3782,9 +2843,10 @@ test("unit_tests") { "../browser/ui/tabs/pinned_tab_service_unittest.cc", "../browser/ui/tabs/pinned_tab_test_utils.cc", "../browser/ui/tabs/pinned_tab_test_utils.h", + "../browser/ui/tabs/tab_activity_watcher_unittest.cc", "../browser/ui/tabs/tab_menu_model_unittest.cc", + "../browser/ui/tabs/tab_strip_model_impl_unittest.cc", "../browser/ui/tabs/tab_strip_model_stats_recorder_unittest.cc", - "../browser/ui/tabs/tab_strip_model_unittest.cc", "../browser/ui/tabs/test_tab_strip_model_delegate.cc", "../browser/ui/tabs/test_tab_strip_model_delegate.h", "../browser/ui/toolbar/app_menu_model_unittest.cc", @@ -3834,22 +2896,25 @@ test("unit_tests") { "../common/importer/mock_importer_bridge.cc", "../common/importer/mock_importer_bridge.h", "../common/multi_process_lock_unittest.cc", + "../renderer/searchbox/search_bouncer_unittest.cc", + "../renderer/searchbox/searchbox_unittest.cc", "../test/base/browser_with_test_window_test.cc", "../test/base/browser_with_test_window_test.h", "../utility/importer/bookmark_html_reader_unittest.cc", "../utility/importer/bookmarks_file_importer_unittest.cc", "../utility/importer/edge_database_reader_unittest_win.cc", "../utility/importer/firefox_importer_unittest.cc", - "../utility/importer/firefox_importer_unittest_messages_internal.h", "../utility/importer/firefox_importer_unittest_utils.h", "../utility/importer/firefox_importer_unittest_utils_mac.cc", "../utility/importer/safari_importer_unittest.mm", ] deps += [ - "//components/signin/core/common:signin_features", - "//ipc", + "//components/signin/core/browser:signin_features", "//third_party/libaddressinput", ] + if (is_mac) { + deps += [ ":firefox_importer_interface" ] + } } if (!is_android) { @@ -3863,15 +2928,17 @@ test("unit_tests") { "../browser/media/router/discovery/dial/device_description_service_unittest.cc", "../browser/media/router/discovery/dial/dial_device_data_unittest.cc", "../browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc", - "../browser/media/router/discovery/dial/dial_media_sink_service_proxy_unittest.cc", + "../browser/media/router/discovery/dial/dial_media_sink_service_unittest.cc", "../browser/media/router/discovery/dial/dial_registry_unittest.cc", "../browser/media/router/discovery/dial/dial_service_unittest.cc", + "../browser/media/router/discovery/dial/safe_dial_device_description_parser_unittest.cc", "../browser/media/router/discovery/mdns/cast_media_sink_service_impl_unittest.cc", "../browser/media/router/discovery/mdns/cast_media_sink_service_unittest.cc", "../browser/media/router/discovery/mdns/dns_sd_registry_unittest.cc", "../browser/media/router/discovery/media_sink_discovery_metrics_unittest.cc", - "../browser/media/router/discovery/media_sink_service_base_unittest.cc", "../browser/media/router/event_page_request_manager_unittest.cc", + "../common/media_router/discovery/media_sink_internal_unittest.cc", + "../common/media_router/discovery/media_sink_service_base_unittest.cc", # TODO(crbug.com/646627): # Move media_router_ui_service_factory_unittest.cc to chrome/browser/ui. @@ -3881,6 +2948,7 @@ test("unit_tests") { "../browser/media/router/mojo/media_router_desktop_unittest.cc", "../browser/media/router/mojo/media_router_mojo_impl_unittest.cc", "../browser/media/router/mojo/media_router_mojo_metrics_unittest.cc", + "../browser/media/router/mojo/wired_display_media_route_provider_unittest.cc", "../browser/policy/local_sync_policy_handler_unittest.cc", "../browser/renderer_context_menu/render_view_context_menu_test_util.cc", "../browser/renderer_context_menu/render_view_context_menu_test_util.h", @@ -3902,7 +2970,6 @@ test("unit_tests") { "../browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc", "../browser/ui/webui/media_router/query_result_manager_unittest.cc", "../common/media_router/mojo/media_router_struct_traits_unittest.cc", - "../utility/media_router/dial_device_description_parser_impl_unittest.cc", ] deps += [ "//components/bubble:test_support" ] @@ -3916,8 +2983,16 @@ test("unit_tests") { } } - if (is_desktop_linux && enable_native_notifications) { - sources += [ "../browser/notifications/notification_platform_bridge_linux_unittest.cc" ] + if (enable_native_notifications) { + if (is_desktop_linux) { + sources += [ "../browser/notifications/notification_platform_bridge_linux_unittest.cc" ] + } + + if (is_win) { + sources += [ + "../browser/notifications/notification_platform_bridge_win_unittest.cc", + ] + } } if (enable_desktop_in_product_help) { @@ -3945,10 +3020,12 @@ test("unit_tests") { sources += [ "../browser/component_updater/cros_component_installer_unittest.cc", "../browser/media/webrtc/desktop_media_list_ash_unittest.cc", + "../browser/notifications/chrome_ash_message_center_client_unittest.cc", "../browser/renderer_context_menu/mock_render_view_context_menu.cc", "../browser/renderer_context_menu/mock_render_view_context_menu.h", "../browser/signin/signin_error_notifier_ash_unittest.cc", "../browser/sync/sync_error_notifier_ash_unittest.cc", + "../browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc", "../browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc", "../browser/ui/ash/chrome_keyboard_ui_unittest.cc", "../browser/ui/ash/ime_controller_client_unittest.cc", @@ -3960,6 +3037,7 @@ test("unit_tests") { "../browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc", "../browser/ui/ash/session_controller_client_unittest.cc", "../browser/ui/ash/tablet_mode_client_unittest.cc", + "../browser/ui/ash/wallpaper_controller_client_unittest.cc", "../browser/ui/ash/window_positioner_unittest.cc", "../browser/ui/window_sizer/window_sizer_ash_unittest.cc", ] @@ -4039,7 +3117,11 @@ 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/dnr_test_base.cc", + "../browser/extensions/api/declarative_net_request/dnr_test_base.h", "../browser/extensions/api/declarative_net_request/rule_indexing_unittest.cc", + "../browser/extensions/api/declarative_net_request/ruleset_manager_unittest.cc", + "../browser/extensions/api/declarative_net_request/ruleset_matcher_unittest.cc", "../browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc", "../browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc", "../browser/extensions/api/developer_private/developer_private_api_unittest.cc", @@ -4150,6 +3232,7 @@ test("unit_tests") { "../browser/extensions/external_provider_impl_unittest.cc", "../browser/extensions/favicon_downloader_unittest.cc", "../browser/extensions/install_tracker_unittest.cc", + "../browser/extensions/install_verifier_unittest.cc", "../browser/extensions/menu_manager_unittest.cc", "../browser/extensions/ntp_overridden_bubble_delegate_unittest.cc", "../browser/extensions/pack_extension_unittest.cc", @@ -4183,7 +3266,6 @@ test("unit_tests") { "../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/safe_search_api/safe_search_url_checker_unittest.cc", - "../browser/search/hotword_service_unittest.cc", "../browser/signin/easy_unlock_app_manager_unittest.cc", "../browser/signin/easy_unlock_auth_attempt_unittest.cc", "../browser/signin/easy_unlock_notification_controller_chromeos_unittest.cc", @@ -4255,6 +3337,7 @@ test("unit_tests") { "../common/extensions/extension_process_policy_unittest.cc", "../common/extensions/extension_unittest.cc", "../common/extensions/feature_switch_unittest.cc", + "../common/extensions/manifest_handlers/app_theme_color_manifest_unittest.cc", "../common/extensions/manifest_handlers/automation_unittest.cc", "../common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc", "../common/extensions/manifest_handlers/exclude_matches_manifest_unittest.cc", @@ -4263,6 +3346,7 @@ test("unit_tests") { "../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", + "../common/extensions/manifest_tests/extension_manifests_action_key_unittest.cc", "../common/extensions/manifest_tests/extension_manifests_background_unittest.cc", "../common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc", "../common/extensions/manifest_tests/extension_manifests_contentsecuritypolicy_unittest.cc", @@ -4301,8 +3385,10 @@ test("unit_tests") { "../common/extensions/permissions/settings_override_permission_unittest.cc", "../common/extensions/sync_type_unittest.cc", "../renderer/extensions/chrome_native_extension_bindings_system_unittest.cc", + "../renderer/extensions/extension_hooks_delegate_unittest.cc", "../renderer/extensions/extension_localization_peer_unittest.cc", "../renderer/extensions/renderer_permissions_policy_delegate_unittest.cc", + "../renderer/extensions/tabs_hooks_delegate_unittest.cc", "../renderer/media/cast_ipc_dispatcher_unittest.cc", "../utility/image_writer/image_writer_unittest.cc", ] @@ -4328,7 +3414,9 @@ test("unit_tests") { [ "../browser/extensions/external_registry_loader_win_unittest.cc" ] } if (is_chromeos) { - sources += [ "../browser/extensions/api/file_system/consent_provider_unittest.cc" ] + sources += [ + "../browser/extensions/api/file_system/consent_provider_unittest.cc", + ] } else { sources += [ "../browser/extensions/api/messaging/native_message_process_host_unittest.cc", @@ -4356,11 +3444,12 @@ test("unit_tests") { sources += [ "../browser/media/protected_media_identifier_permission_context_unittest.cc" ] } else { sources += [ + "../browser/lifetime/switch_utils_unittest.cc", "../browser/net/disk_cache_dir_policy_handler_unittest.cc", - "//chrome/browser/profiles/profile_list_desktop_unittest.cc", - "//chrome/browser/profiles/profile_statistics_unittest.cc", - "//chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc", - "//chrome/browser/ui/startup/startup_tab_provider_unittest.cc", + "../browser/profiles/profile_list_desktop_unittest.cc", + "../browser/profiles/profile_statistics_unittest.cc", + "../browser/ui/startup/startup_browser_creator_impl_unittest.cc", + "../browser/ui/startup/startup_tab_provider_unittest.cc", ] } if (use_gio) { @@ -4411,13 +3500,12 @@ test("unit_tests") { "../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/download_protection/check_client_download_request_unittest.cc", "../browser/safe_browsing/download_protection/disk_image_type_sniffer_mac_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_protection_service_unittest.cc", "../browser/safe_browsing/download_protection/path_sanitizer_unittest.cc", - "../browser/safe_browsing/download_protection/sandboxed_dmg_analyzer_mac_unittest.cc", - "../browser/safe_browsing/download_protection/sandboxed_zip_analyzer_unittest.cc", "../browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc", "../browser/safe_browsing/incident_reporting/binary_integrity_analyzer_mac_unittest.cc", "../browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc", @@ -4473,6 +3561,7 @@ test("unit_tests") { ] deps += [ ":test_proto", + "//chrome/services/file_util/public/cpp:unit_tests", "//components/safe_browsing:base_ping_manager_unittest", "//components/safe_browsing/browser:unittests", "//components/safe_browsing/db:v4_test_util", @@ -4494,7 +3583,7 @@ test("unit_tests") { "../browser/plugins/flash_download_interception_unittest.cc", "../browser/plugins/flash_temporary_permission_tracker_unittest.cc", "../browser/plugins/plugin_finder_unittest.cc", - "../browser/plugins/plugin_info_message_filter_unittest.cc", + "../browser/plugins/plugin_info_host_impl_unittest.cc", "../browser/plugins/plugin_installer_unittest.cc", "../browser/plugins/plugin_metadata_unittest.cc", "../browser/plugins/plugin_prefs_unittest.cc", @@ -4504,28 +3593,17 @@ test("unit_tests") { if (enable_print_preview) { sources += [ - "../browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc", "../browser/printing/print_job_unittest.cc", "../browser/printing/print_preview_dialog_controller_unittest.cc", "../browser/printing/print_preview_test.cc", "../browser/printing/print_preview_test.h", "../browser/printing/print_view_manager_unittest.cc", "../browser/ui/webui/print_preview/extension_printer_handler_unittest.cc", + "../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", "../browser/ui/webui/print_preview/print_preview_ui_unittest.cc", "../browser/ui/webui/print_preview/printer_capabilities_unittest.cc", - "../common/cloud_print/cloud_print_helpers_unittest.cc", - "../common/service_process_util_mac_unittest.mm", - "../common/service_process_util_unittest.cc", - "../service/cloud_print/cloud_print_service_helpers_unittest.cc", - "../service/cloud_print/cloud_print_token_store_unittest.cc", - "../service/cloud_print/cloud_print_url_fetcher_unittest.cc", - "../service/cloud_print/connector_settings_unittest.cc", - "../service/cloud_print/printer_job_handler_unittest.cc", - "../service/cloud_print/printer_job_queue_handler_unittest.cc", - "../service/service_ipc_server_unittest.cc", - "../service/service_process_prefs_unittest.cc", "../utility/cloud_print/pwg_encoder_unittest.cc", ] @@ -4533,6 +3611,23 @@ test("unit_tests") { "//ipc", "//printing:test_support", ] + + if (!is_chromeos) { + sources += [ + "../browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc", + "../common/cloud_print/cloud_print_helpers_unittest.cc", + "../common/service_process_util_mac_unittest.mm", + "../common/service_process_util_unittest.cc", + "../service/cloud_print/cloud_print_service_helpers_unittest.cc", + "../service/cloud_print/cloud_print_token_store_unittest.cc", + "../service/cloud_print/cloud_print_url_fetcher_unittest.cc", + "../service/cloud_print/connector_settings_unittest.cc", + "../service/cloud_print/printer_job_handler_unittest.cc", + "../service/cloud_print/printer_job_queue_handler_unittest.cc", + "../service/service_ipc_server_unittest.cc", + "../service/service_process_prefs_unittest.cc", + ] + } } if (enable_captive_portal_detection) { @@ -4551,7 +3646,9 @@ test("unit_tests") { ] if (is_mac && !mac_views_browser) { - sources += [ "../browser/ui/startup/session_crashed_infobar_delegate_unittest.cc" ] + sources += [ + "../browser/ui/startup/session_crashed_infobar_delegate_unittest.cc", + ] } } if (enable_webrtc) { @@ -4568,10 +3665,8 @@ test("unit_tests") { "//chrome/browser/chromeos:unit_tests", "//chromeos/ime:gencode", ] - sources -= [ - "../browser/policy/cloud/user_policy_signin_service_unittest.cc", - "../browser/signin/signin_manager_unittest.cc", - ] + sources -= + [ "../browser/policy/cloud/user_policy_signin_service_unittest.cc" ] sources += [ "base/ash_test_environment_chrome.cc", "base/ash_test_environment_chrome.h", @@ -4681,6 +3776,7 @@ test("unit_tests") { "../browser/ui/cocoa/bubble_view_unittest.mm", "../browser/ui/cocoa/chrome_browser_window_unittest.mm", "../browser/ui/cocoa/clickhold_button_cell_unittest.mm", + "../browser/ui/cocoa/color_panel_cocoa_unittest.mm", "../browser/ui/cocoa/confirm_bubble_controller_unittest.mm", "../browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm", "../browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.mm", @@ -4802,13 +3898,13 @@ test("unit_tests") { "../browser/ui/cocoa/test/styled_text_field_test_helper.h", "../browser/ui/cocoa/test/styled_text_field_test_helper.mm", "../browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm", + "../browser/ui/cocoa/toolbar/app_toolbar_button_unittest.mm", "../browser/ui/cocoa/toolbar/reload_button_unittest.mm", "../browser/ui/cocoa/toolbar/toolbar_button_unittest.mm", "../browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm", "../browser/ui/cocoa/toolbar/toolbar_view_unittest.mm", "../browser/ui/cocoa/translate/translate_bubble_controller_unittest.mm", "../browser/ui/cocoa/url_drop_target_unittest.mm", - "../browser/ui/cocoa/validation_message_bubble_controller_unittest.mm", "../browser/ui/cocoa/vertical_gradient_view_unittest.mm", "../browser/ui/cocoa/view_resizer_pong.h", "../browser/ui/cocoa/view_resizer_pong.mm", @@ -4848,6 +3944,7 @@ test("unit_tests") { } sources += [ + "../browser/notifications/notification_image_retainer_unittest.cc", "../browser/notifications/notification_template_builder_unittest.cc", "../browser/ui/desktop_ios_promotion/desktop_ios_promotion_bubble_controller_unittest.cc", "../browser/ui/desktop_ios_promotion/desktop_ios_promotion_util_unittest.cc", @@ -4912,6 +4009,7 @@ test("unit_tests") { ] sources += [ "../../ui/views/controls/webview/webview_unittest.cc", + "../browser/ui/tabs/tab_strip_model_experimental_unittest.cc", "../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/confirm_bubble_views_unittest.cc", @@ -4933,10 +4031,14 @@ test("unit_tests") { "../browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc", ] } + if (enable_native_window_nav_buttons) { + sources += [ "../browser/ui/views/frame/desktop_linux_browser_frame_view_layout_unittest.cc" ] + } if (!is_mac || mac_views_browser) { sources += [ "../browser/ui/views/accelerator_table_unittest.cc", "../browser/ui/views/accelerator_table_unittest_mac.mm", + "../browser/ui/views/autofill/autofill_popup_view_native_views_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", @@ -4962,14 +4064,13 @@ test("unit_tests") { "../browser/ui/views/tabs/fake_base_tab_strip_controller.cc", "../browser/ui/views/tabs/fake_base_tab_strip_controller.h", "../browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc", + "../browser/ui/views/tabs/tab_strip_impl_unittest.cc", "../browser/ui/views/tabs/tab_strip_layout_unittest.cc", - "../browser/ui/views/tabs/tab_strip_unittest.cc", "../browser/ui/views/tabs/tab_unittest.cc", "../browser/ui/views/toolbar/reload_button_unittest.cc", "../browser/ui/views/toolbar/toolbar_action_view_unittest.cc", "../browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc", "../browser/ui/views/translate/translate_bubble_view_unittest.cc", - "../browser/ui/views/validation_message_bubble_view_unittest.cc", "../browser/ui/views/webshare/webshare_target_picker_view_unittest.cc", ] } @@ -5032,6 +4133,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_vpn_provider_unittest.cc", "../browser/ui/app_list/extension_app_model_builder_unittest.cc", "../browser/ui/app_list/profile_loader_unittest.cc", "../browser/ui/app_list/search/answer_card/answer_card_result_unittest.cc", @@ -5043,6 +4145,8 @@ test("unit_tests") { "../browser/ui/app_list/search/omnibox_result_unittest.cc", "../browser/ui/app_list/search/suggestions/suggestions_search_provider_unittest.cc", "../browser/ui/app_list/speech_auth_helper_unittest.cc", + "../browser/ui/app_list/test/fake_app_list_model_updater.cc", + "../browser/ui/app_list/test/fake_app_list_model_updater.h", "../browser/ui/app_list/test/fake_profile.cc", "../browser/ui/app_list/test/fake_profile.h", "../browser/ui/app_list/test/fake_profile_store.cc", @@ -5060,58 +4164,617 @@ test("unit_tests") { } } -if (safe_browsing_mode == 1 && is_mac) { - action("mac_safe_browsing_test_data") { - script = "//build/gn_run_binary.py" - shell_script = "//chrome/test/data/safe_browsing/dmg/generate_test_data.sh" - inputs = [ - script, - shell_script, - "data/safe_browsing/dmg/hfs_raw_images.tar.bz2", - "data/safe_browsing/mach_o/executablefat", - "data/safe_browsing/mach_o/lib64.dylib", - ] - _output_dir = "$root_out_dir/test_data/chrome/safe_browsing_dmg" - outputs = [ - "$_output_dir/dmg_UDBZ_GPTSPUD.dmg", - "$_output_dir/dmg_UDBZ_NONE.dmg", - "$_output_dir/dmg_UDBZ_SPUD.dmg", - "$_output_dir/dmg_UDCO_GPTSPUD.dmg", - "$_output_dir/dmg_UDCO_NONE.dmg", - "$_output_dir/dmg_UDCO_SPUD.dmg", - "$_output_dir/dmg_UDRO_GPTSPUD.dmg", - "$_output_dir/dmg_UDRO_NONE.dmg", - "$_output_dir/dmg_UDRO_SPUD.dmg", - "$_output_dir/dmg_UDRW_GPTSPUD.dmg", - "$_output_dir/dmg_UDRW_NONE.dmg", - "$_output_dir/dmg_UDRW_SPUD.dmg", - "$_output_dir/dmg_UDSP_GPTSPUD.sparseimage", - "$_output_dir/dmg_UDSP_NONE.sparseimage", - "$_output_dir/dmg_UDSP_SPUD.sparseimage", - "$_output_dir/dmg_UDTO_GPTSPUD.cdr", - "$_output_dir/dmg_UDTO_NONE.cdr", - "$_output_dir/dmg_UDTO_SPUD.cdr", - "$_output_dir/dmg_UDZO_GPTSPUD.dmg", - "$_output_dir/dmg_UDZO_NONE.dmg", - "$_output_dir/dmg_UDZO_SPUD.dmg", - "$_output_dir/dmg_UFBI_GPTSPUD.dmg", - "$_output_dir/dmg_UFBI_NONE.dmg", - "$_output_dir/dmg_UFBI_SPUD.dmg", - "$_output_dir/hfs_plus.img", - "$_output_dir/hfsx_case_sensitive.img", - "$_output_dir/mach_o_in_dmg.dmg", - "$_output_dir/mach_o_in_dmg.txt", - "$_output_dir/mach_o_in_dmg_no_koly_signature.dmg", - "$_output_dir/mach_o_in_dmg_no_koly_signature.txt", +static_library("test_support_unit") { + testonly = true + sources = [ + "base/run_all_unittests.cc", + ] + + public_deps = [ + ":test_support", + "//base", + "//chrome:resources", + "//chrome:strings", + "//chrome/browser", + "//chrome/common", + "//mojo/edk/test:test_support", + ] + + if (is_win) { + deps = [ + "//chrome/install_static/test:test_support", ] - args = [ - rebase_path(shell_script, root_out_dir), - rebase_path(_output_dir, root_out_dir), + } +} + +if (is_win) { + loadable_module("conflicts_dll") { + testonly = true + sources = [ + "conflicts/conflicts_dll.cc", ] } } -if (!is_android) { +if (is_android) { + android_library("unit_tests_java") { + java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_apk/ChromeNativeTestApplication.java" ] + deps = [ + "//base:base_java", + "//chrome/android:app_hooks_java", + "//chrome/android:chrome_java", + "//content/public/android:content_java", + ] + } +} else { + static_library("test_support_ui") { + defines = [] + testonly = true + + sources = [ + "../browser/permissions/permission_request_manager_test_api.cc", + "../browser/permissions/permission_request_manager_test_api.h", + "base/in_process_browser_test.cc", + "base/in_process_browser_test.h", + "base/in_process_browser_test_mac.cc", + "base/javascript_browser_test.cc", + "base/javascript_browser_test.h", + "base/test_chrome_web_ui_controller_factory.cc", + "base/test_chrome_web_ui_controller_factory.h", + "base/ui_test_utils.cc", + "base/ui_test_utils.h", + "base/web_ui_browser_test.cc", + "base/web_ui_browser_test.h", + ] + + configs += [ "//build/config:precompiled_headers" ] + + public_deps = [ + "//chrome/browser:test_support_ui", + "//content/public/browser", + ] + deps = [ + "//components/metrics:test_support", + "//components/nacl/common:features", + "//components/os_crypt:test_support", + "//content/public/browser:browser", + "//skia", + "//testing/gtest", + "//third_party/WebKit/public:blink_headers", + ] + + if (enable_plugins) { + sources += [ + "ppapi/ppapi_test.cc", + "ppapi/ppapi_test.h", + ] + } + } + + import("//third_party/protobuf/proto_library.gni") + + proto_library("test_proto") { + sources = [ + "../common/safe_browsing/ipc_protobuf_message_test.proto", + ] + } + + if (is_chromeos) { + assert(enable_app_list) + assert(enable_extensions) + + # These tests are only meant to run on an FYI bot because they + # test against live sites, as a way to catch potential regressions. + test("accessibility_live_site_tests") { + sources = [ + "../browser/chromeos/accessibility/select_to_speak_live_site_browsertest.cc", + "base/interactive_test_utils.cc", + "base/interactive_test_utils.h", + "base/interactive_test_utils_aura.cc", + "base/interactive_test_utils_aura.h", + "base/interactive_test_utils_common_views.cc", + "base/interactive_ui_tests_main.cc", + ] + configs += [ "//build/config:precompiled_headers" ] + + data_deps = [ + "//testing/buildbot/filters:interactive_ui_tests_filters", + ] + + defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + ldflags = [] + + deps = [ + ":test_support", + ":test_support_ui", + "//chrome:packed_resources", + "//chrome:resources", + "//chrome:strings", + "//chrome/browser", + "//chrome/browser/devtools", + "//chrome/renderer", + "//components/resources", + "//components/sync", + "//components/sync:test_support_model", + "//content/app/resources", + "//content/test:test_support", + "//crypto:platform", + "//crypto:test_support", + "//extensions/features", + "//google_apis:test_support", + "//net", + "//net:net_resources", + "//net:test_support", + "//skia", + "//testing/gmock", + "//testing/gtest", + "//third_party/hunspell", + "//third_party/icu", + "//third_party/libpng", + "//third_party/zlib", + "//ui/base:test_support", + "//ui/resources:ui_test_pak", + "//ui/web_dialogs:test_support", + ] + } + + static_library("test_support_applist_chromeos") { + defines = [] + testonly = true + + sources = [ + "../browser/ui/ash/app_list/test/app_list_service_ash_test_api.cc", + "../browser/ui/ash/app_list/test/app_list_service_ash_test_api.h", + ] + deps = [ + "//chrome/browser/ui", + "//ui/app_list/presenter:test_support", + ] + } + } + + test("interactive_ui_tests") { + sources = [ + "../browser/apps/app_browsertest_util.cc", + "../browser/apps/app_browsertest_util.h", + "../browser/apps/app_pointer_lock_interactive_uitest.cc", + "../browser/apps/app_shim/app_shim_interactive_uitest_mac.mm", + "../browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm", + "../browser/apps/app_window_interactive_uitest.cc", + "../browser/apps/app_window_interactive_uitest.h", + "../browser/apps/guest_view/web_view_interactive_browsertest.cc", + "../browser/autofill/autofill_interactive_uitest.cc", + "../browser/autofill/autofill_uitest_util.cc", + "../browser/autofill/autofill_uitest_util.h", + "../browser/browser_keyevents_browsertest.cc", + "../browser/devtools/devtools_sanity_interactive_browsertest.cc", + "../browser/extensions/api/extension_action/browser_action_interactive_test.cc", + "../browser/extensions/api/notifications/notifications_apitest.cc", + "../browser/extensions/api/omnibox/omnibox_api_interactive_test.cc", + "../browser/extensions/api/tabs/tabs_interactive_test.cc", + "../browser/extensions/browsertest_util.cc", + "../browser/extensions/chrome_extension_test_notification_observer.cc", + "../browser/extensions/chrome_extension_test_notification_observer.h", + "../browser/extensions/clipboard_extension_apitest_chromeos.cc", + "../browser/extensions/extension_apitest.cc", + "../browser/extensions/extension_browsertest.cc", + "../browser/extensions/extension_commands_global_registry_apitest.cc", + "../browser/extensions/extension_crash_recovery_browsertest.cc", + "../browser/extensions/extension_fullscreen_apitest.cc", + "../browser/extensions/extension_function_test_utils.cc", + "../browser/extensions/extension_keybinding_apitest.cc", + "../browser/extensions/updater/extension_cache_fake.cc", + "../browser/extensions/updater/extension_cache_fake.h", + "../browser/extensions/window_open_interactive_apitest.cc", + "../browser/mouseleave_browsertest.cc", + "../browser/notifications/message_center_notifications_browsertest.cc", + "../browser/notifications/platform_notification_service_interactive_uitest.cc", + "../browser/password_manager/password_generation_interactive_uitest.cc", + "../browser/password_manager/password_manager_interactive_uitest.cc", + "../browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc", + "../browser/renderer_context_menu/render_view_context_menu_browsertest_util.h", + "../browser/renderer_host/site_per_process_text_input_browsertest.cc", + "../browser/site_per_process_interactive_browsertest.cc", + "../browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc", + "../browser/ui/blocked_content/popup_blocker_browsertest.cc", + "../browser/ui/blocked_content/popup_tracker_browsertest.cc", + "../browser/ui/blocked_content/tab_under_blocker_browsertest.cc", + "../browser/ui/browser_command_controller_interactive_browsertest.cc", + "../browser/ui/browser_focus_uitest.cc", + "../browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm", + "../browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm", + "../browser/ui/cocoa/status_bubble_mac_interactive_uitest.mm", + "../browser/ui/cocoa/tab_contents/web_contents_view_mac_interactive_uitest.mm", + "../browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc", + "../browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc", + "../browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc", + "../browser/ui/find_bar/find_bar_host_interactive_uitest.cc", + "../browser/ui/omnibox/omnibox_view_browsertest.cc", + "../browser/ui/passwords/manage_passwords_test.cc", + "../browser/ui/passwords/manage_passwords_test.h", + "../browser/ui/search/instant_extended_interactive_uitest.cc", + "../browser/ui/search/instant_test_base.cc", + "../browser/ui/search/instant_test_base.h", + "../browser/ui/search/instant_test_utils.cc", + "../browser/ui/search/instant_test_utils.h", + "../browser/ui/search/instant_uitest_base.cc", + "../browser/ui/search/instant_uitest_base.h", + "../browser/ui/search/local_ntp_uitest.cc", + "../browser/ui/send_mouse_move_uitest_win.cc", + "../browser/ui/startup/startup_browser_creator_interactive_uitest.cc", + "../browser/ui/translate/translate_bubble_test_utils.h", + "../browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc", + "//ui/base/clipboard/clipboard_unittest.cc", + "base/always_on_top_window_killer_win.cc", + "base/always_on_top_window_killer_win.h", + "base/interactive_test_utils.cc", + "base/interactive_test_utils.h", + "base/interactive_test_utils_aura.cc", + "base/interactive_test_utils_aura.h", + "base/interactive_test_utils_common_views.cc", + "base/interactive_test_utils_mac.mm", + "base/interactive_test_utils_win.cc", + "base/interactive_ui_tests_main.cc", + "base/process_inspector_win.cc", + "base/process_inspector_win.h", + "base/save_desktop_snapshot_win.cc", + "base/save_desktop_snapshot_win.h", + "base/view_event_test_platform_part.h", + "base/view_event_test_platform_part_chromeos.cc", + "base/view_event_test_platform_part_default.cc", + "ppapi/ppapi_interactive_browsertest.cc", + ] + + configs += [ "//build/config:precompiled_headers" ] + + data_deps = [ + "//testing/buildbot/filters:interactive_ui_tests_filters", + ] + + data = [ + "data/", + "//chrome/third_party/mock4js/", + "//content/test/data/", + "//net/tools/testserver/", + "//ppapi/tests/test_case.html", + "//ppapi/tests/test_case.html.mock-http-headers", + "//ppapi/tests/test_page.css", + "//ppapi/tests/test_page.css.mock-http-headers", + "//third_party/accessibility-audit/axs_testing.js", + "//third_party/chaijs/chai.js", + "//third_party/mocha/mocha.js", + "//third_party/polymer/v1_0/components-chromium/iron-test-helpers/mock-interactions.js", + "//third_party/pyftpdlib/", + "//third_party/pywebsocket/", + "//third_party/tlslite/", + "//third_party/zlib/google/test/data/", + "//tools/metrics/histograms/enums.xml", + "//ui/webui/resources/js/", + "$root_out_dir/pyproto/google/", + "$root_out_dir/test_case.html", + "$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", + ] + 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" ] + } + + defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + ldflags = [] + + deps = [ + ":test_support", + ":test_support_ui", + "//chrome:packed_resources", + "//chrome:resources", + "//chrome:strings", + "//chrome/browser", + "//chrome/browser/devtools", + "//chrome/renderer", + "//components/keep_alive_registry", + "//components/resources", + "//components/sync", + "//components/sync:test_support_model", + "//content/app/resources", + "//content/test:test_support", + "//crypto:platform", + "//crypto:test_support", + "//extensions/features", + "//google_apis:test_support", + "//mojo/edk/system", + "//net", + "//net:net_resources", + "//net:test_support", + "//skia", + "//testing/gmock", + "//testing/gtest", + "//third_party/hunspell", + "//third_party/icu", + "//third_party/libpng", + "//third_party/zlib", + "//ui/base:test_support", + "//ui/resources:ui_test_pak", + "//ui/web_dialogs:test_support", + ] + + if (include_js_tests) { + deps += [ "//chrome/test/data/webui:interactive_ui_tests_js_webui" ] + } + + # Runtime dependencies + data_deps += [ + "//ppapi:ppapi_tests", + "//third_party/mesa:osmesa", + ] + + if (use_aura) { + sources += [ "../browser/ui/views/drag_and_drop_interactive_uitest.cc" ] + } else { + sources -= [ + "base/interactive_test_utils_aura.cc", + "base/interactive_test_utils_aura.h", + ] + } + + if (toolkit_views) { + sources += [ + "../browser/ui/views/menu_controller_interactive_uitest.cc", + "../browser/ui/views/menu_item_view_interactive_uitest.cc", + "../browser/ui/views/menu_model_adapter_test.cc", + "../browser/ui/views/menu_test_base.cc", + "../browser/ui/views/menu_test_base.h", + "../browser/ui/views/menu_view_drag_and_drop_test.cc", + "../browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc", + "../browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc", + "base/view_event_test_base.cc", + "base/view_event_test_base.h", + ] + deps += [ + "//ui/views", + "//ui/views:test_support", + "//ui/views:views_interactive_ui_tests", + "//ui/views/controls/webview:test_support", + ] + if (!is_mac || mac_views_browser) { + # TODO(tapted): Move these to chrome_interactive_ui_test_views_sources + # when the corresponding files are moved in chrome_browser_ui.gypi + # (i.e. out of chrome_browser_ui_views_non_mac_sources). + sources += [ + "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", + "../browser/ui/views/bookmarks/bookmark_bar_view_test_helper.h", + "../browser/ui/views/certificate_selector_browsertest.cc", + "../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/find_bar_views_interactive_uitest.cc", + "../browser/ui/views/frame/browser_view_focus_uitest.cc", + "../browser/ui/views/frame/browser_view_interactive_uitest.cc", + "../browser/ui/views/fullscreen_control/fullscreen_control_view_interactive_uitest.cc", + "../browser/ui/views/keyboard_access_browsertest.cc", + "../browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc", + "../browser/ui/views/location_bar/selected_keyword_view_interactive_uitest.cc", + "../browser/ui/views/location_bar/star_view_browsertest.cc", + "../browser/ui/views/omnibox/omnibox_view_views_browsertest.cc", + "../browser/ui/views/passwords/manage_passwords_icon_view_interactive_uitest.cc", + "../browser/ui/views/ssl_client_certificate_selector_browsertest.cc", + "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc", + "../browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h", + "../browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc", + "../browser/ui/views/toolbar/toolbar_button_interactive_uitest.cc", + "../browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc", + "../browser/ui/views/translate/translate_bubble_test_utils_views.cc", + "base/interactive_test_utils_views.cc", + ] + } + if (is_linux && !is_chromeos) { + # Desktop linux. + sources -= [ + # TODO(port): This times out. Attempts have been made to fix the + # individual failures, but each time I disable a test from these + # 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 (use_aura || is_mac) { + deps += [ "//ui/touch_selection" ] + } + } + + if (is_chromeos) { + sources += [ + "../browser/chromeos/accessibility/accessibility_highlight_manager_interactive_uitest.cc", + "../browser/chromeos/accessibility/magnification_controller_browsertest.cc", + "../browser/chromeos/accessibility/select_to_speak_browsertest.cc", + "../browser/chromeos/accessibility/spoken_feedback_browsertest.cc", + "../browser/chromeos/accessibility/sticky_keys_browsertest.cc", + "../browser/chromeos/input_method/textinput_browsertest.cc", + "../browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc", + "../browser/chromeos/input_method/textinput_test_helper.cc", + "../browser/chromeos/input_method/textinput_test_helper.h", + "../browser/chromeos/login/active_directory_login_browsertest.cc", + "../browser/chromeos/login/lock/screen_locker_browsertest.cc", + "../browser/chromeos/login/lock/screen_locker_tester.cc", + "../browser/chromeos/login/lock/screen_locker_tester.h", + "../browser/chromeos/login/login_browsertest.cc", + "../browser/chromeos/login/login_manager_test.cc", + "../browser/chromeos/login/login_manager_test.h", + "../browser/chromeos/login/login_ui_browsertest.cc", + "../browser/chromeos/login/mixin_based_browser_test.cc", + "../browser/chromeos/login/mixin_based_browser_test.h", + "../browser/chromeos/login/oobe_browsertest.cc", + "../browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric.h", + "../browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric_cpu.cpp", + "../browser/chromeos/login/screenshot_testing/SkImageDiffer.cpp", + "../browser/chromeos/login/screenshot_testing/SkImageDiffer.h", + "../browser/chromeos/login/screenshot_testing/SkPMetric.cpp", + "../browser/chromeos/login/screenshot_testing/SkPMetric.h", + "../browser/chromeos/login/screenshot_testing/SkPMetricUtil_gen.h", + "../browser/chromeos/login/screenshot_testing/login_screen_areas.h", + "../browser/chromeos/login/screenshot_testing/screenshot_tester.cc", + "../browser/chromeos/login/screenshot_testing/screenshot_tester.h", + "../browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.cc", + "../browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h", + "../browser/chromeos/login/test/https_forwarder.cc", + "../browser/chromeos/login/test/https_forwarder.h", + "../browser/chromeos/login/test/oobe_base_test.cc", + "../browser/chromeos/login/test/oobe_base_test.h", + "../browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc", + "../browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc", + "../browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h", + "../browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc", + "../browser/ui/ash/app_list/app_list_interactive_uitest.cc", + "../browser/ui/views/apps/chrome_native_app_window_views_aura_ash_interactive_uitest.cc", + "../browser/ui/views/ash/tab_scrubber_browsertest.cc", + "../browser/ui/webui/chromeos/login/oobe_display_chooser_browsertest.cc", + "../browser/ui/window_sizer/window_sizer_ash_uitest.cc", + "//ash/accelerators/accelerator_interactive_uitest_chromeos.cc", + "//ash/drag_drop/drag_drop_interactive_uitest.cc", + "//ash/wm/native_cursor_manager_ash_interactive_uitest.cc", + "data/chromeos/service_login.html", + ] + sources -= [ + # Use only the _chromeos version on Ash / Chrome OS. + "base/view_event_test_platform_part_default.cc", + ] + deps += [ + "//ash:interactive_ui_test_support", + "//ash/resources", + "//chrome/browser/media/router:test_support", + "//chromeos", + "//mojo/edk/system", + "//ui/app_list/presenter:test_support", + ] + + data += [ + "//chrome/browser/chromeos/login/test/https_forwarder.py", + "//google_apis/test/", + "$root_out_dir/resources/chromeos/", + ] + + data_deps += [ "//ui/keyboard:resources" ] + + if (enable_nacl) { + data_deps += [ + "//components/nacl/loader:nacl_helper", + "//ppapi/native_client:irt", + ] + + if (enable_nacl_nonsfi) { + data_deps += [ "//components/nacl/loader:helper_nonsfi" ] + } + } + } else { # ! is_chromeos + # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform + # panels). + sources += [ + "../browser/notifications/notification_interactive_uitest.cc", + "../browser/notifications/notification_interactive_uitest_mac.mm", + "../browser/notifications/notification_interactive_uitest_support.cc", + "../browser/notifications/notification_interactive_uitest_support.h", + ] + } + + if (is_win) { + sources += [ + "../browser/downgrade/user_data_downgrade_browsertest.cc", + "../browser/ui/views/touch_events_interactive_uitest_win.cc", + "//ui/resources/cursors/aliasb.cur", + "//ui/resources/cursors/cell.cur", + "//ui/resources/cursors/col_resize.cur", + "//ui/resources/cursors/copy.cur", + "//ui/resources/cursors/none.cur", + "//ui/resources/cursors/row_resize.cur", + "//ui/resources/cursors/vertical_text.cur", + "//ui/resources/cursors/zoom_in.cur", + "//ui/resources/cursors/zoom_out.cur", + "data/resource.rc", + ] + deps += [ + "//chrome:other_version", + "//chrome/app:chrome_dll_resources", + "//chrome/install_static:install_static_util", + "//third_party/isimpledom", + "//third_party/webrtc/modules/desktop_capture", + "//third_party/wtl", + "//ui/resources", + ] + + configs -= [ "//build/config/win:default_incremental_linking" ] + configs += + [ "//build/config/win:default_large_module_incremental_linking" ] + + libs = [ "oleacc.lib" ] + } + + if (is_mac) { + data_deps += [ + "//chrome", + "//chrome:chrome_framework", + ] + + # The browser window can be views or Cocoa on Mac. Test accordingly. + if (mac_views_browser) { + # Aura depended tests. + sources -= [ "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc" ] + } else { + sources += [ + "../browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm", + "../browser/ui/cocoa/permission_bubble/permission_bubble_cocoa_interactive_uitest.mm", + "../browser/ui/cocoa/translate/translate_bubble_test_utils_cocoa.mm", + "base/interactive_test_utils_cocoa.mm", + ] + } + } + + if (use_x11) { + configs += [ "//build/config/linux:xtst" ] + } + + if (enable_app_list) { + sources += + [ "../browser/ui/app_list/app_list_service_interactive_uitest.cc" ] + } + + if (enable_extensions) { + # TODO(rockot) bug 505926: The chrome_extensions_interactive_uitests + # target should be deleted and this line removed. See the + # chrome_extensions_interactive_uitests target for more. + deps += [ "//extensions:chrome_extensions_interactive_uitests" ] + } + + if (!enable_native_notifications) { + sources += [ "../browser/notifications/message_center_notification_manager_interactive_uitest.cc" ] + } + + if (is_android) { + sources -= [ + # Android does not use the message center-based Notification system. + "../browser/notifications/message_center_notifications_browsertest.cc", + + # TODO(peter): Enable the Notification browser tests. + "../browser/notifications/notification_interactive_uitest.cc", + "../browser/notifications/platform_notification_service_interactive_uitest.cc", + ] + } + } + # TODO(609855): Make this compile on Android and run on the bots. test("chrome_app_unittests") { sources = [ @@ -5222,46 +4885,490 @@ if (!is_android && !is_chromecast) { } } -static_library("test_support_unit") { - testonly = true - sources = [ - "base/run_all_unittests.cc", - ] +if (!is_android && !is_fuchsia) { + static_library("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/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/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_service.cc", + "../browser/sync/test/integration/fake_server_invalidation_service.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/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/p2p_invalidation_forwarder.cc", + "../browser/sync/test/integration/p2p_invalidation_forwarder.h", + "../browser/sync/test/integration/p2p_sync_refresher.cc", + "../browser/sync/test/integration/p2p_sync_refresher.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/printers_helper.cc", + "../browser/sync/test/integration/printers_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/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_app_list_helper.cc", + "../browser/sync/test/integration/sync_app_list_helper.h", + "../browser/sync/test/integration/sync_arc_package_helper.cc", + "../browser/sync/test/integration/sync_arc_package_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_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/wifi_credentials_helper.cc", + "../browser/sync/test/integration/wifi_credentials_helper.h", + "../browser/sync/test/integration/wifi_credentials_helper_chromeos.cc", + "../browser/sync/test/integration/wifi_credentials_helper_chromeos.h", + ] + public_deps = [ + "//chrome/browser", + ] + deps = [ + ":test_support", + "//base", + "//components/invalidation/impl", + "//components/invalidation/impl:test_support", + "//components/sync", + "//components/sync:test_support_fake_server", + "//components/sync:test_support_model", + "//components/sync:test_support_testserver", + "//content/test:test_support", + "//net", + "//skia", + ] - public_deps = [ - ":test_support", - "//base", - "//chrome:resources", - "//chrome:strings", - "//chrome/browser", - "//chrome/common", - "//mojo/edk/test:test_support", - ] + if (is_mac) { + sources -= [ + "../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", + ] + } + if (enable_app_list) { + deps += [ "//ui/app_list:test_support" ] + } else { + sources -= [ + "../browser/sync/test/integration/sync_app_list_helper.cc", + "../browser/sync/test/integration/sync_app_list_helper.h", + ] + } + if (is_chromeos) { + deps += [ + "//components/arc:arc_test_support", + "//components/user_manager:test_support", + ] + } else { + sources -= [ + "../browser/sync/test/integration/printers_helper.cc", + "../browser/sync/test/integration/printers_helper.h", + "../browser/sync/test/integration/sync_arc_package_helper.cc", + "../browser/sync/test/integration/sync_arc_package_helper.h", + "../browser/sync/test/integration/wifi_credentials_helper.cc", + "../browser/sync/test/integration/wifi_credentials_helper.h", + ] + } + } + + test("sync_integration_tests") { + sources = [ + "../app/chrome_version.rc.version", + "../browser/sync/test/integration/enable_disable_test.cc", + "../browser/sync/test/integration/migration_test.cc", + "../browser/sync/test/integration/single_client_app_list_sync_test.cc", + "../browser/sync/test/integration/single_client_apps_sync_test.cc", + "../browser/sync/test/integration/single_client_arc_package_sync_test.cc", + "../browser/sync/test/integration/single_client_bookmarks_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_extensions_sync_test.cc", + "../browser/sync/test/integration/single_client_passwords_sync_test.cc", + "../browser/sync/test/integration/single_client_preferences_sync_test.cc", + "../browser/sync/test/integration/single_client_printers_sync_test.cc", + "../browser/sync/test/integration/single_client_search_engines_sync_test.cc", + "../browser/sync/test/integration/single_client_sessions_sync_test.cc", + "../browser/sync/test/integration/single_client_supervised_user_settings_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_events_sync_test.cc", + "../browser/sync/test/integration/single_client_wallet_sync_test.cc", + "../browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc", + "../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", + "../browser/sync/test/integration/two_client_app_list_sync_test.cc", + "../browser/sync/test/integration/two_client_apps_sync_test.cc", + "../browser/sync/test/integration/two_client_arc_package_sync_test.cc", + "../browser/sync/test/integration/two_client_autofill_sync_test.cc", + "../browser/sync/test/integration/two_client_bookmarks_sync_test.cc", + "../browser/sync/test/integration/two_client_dictionary_sync_test.cc", + "../browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc", + "../browser/sync/test/integration/two_client_extensions_sync_test.cc", + "../browser/sync/test/integration/two_client_passwords_sync_test.cc", + "../browser/sync/test/integration/two_client_preferences_sync_test.cc", + "../browser/sync/test/integration/two_client_printers_sync_test.cc", + "../browser/sync/test/integration/two_client_search_engines_sync_test.cc", + "../browser/sync/test/integration/two_client_sessions_sync_test.cc", + "../browser/sync/test/integration/two_client_themes_sync_test.cc", + "../browser/sync/test/integration/two_client_typed_urls_sync_test.cc", + "../browser/sync/test/integration/two_client_uss_sync_test.cc", + "../browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc", + "data/resource.rc", + ] + + data = [ + "//chrome/test/data/sync/", + "//net/tools/testserver/", + "//components/sync/tools/testserver/", + "//third_party/pyftpdlib/", + "//third_party/pywebsocket/", + "//third_party/tlslite/", + "$root_out_dir/pyproto/", + "//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" ] - if (is_win) { deps = [ - "//chrome/install_static/test:test_support", + ":browser_tests_runner", + ":sync_integration_test_support", + ":test_support", + ":test_support_ui", + "//chrome:packed_resources", + "//chrome:resources", + "//chrome:strings", + "//chrome/app:chrome_dll_resources", + "//chrome/app:command_ids", + "//chrome/common", + "//chrome/renderer", + "//components/sync", + "//crypto:platform", + "//testing/gmock", + "//testing/gtest", + "//third_party/WebKit/public:blink", + "//third_party/icu", + "//third_party/leveldatabase", + ] + + data_deps = [ + "//third_party/mesa:osmesa", ] + + if (is_mac) { + # Dictionary sync is disabled on Mac. + sources -= [ + "../browser/sync/test/integration/single_client_dictionary_sync_test.cc", + "../browser/sync/test/integration/two_client_dictionary_sync_test.cc", + ] + + data_deps += [ + "//chrome", + "//chrome:chrome_framework", + ] + } + if (is_win) { + deps += [ + "//chrome:other_version", + "//third_party/wtl", + "//ui/resources", + ] + + configs -= [ "//build/config/win:default_incremental_linking" ] + configs += + [ "//build/config/win:default_large_module_incremental_linking" ] + } else { + sources -= [ "../app/chrome_version.rc.version" ] + } + if (!is_chromeos) { + sources -= [ + "../browser/sync/test/integration/single_client_arc_package_sync_test.cc", + "../browser/sync/test/integration/single_client_printers_sync_test.cc", + "../browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc", + "../browser/sync/test/integration/two_client_arc_package_sync_test.cc", + "../browser/sync/test/integration/two_client_printers_sync_test.cc", + "../browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc", + ] + } + + if (toolkit_views) { + deps += [ "//ui/views" ] + } + if (enable_basic_printing || enable_print_preview) { + deps += [ "//printing" ] + } + if (!enable_app_list) { + sources -= [ + "../browser/sync/test/integration/single_client_app_list_sync_test.cc", + "../browser/sync/test/integration/two_client_app_list_sync_test.cc", + ] + } + if (!enable_supervised_users) { + sources -= [ "../browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc" ] + } } -} -if (is_android) { - android_library("unit_tests_java") { - java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_apk/ChromeNativeTestApplication.java" ] + test("sync_performance_tests") { + sources = [ + "../app/chrome_version.rc.version", + "../browser/sync/test/integration/performance/autofill_sync_perf_test.cc", + "../browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc", + "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc", + "../browser/sync/test/integration/performance/extensions_sync_perf_test.cc", + "../browser/sync/test/integration/performance/passwords_sync_perf_test.cc", + "../browser/sync/test/integration/performance/sessions_sync_perf_test.cc", + "../browser/sync/test/integration/performance/sync_timing_helper.cc", + "../browser/sync/test/integration/performance/sync_timing_helper.h", + "../browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc", + "base/browser_perf_tests_main.cc", + "data/resource.rc", + ] + + defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + deps = [ - "//base:base_java", - "//chrome/android:app_hooks_java", - "//chrome/android:chrome_java", - "//content/public/android:content_java", + ":sync_integration_test_support", + ":test_support_ui", + "//chrome/app:chrome_dll_resources", + "//chrome/app:command_ids", + "//components/sync", + "//crypto:platform", + "//testing/gmock", + "//testing/gtest", ] + + if (is_mac) { + # Dictionary sync is disabled on Mac. + sources -= [ "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc" ] + + # The sync_performance_tests do not run on mac without this flag. + # Search for comments about "xcode_settings" elsewhere in this file. + ldflags = [ "-Wl,-ObjC" ] + } + if (is_win) { + deps += [ + "//chrome:other_version", + "//chrome/installer/util:strings", + "//third_party/wtl", + "//ui/resources", + ] + configs -= [ "//build/config/win:default_incremental_linking" ] + configs += + [ "//build/config/win:default_large_module_incremental_linking" ] + } else { + sources -= [ "../app/chrome_version.rc.version" ] + } + + if (toolkit_views) { + deps += [ "//ui/views" ] + } + + # This target should not require the Chrome executable to run. + assert_no_deps = [ "//chrome" ] } -} -if (is_win) { - loadable_module("conflicts_dll") { - testonly = true + # Executable to measure time to load libraries. + test("load_library_perf_tests") { sources = [ - "conflicts/conflicts_dll.cc", + "../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 + # world, causing link time to explode. Please don't add more dependencies + # here without understanding how it affects link time (and factor them + # differently if possible). + deps = [ + "//base/test:test_support_perf", + "//media:media_features", + "//testing/gtest", + "//testing/perf", + "//third_party/widevine/cdm:headers", + ] + + if (enable_library_cdms) { + deps += [ "//media/cdm:cdm_paths" ] + data_deps = [ + "//media/cdm/ppapi:clearkeycdmadapter", + "//third_party/widevine/cdm:widevinecdmadapter", + ] + } + + data = [ + # Needed for isolate script to execute. + "//testing/scripts/common.py", + "//testing/xvfb.py", + "//testing/scripts/run_gtest_perf_test.py", + "//tools/perf/generate_legacy_perf_dashboard_json.py", + ] + + # This target should not require the Chrome executable to run. + assert_no_deps = [ "//chrome" ] + } + + group("telemetry_unittests") { + testonly = true + deps = [ + "//tools/perf/chrome_telemetry_build:telemetry_chrome_test", + ] + + data = [ + "//tools/perf/run_telemetry_tests", + + # For isolate contract. + "//testing/scripts/common.py", + "//testing/xvfb.py", + "//testing/scripts/run_telemetry_as_googletest.py", + ] + + if (enable_mus) { + deps += [ "//chrome:chrome_test" ] + data_deps = [ + "//chrome:chrome_test", + ] + } + } + + group("telemetry_gpu_unittests_run") { + testonly = true + deps = [ + ":telemetry_gpu_unittests", + ] + } + + group("telemetry_gpu_unittests") { + deps = [ + "//third_party/catapult/telemetry:telemetry_test_support", + ] + data = [ + # TODO(kbr): refactor the telemetry dependencies more cleanly. + "//content/test/gpu/", + "//content/test/data/gpu/", + + # For GpuProcess.video + "//content/test/data/media/bear.ogv", + + # For webgl_conformance_expectations_unittest + "//third_party/webgl/src/sdk/tests/", + + # For resolve the imports in content/test/gpu/run_gpu_test.py + "//tools/perf/core/", + "//tools/perf/chrome_telemetry_build/", + + # From telemetry_gpu_unittests.isolate + "//third_party/pylint/", + "//third_party/logilab/", + "//testing/scripts/common.py", + "//testing/xvfb.py", + "//testing/scripts/run_telemetry_as_googletest.py", + ] + } +} + +if (safe_browsing_mode == 1 && is_mac) { + action("mac_safe_browsing_test_data") { + script = "//build/gn_run_binary.py" + shell_script = "//chrome/test/data/safe_browsing/dmg/generate_test_data.sh" + inputs = [ + script, + shell_script, + "data/safe_browsing/dmg/hfs_raw_images.tar.bz2", + "data/safe_browsing/mach_o/executablefat", + "data/safe_browsing/mach_o/lib64.dylib", + ] + _output_dir = "$root_out_dir/test_data/chrome/safe_browsing_dmg" + outputs = [ + "$_output_dir/dmg_UDBZ_GPTSPUD.dmg", + "$_output_dir/dmg_UDBZ_NONE.dmg", + "$_output_dir/dmg_UDBZ_SPUD.dmg", + "$_output_dir/dmg_UDCO_GPTSPUD.dmg", + "$_output_dir/dmg_UDCO_NONE.dmg", + "$_output_dir/dmg_UDCO_SPUD.dmg", + "$_output_dir/dmg_UDRO_GPTSPUD.dmg", + "$_output_dir/dmg_UDRO_NONE.dmg", + "$_output_dir/dmg_UDRO_SPUD.dmg", + "$_output_dir/dmg_UDRW_GPTSPUD.dmg", + "$_output_dir/dmg_UDRW_NONE.dmg", + "$_output_dir/dmg_UDRW_SPUD.dmg", + "$_output_dir/dmg_UDSP_GPTSPUD.sparseimage", + "$_output_dir/dmg_UDSP_NONE.sparseimage", + "$_output_dir/dmg_UDSP_SPUD.sparseimage", + "$_output_dir/dmg_UDTO_GPTSPUD.cdr", + "$_output_dir/dmg_UDTO_NONE.cdr", + "$_output_dir/dmg_UDTO_SPUD.cdr", + "$_output_dir/dmg_UDZO_GPTSPUD.dmg", + "$_output_dir/dmg_UDZO_NONE.dmg", + "$_output_dir/dmg_UDZO_SPUD.dmg", + "$_output_dir/dmg_UFBI_GPTSPUD.dmg", + "$_output_dir/dmg_UFBI_NONE.dmg", + "$_output_dir/dmg_UFBI_SPUD.dmg", + "$_output_dir/hfs_plus.img", + "$_output_dir/hfsx_case_sensitive.img", + "$_output_dir/mach_o_in_dmg.dmg", + "$_output_dir/mach_o_in_dmg.txt", + "$_output_dir/mach_o_in_dmg_no_koly_signature.dmg", + "$_output_dir/mach_o_in_dmg_no_koly_signature.txt", + ] + args = [ + rebase_path(shell_script, root_out_dir), + rebase_path(_output_dir, root_out_dir), ] } } |