# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
- 'variables' : {
- 'pyautolib_sources': [
- 'app/chrome_command_ids.h',
- 'app/chrome_dll_resource.h',
- 'common/automation_constants.h',
- 'common/pref_names.cc',
- 'common/pref_names.h',
- 'test/automation/browser_proxy.cc',
- 'test/automation/browser_proxy.h',
- 'test/automation/tab_proxy.cc',
- 'test/automation/tab_proxy.h',
- '../content/public/common/page_type.h',
- '../content/public/common/security_style.h',
- # Must come before cert_status_flags.h
- '../net/base/net_export.h',
- '../net/cert/cert_status_flags.h',
- ],
- 'conditions': [
- ['asan==1', {
- 'pyautolib_sources': [
- 'test/pyautolib/asan_stub.c',
- ]
- }],
- ],
- },
'includes': [
'js_unittest_vars.gypi',
],
'targets': [
{
- 'target_name': 'test_support_ui',
- 'type': 'static_library',
- 'dependencies': [
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
- 'chrome_resources.gyp:theme_resources',
- 'test_support_common',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
- ],
- 'export_dependent_settings': [
- 'test_support_common',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'test/automation/proxy_launcher.cc',
- 'test/automation/proxy_launcher.h',
- 'test/ui/javascript_test_util.cc',
- 'test/ui/ui_perf_test.cc',
- 'test/ui/ui_perf_test.h',
- 'test/ui/ui_test.cc',
- 'test/ui/ui_test.h',
- 'test/ui/ui_test_suite.cc',
- 'test/ui/ui_test_suite.h',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- 'chrome.gyp:crash_service', # run time dependency
- ],
- }],
- ['OS=="win" and target_arch=="ia32"', {
- 'dependencies': [
- 'chrome.gyp:crash_service_win64', # run time dependency
- ],
- }],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
- ],
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- 'msvs_disabled_warnings': [ 4267, ],
- },
- {
'target_name': 'interactive_ui_tests',
'type': 'executable',
'dependencies': [
'debugger',
'renderer',
'test_support_common',
- # NOTE: don't add test_support_ui, no more UITests. See
- # http://crbug.com/137365
+ '../content/app/resources/content_resources.gyp:content_resources',
'../google_apis/google_apis.gyp:google_apis_test_support',
- '../third_party/hunspell/hunspell.gyp:hunspell',
'../net/net.gyp:net',
'../net/net.gyp:net_resources',
'../net/net.gyp:net_test_support',
+ '../pdf/pdf.gyp:pdf',
+ '../ppapi/ppapi_internal.gyp:ppapi_tests',
'../skia/skia.gyp:skia',
'../sync/sync.gyp:sync',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libpng/libpng.gyp:libpng',
- '../third_party/zlib/zlib.gyp:zlib',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
'../third_party/npapi/npapi.gyp:npapi',
- # Runtime dependencies
- '../ppapi/ppapi_internal.gyp:ppapi_tests',
- '../ui/ui_unittests.gyp:ui_test_support',
+ '../third_party/zlib/zlib.gyp:zlib',
+ '../ui/base/ui_base.gyp:ui_base_test_support',
'../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
- '../webkit/webkit_resources.gyp:webkit_resources',
],
'include_dirs': [
'..',
'HAS_OUT_OF_PROC_TEST_RUNNER',
],
'sources': [
- '../apps/app_shim/app_shim_quit_interactive_uitest_mac.mm',
- '../apps/app_window_interactive_uitest.cc',
+ '../chrome/browser/ui/webui/options/language_options_interactive_uitest.cc',
+ '../extensions/browser/app_window/app_window_interactive_uitest.cc',
+ '../ui/base/clipboard/clipboard_unittest.cc',
+ '../ui/views/controls/webview/webview_interactive_uitest.cc',
'../ui/views/corewm/desktop_capture_controller_unittest.cc',
+ '../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc',
+ '../ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc',
'../ui/views/widget/widget_interactive_uitest.cc',
'browser/apps/app_browsertest_util.cc',
'browser/apps/app_browsertest_util.h',
'browser/apps/app_pointer_lock_interactive_uitest.cc',
+ 'browser/apps/app_shim/app_shim_interactive_uitest_mac.mm',
+ 'browser/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm',
'browser/apps/app_window_interactive_uitest.cc',
'browser/apps/web_view_interactive_browsertest.cc',
'browser/autofill/autofill_interactive_uitest.cc',
'browser/browser_keyevents_browsertest.cc',
+ 'browser/chrome_plugin_interactive_test.cc',
'browser/extensions/api/extension_action/browser_action_interactive_test.cc',
'browser/extensions/api/omnibox/omnibox_api_interactive_test.cc',
'browser/extensions/api/tabs/tabs_interactive_test.cc',
'browser/extensions/updater/extension_cache_fake.cc',
'browser/extensions/window_open_interactive_apitest.cc',
'browser/mouseleave_browsertest.cc',
- 'browser/notifications/desktop_notifications_unittest.cc',
- 'browser/notifications/desktop_notifications_unittest.h',
'browser/notifications/notification_browsertest.cc',
'browser/password_manager/password_generation_interactive_uitest.cc',
'browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc',
'browser/ui/app_list/app_list_service_mac_interactive_uitest.mm',
'browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc',
'browser/ui/browser_focus_uitest.cc',
+ 'browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc',
'browser/ui/cocoa/panels/panel_cocoa_browsertest.mm',
'browser/ui/find_bar/find_bar_host_interactive_uitest.cc',
'browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc',
'browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc',
- 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
- 'browser/ui/gtk/bookmarks/bookmark_bubble_gtk_browsertest.cc',
'browser/ui/omnibox/omnibox_view_browsertest.cc',
'browser/ui/panels/base_panel_browser_test.cc',
'browser/ui/panels/base_panel_browser_test.h',
'browser/ui/panels/test_panel_notification_observer.h',
'browser/ui/panels/test_panel_collection_squeeze_observer.cc',
'browser/ui/panels/test_panel_collection_squeeze_observer.h',
+ 'browser/ui/passwords/manage_passwords_test.cc',
+ 'browser/ui/passwords/manage_passwords_test.h',
'browser/ui/search/instant_extended_interactive_uitest.cc',
+ 'browser/ui/pdf/pdf_interactive_browsertest.cc',
'browser/ui/search/instant_extended_manual_interactive_uitest.cc',
'browser/ui/search/instant_test_utils.h',
'browser/ui/search/instant_test_utils.cc',
'browser/ui/views/frame/browser_view_focus_uitest.cc',
'browser/ui/views/frame/browser_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/star_view_browsertest.cc',
'browser/ui/views/menu_controller_interactive_uitest.cc',
'browser/ui/views/menu_item_view_interactive_uitest.cc',
'browser/ui/views/menu_test_base.cc',
'browser/ui/views/menu_test_base.h',
'browser/ui/views/menu_model_adapter_test.cc',
+ 'browser/ui/views/menu_view_drag_and_drop_test.cc',
'browser/ui/views/message_center/web_notification_tray_browsertest.cc',
'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
'browser/ui/views/panels/panel_view_browsertest.cc',
+ 'browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc',
+ 'browser/ui/views/passwords/manage_passwords_icon_view_browsertest.cc',
'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
+ 'browser/ui/views/status_icons/status_tray_state_changer_interactive_uitest_win.cc',
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
'browser/ui/views/toolbar/toolbar_button_test.cc',
+ 'browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc',
'test/base/interactive_test_utils.cc',
'test/base/interactive_test_utils.h',
'test/base/interactive_test_utils_aura.cc',
'test/base/interactive_test_utils_aura.h',
- 'test/base/interactive_test_utils_gtk.cc',
'test/base/interactive_test_utils_mac.mm',
'test/base/interactive_test_utils_views.cc',
'test/base/interactive_test_utils_win.cc',
'test/base/interactive_ui_tests_main.cc',
'test/base/view_event_test_base.cc',
'test/base/view_event_test_base.h',
+ 'test/base/view_event_test_platform_part.h',
+ 'test/base/view_event_test_platform_part_ash.cc',
+ 'test/base/view_event_test_platform_part_chromeos.cc',
+ 'test/base/view_event_test_platform_part_mac.mm',
'test/ppapi/ppapi_interactive_browsertest.cc',
],
'conditions': [
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- 'sources!': [
- 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
- ],
- }],
['OS=="linux" and use_aura==1', {
# TODO(gbillock): aura linux does not support the automation for
# SendMouseMoveNotifyWhenDone
'browser/ui/views/toolbar/toolbar_button_test.cc',
],
}],
- ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+ ['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:ssl',
],
}],
- ['toolkit_uses_gtk == 1 and toolkit_views == 0', {
- 'sources!': [
- # TODO(port)
- 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
- 'browser/ui/views/button_dropdown_test.cc',
- 'browser/ui/views/constrained_window_views_browsertest.cc',
- 'browser/ui/views/crypto_module_password_dialog_view_unittest.cc',
- 'browser/ui/views/find_bar_host_interactive_uitest.cc',
- 'browser/ui/views/keyboard_access_browsertest.cc',
- 'browser/ui/views/menu_item_view_test.cc',
- 'browser/ui/views/menu_model_adapter_test.cc',
- 'test/base/view_event_test_base.cc',
- 'test/base/view_event_test_base.h',
- ],
- }],
['OS=="linux" and chromeos==0', {
'sources!': [
# TODO(port): Disable all the interactive panel tests on all linux
# when run under openbox.
#
# Merge this back into the next block post switch to linux_aura.
- 'browser/ui/panels/base_panel_browser_test.cc',
- 'browser/ui/panels/base_panel_browser_test.h',
- 'browser/ui/panels/detached_panel_browsertest.cc',
- 'browser/ui/panels/docked_panel_browsertest.cc',
- 'browser/ui/panels/panel_browsertest.cc',
'browser/ui/panels/panel_drag_browsertest.cc',
- 'browser/ui/panels/panel_resize_browsertest.cc',
'browser/ui/panels/stacked_panel_browsertest.cc',
- 'browser/ui/views/panels/panel_view_browsertest.cc',
],
}],
['OS=="linux" and use_aura==1 and chromeos==0', {
'sources!': [
- # TODO(port): These tests fail because they don't have a Screen,
- # but expect one.
- 'browser/notifications/desktop_notifications_unittest.cc',
- 'browser/notifications/desktop_notifications_unittest.h',
- # TODO(port): I have no idea about the crashes in here; there's
- # nothing obviously wrong. It doesn't run on gtk today, either.
- 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
# TODO(port): Everything here 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/omnibox/omnibox_view_browsertest.cc',
'browser/extensions/api/tabs/tabs_interactive_test.cc',
'browser/ui/views/keyboard_access_browsertest.cc',
],
'browser/ui/window_sizer/window_sizer_ash_uitest.cc',
],
}],
- ['OS=="linux" and toolkit_views==1', {
- 'sources!': [
- # TODO(port)
- 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
- ],
- }],
['OS=="mac"', {
'sources!': [
- # TODO(port)
+ # TODO(tapted): Enable toolkit-views tests on Mac when their
+ # respective implementations are ported.
'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
'browser/ui/views/constrained_window_views_browsertest.cc',
'browser/ui/views/find_bar_host_interactive_uitest.cc',
'browser/ui/views/keyboard_access_browsertest.cc',
- 'browser/ui/views/menu_item_view_test.cc',
- 'browser/ui/views/menu_model_adapter_test.cc',
+ 'browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc',
+ 'browser/ui/views/location_bar/star_view_browsertest.cc',
+ 'browser/ui/views/message_center/web_notification_tray_browsertest.cc',
+ 'browser/ui/views/omnibox/omnibox_view_views_browsertest.cc',
+ 'browser/ui/views/panels/panel_view_browsertest.cc',
+ 'browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc',
+ 'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
- 'test/base/view_event_test_base.cc',
- 'test/base/view_event_test_base.h',
+ 'browser/ui/views/toolbar/toolbar_button_test.cc',
+ 'browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc',
],
'dependencies': [
'chrome'
}],
['toolkit_views==1', {
'dependencies': [
+ '../ui/views/controls/webview/webview_tests.gyp:webview_test_support',
'../ui/views/views.gyp:views',
'../ui/views/views.gyp:views_test_support',
],
}, { # else: toolkit_views == 0
+ 'sources!': [
+ 'test/base/view_event_test_base.cc',
+ 'test/base/view_event_test_base.h',
+ ],
'sources/': [
['exclude', '^browser/ui/views/'],
['exclude', '^../ui/views/'],
}],
['chromeos==1', {
'dependencies': [
+ '../ash/ash_resources.gyp:ash_resources',
'../chromeos/chromeos.gyp:chromeos',
],
'conditions': [
'browser/chromeos/input_method/textinput_test_helper.cc',
'browser/chromeos/input_method/textinput_test_helper.h',
'browser/chromeos/login/eula_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/oobe_browsertest.cc',
- 'browser/chromeos/login/screen_locker_browsertest.cc',
- 'browser/chromeos/login/screen_locker_tester.cc',
- 'browser/chromeos/login/screen_locker_tester.h',
- 'browser/chromeos/login/wallpaper_manager_browsertest.cc',
+ 'browser/chromeos/login/screenshot_tester.h',
+ 'browser/chromeos/login/screenshot_tester.cc',
+ 'browser/chromeos/login/mixin_based_browser_test.h',
+ 'browser/chromeos/login/mixin_based_browser_test.cc',
+ 'browser/chromeos/login/screenshot_testing_mixin.h',
+ 'browser/chromeos/login/screenshot_testing_mixin.cc',
+ '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',
'test/data/chromeos/service_login.html',
],
'sources!': [
+ '../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc',
+ '../ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc',
+
# chromeos does not use cross-platform panels
- 'browser/notifications/desktop_notifications_unittest.cc',
- 'browser/notifications/desktop_notifications_unittest.h',
'browser/notifications/notification_browsertest.cc',
'browser/ui/panels/detached_panel_browsertest.cc',
'browser/ui/panels/docked_panel_browsertest.cc',
'browser/ui/panels/stacked_panel_browsertest.cc',
'browser/ui/views/message_center/web_notification_tray_browsertest.cc',
'browser/ui/views/panels/panel_view_browsertest.cc',
+
+ # Use only the _chromeos version on ChromeOS.
+ 'test/base/view_event_test_platform_part_ash.cc',
],
}],
['OS=="win"', {
- 'msvs_large_pdb': 1,
'include_dirs': [
'../third_party/wtl/include',
],
# but that causes errors in other targets when
# resulting .res files get referenced multiple times.
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc',
],
'test/chromedriver/chrome/chrome_android_impl.h',
'test/chromedriver/chrome/chrome_desktop_impl.cc',
'test/chromedriver/chrome/chrome_desktop_impl.h',
- 'test/chromedriver/chrome/chrome_existing_impl.cc',
- 'test/chromedriver/chrome/chrome_existing_impl.h',
'test/chromedriver/chrome/chrome_finder.cc',
'test/chromedriver/chrome/chrome_finder.h',
'test/chromedriver/chrome/chrome_finder_mac.mm',
'test/chromedriver/chrome/chrome_impl.cc',
'test/chromedriver/chrome/chrome_impl.h',
+ 'test/chromedriver/chrome/chrome_remote_impl.cc',
+ 'test/chromedriver/chrome/chrome_remote_impl.h',
'test/chromedriver/chrome/console_logger.cc',
'test/chromedriver/chrome/console_logger.h',
'test/chromedriver/chrome/debugger_tracker.cc',
'test/chromedriver/chrome/debugger_tracker.h',
'test/chromedriver/chrome/device_manager.cc',
'test/chromedriver/chrome/device_manager.h',
+ 'test/chromedriver/chrome/device_metrics.cc',
+ 'test/chromedriver/chrome/device_metrics.h',
'test/chromedriver/chrome/devtools_client.h',
'test/chromedriver/chrome/devtools_client_impl.cc',
'test/chromedriver/chrome/devtools_client_impl.h',
'test/chromedriver/chrome/javascript_dialog_manager.h',
'test/chromedriver/chrome/log.h',
'test/chromedriver/chrome/log.cc',
+ 'test/chromedriver/chrome/mobile_device.cc',
+ 'test/chromedriver/chrome/mobile_device.h',
+ 'test/chromedriver/chrome/mobile_device_list.cc',
+ 'test/chromedriver/chrome/mobile_device_list.h',
+ 'test/chromedriver/chrome/mobile_emulation_override_manager.cc',
+ 'test/chromedriver/chrome/mobile_emulation_override_manager.h',
'test/chromedriver/chrome/navigation_tracker.cc',
'test/chromedriver/chrome/navigation_tracker.h',
- 'test/chromedriver/chrome/performance_logger.h',
- 'test/chromedriver/chrome/performance_logger.cc',
'test/chromedriver/chrome/status.cc',
'test/chromedriver/chrome/status.h',
'test/chromedriver/chrome/ui_events.cc',
'test/chromedriver/basic_types.h',
'test/chromedriver/capabilities.cc',
'test/chromedriver/capabilities.h',
+ 'test/chromedriver/chrome/browser_info.cc',
+ 'test/chromedriver/chrome/browser_info.h',
'test/chromedriver/chrome_launcher.cc',
'test/chromedriver/chrome_launcher.h',
+ 'test/chromedriver/command_listener.h',
+ 'test/chromedriver/command_listener_proxy.cc',
+ 'test/chromedriver/command_listener_proxy.h',
'test/chromedriver/command.h',
'test/chromedriver/commands.cc',
'test/chromedriver/commands.h',
'test/chromedriver/key_converter.h',
'test/chromedriver/keycode_text_conversion.h',
'test/chromedriver/keycode_text_conversion_mac.mm',
+ 'test/chromedriver/keycode_text_conversion_ozone.cc',
'test/chromedriver/keycode_text_conversion_win.cc',
'test/chromedriver/keycode_text_conversion_x.cc',
'test/chromedriver/logging.cc',
'test/chromedriver/logging.h',
+ 'test/chromedriver/performance_logger.cc',
+ 'test/chromedriver/performance_logger.h',
'test/chromedriver/server/http_handler.cc',
'test/chromedriver/server/http_handler.h',
'test/chromedriver/session.cc',
['use_x11==1', {
'dependencies': [
'../build/linux/system.gyp:x11',
+ '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
]
}]
],
],
'sources': [
'test/chromedriver/capabilities_unittest.cc',
+ 'test/chromedriver/chrome/browser_info_unittest.cc',
'test/chromedriver/chrome/chrome_finder_unittest.cc',
'test/chromedriver/chrome/console_logger_unittest.cc',
'test/chromedriver/chrome/device_manager_unittest.cc',
'test/chromedriver/chrome/geolocation_override_manager_unittest.cc',
'test/chromedriver/chrome/heap_snapshot_taker_unittest.cc',
'test/chromedriver/chrome/javascript_dialog_manager_unittest.cc',
+ 'test/chromedriver/chrome/mobile_emulation_override_manager_unittest.cc',
'test/chromedriver/chrome/navigation_tracker_unittest.cc',
- 'test/chromedriver/chrome/performance_logger_unittest.cc',
'test/chromedriver/chrome/status_unittest.cc',
'test/chromedriver/chrome/stub_chrome.cc',
'test/chromedriver/chrome/stub_chrome.h',
'test/chromedriver/chrome/stub_web_view.h',
'test/chromedriver/chrome/web_view_impl_unittest.cc',
'test/chromedriver/chrome_launcher_unittest.cc',
+ 'test/chromedriver/command_listener_proxy_unittest.cc',
'test/chromedriver/commands_unittest.cc',
'test/chromedriver/logging_unittest.cc',
+ 'test/chromedriver/performance_logger_unittest.cc',
'test/chromedriver/server/http_handler_unittest.cc',
'test/chromedriver/session_commands_unittest.cc',
'test/chromedriver/session_unittest.cc',
'../base/base.gyp:test_support_base',
'../components/components.gyp:autofill_content_risk_proto',
'../components/components.gyp:autofill_content_test_support',
+ '../components/components.gyp:captive_portal_test_support',
'../components/components.gyp:dom_distiller_content',
'../components/components.gyp:dom_distiller_test_support',
'../components/components.gyp:translate_core_common',
'../components/components_resources.gyp:components_resources',
'../components/components_strings.gyp:components_strings',
+ '../crypto/crypto.gyp:crypto_test_support',
'../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
+ '../device/serial/serial.gyp:device_serial_test_util',
'../extensions/common/api/api.gyp:extensions_api',
'../google_apis/google_apis.gyp:google_apis_test_support',
- '../media/cast/test/utility/utility.gyp:cast_test_utility',
+ '../media/cast/cast.gyp:cast_test_utility',
+ '../media/media.gyp:media',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
+ '../sdch/sdch.gyp:sdch',
'../skia/skia.gyp:skia',
'../sync/sync.gyp:sync',
'../sync/sync.gyp:test_support_sync_api',
'../third_party/libjingle/libjingle.gyp:peerconnection_server',
'../third_party/safe_browsing/safe_browsing.gyp:safe_browsing',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
+ '../ui/accessibility/accessibility.gyp:accessibility_test_support',
'../ui/compositor/compositor.gyp:compositor_test_support',
'../ui/resources/ui_resources.gyp:ui_resources',
'../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
'../v8/tools/gyp/v8.gyp:v8',
# Runtime dependencies
'../ppapi/ppapi_internal.gyp:ppapi_tests',
+ '../remoting/remoting.gyp:remoting_browser_test_resources',
+ '../remoting/remoting.gyp:remoting_webapp_unittest',
'../third_party/mesa/mesa.gyp:osmesa',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_test_license_server',
],
],
'sources': [
'../apps/app_restore_service_browsertest.cc',
- '../apps/app_window_browsertest.cc',
- '../apps/app_shim/app_shim_host_manager_browsertest_mac.mm',
- '../apps/app_shim/test/app_shim_host_manager_test_api_mac.cc',
- '../apps/app_shim/test/app_shim_host_manager_test_api_mac.h',
'../apps/load_and_launch_browsertest.cc',
# TODO(blundell): Bring up a components_browsertests target and move
# this test to be in that target. crbug.com/283846
'../components/autofill/content/renderer/test_password_autofill_agent.cc',
'../components/autofill/content/renderer/test_password_generation_agent.h',
'../components/autofill/content/renderer/test_password_generation_agent.cc',
+ # TODO(rockot): Remove this once extensions_browsertests exists.
+ '../extensions/browser/api/app_window/app_window_apitest.cc',
+ '../extensions/browser/api/bluetooth/bluetooth_apitest.cc',
+ '../extensions/browser/api/bluetooth/bluetooth_private_apitest.cc',
+ '../extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc',
+ '../extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc',
+ '../extensions/browser/api/cast_channel/cast_channel_apitest.cc',
+ '../extensions/browser/api/runtime/runtime_apitest.cc',
+ '../extensions/browser/api/serial/serial_apitest.cc',
+ '../extensions/browser/api/usb/usb_apitest.cc',
+ '../extensions/browser/api/usb/usb_manual_apitest.cc',
+ '../extensions/browser/app_window/app_window_browsertest.cc',
+ '../extensions/browser/guest_view/extension_options/extension_options_apitest.cc',
+ '../extensions/browser/test_extension_registry_observer.h',
+ '../extensions/browser/test_extension_registry_observer.cc',
+ '../extensions/renderer/script_context_browsertest.cc',
'app/chrome_command_ids.h',
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
'browser/accessibility/accessibility_extension_apitest.cc',
'browser/accessibility/browser_accessibility_state_browsertest.cc',
'browser/app_controller_mac_browsertest.mm',
- 'browser/apps/ad_view_browsertest.cc',
'browser/apps/app_browsertest.cc',
'browser/apps/app_browsertest_util.cc',
'browser/apps/app_browsertest_util.h',
'browser/apps/app_crash_browsertest.cc',
- 'browser/apps/app_window_browsertest.cc',
+ 'browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm',
+ 'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.cc',
+ 'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h',
'browser/apps/app_url_redirector_browsertest.cc',
+ 'browser/apps/app_view_browsertest.cc',
+ 'browser/apps/app_window_browsertest.cc',
+ 'browser/apps/custom_launcher_page_browsertest_views.cc',
+ 'browser/apps/drive/drive_app_converter_browsertest.cc',
+ 'browser/apps/drive/drive_app_provider_browsertest.cc',
'browser/apps/ephemeral_app_browsertest.cc',
+ 'browser/apps/ephemeral_app_browsertest.h',
+ 'browser/apps/ephemeral_app_launcher_browsertest.cc',
'browser/apps/ephemeral_app_service_browsertest.cc',
'browser/apps/event_page_browsertest.cc',
'browser/apps/speech_recognition_browsertest.cc',
'browser/apps/window_controls_browsertest.cc',
'browser/autocomplete/autocomplete_browsertest.cc',
'browser/autofill/autofill_browsertest.cc',
+ 'browser/autofill/autofill_server_browsertest.cc',
'browser/autofill/content_autofill_driver_browsertest.cc',
'browser/autofill/form_structure_browsertest.cc',
- 'browser/autofill/risk/fingerprint_browsertest.cc',
- 'browser/bitmap_fetcher_browsertest.cc',
+ 'browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc',
'browser/browser_encoding_browsertest.cc',
'browser/browsing_data/browsing_data_database_helper_browsertest.cc',
'browser/browsing_data/browsing_data_helper_browsertest.h',
'browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc',
'browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc',
'browser/browsing_data/browsing_data_remover_browsertest.cc',
+ 'browser/browsing_data/browsing_data_remover_test_util.cc',
+ 'browser/browsing_data/browsing_data_remover_test_util.h',
'browser/captive_portal/captive_portal_browsertest.cc',
'browser/chrome_content_browser_client_browsertest.cc',
'browser/chrome_main_browsertest.cc',
'browser/chrome_plugin_browsertest.cc',
'browser/chrome_security_exploit_browsertest.cc',
+ 'browser/chrome_service_worker_browsertest.cc',
'browser/chrome_switches_browsertest.cc',
'browser/chromeos/accessibility/accessibility_manager_browsertest.cc',
'browser/chromeos/accessibility/magnification_manager_browsertest.cc',
'browser/chromeos/accessibility/speech_monitor.cc',
'browser/chromeos/accessibility/speech_monitor.h',
+ 'browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc',
'browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc',
'browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc',
'browser/chromeos/attestation/attestation_policy_browsertest.cc',
+ 'browser/chromeos/customization_wallpaper_downloader_browsertest.cc',
+ 'browser/chromeos/device/input_service_proxy_browsertest.cc',
'browser/chromeos/drive/drive_integration_service_browsertest.cc',
+ 'browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc',
'browser/chromeos/drive/test_util.cc',
'browser/chromeos/drive/test_util.h',
'browser/chromeos/extensions/accessibility_features_apitest.cc',
- 'browser/chromeos/extensions/screenlock_private_apitest.cc',
'browser/chromeos/extensions/echo_private_apitest.cc',
'browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc',
- 'browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc',
+ 'browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc',
'browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc',
'browser/chromeos/extensions/info_private_apitest.cc',
'browser/chromeos/extensions/input_method_apitest_chromeos.cc',
+ 'browser/chromeos/extensions/input_view_browsertest.cc',
'browser/chromeos/extensions/virtual_keyboard_browsertest.cc',
+ 'browser/chromeos/extensions/virtual_keyboard_browsertest.h',
'browser/chromeos/extensions/wallpaper_apitest.cc',
+ 'browser/chromeos/extensions/wallpaper_manager_browsertest.cc',
'browser/chromeos/extensions/wallpaper_private_apitest.cc',
'browser/chromeos/file_manager/drive_test_util.cc',
'browser/chromeos/file_manager/drive_test_util.h',
'browser/chromeos/input_method/mode_indicator_browsertest.cc',
'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.cc',
'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h',
- 'browser/chromeos/login/captive_portal_window_browsertest.cc',
'browser/chromeos/login/crash_restore_browsertest.cc',
'browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc',
'browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc',
+ 'browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.cc',
+ 'browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h',
'browser/chromeos/login/enrollment/mock_enrollment_screen.cc',
'browser/chromeos/login/enrollment/mock_enrollment_screen.h',
'browser/chromeos/login/existing_user_controller_browsertest.cc',
'browser/chromeos/login/kiosk_browsertest.cc',
- 'browser/chromeos/login/login_screen_policy_browsertest.cc',
- 'browser/chromeos/login/login_utils_browsertest.cc',
+ 'browser/chromeos/login/lock/screen_locker_tester.cc',
+ 'browser/chromeos/login/lock/screen_locker_tester.h',
'browser/chromeos/login/login_manager_test.cc',
'browser/chromeos/login/login_manager_test.h',
- 'browser/chromeos/login/managed/supervised_user_creation_browsertest.cc',
- 'browser/chromeos/login/mock_authenticator.cc',
- 'browser/chromeos/login/mock_authenticator.h',
- 'browser/chromeos/login/oauth2_browsertest.cc',
- 'browser/chromeos/login/oobe_base_test.cc',
- 'browser/chromeos/login/oobe_base_test.h',
+ 'browser/chromeos/login/login_screen_policy_browsertest.cc',
+ 'browser/chromeos/login/login_ui_keyboard_browsertest.cc',
+ 'browser/chromeos/login/login_utils_browsertest.cc',
+ 'browser/chromeos/login/mixin_based_browser_test.cc',
+ 'browser/chromeos/login/mixin_based_browser_test.h',
'browser/chromeos/login/oobe_localization_browsertest.cc',
+ 'browser/chromeos/login/reset_browsertest.cc',
+ # TODO(nkostylev) Re-enable ResourceLoaderBrowserTest.
+ #'browser/chromeos/login/resource_loader_browsertest.cc',
'browser/chromeos/login/saml/saml_browsertest.cc',
'browser/chromeos/login/session_login_browsertest.cc',
- 'browser/chromeos/login/screen_locker_tester.cc',
- 'browser/chromeos/login/screen_locker_tester.h',
'browser/chromeos/login/screens/mock_error_screen.cc',
'browser/chromeos/login/screens/mock_error_screen.h',
'browser/chromeos/login/screens/mock_eula_screen.cc',
'browser/chromeos/login/screens/mock_update_screen.h',
'browser/chromeos/login/screens/network_screen_browsertest.cc',
'browser/chromeos/login/screens/update_screen_browsertest.cc',
- 'browser/chromeos/login/simple_web_view_dialog_browsertest.cc',
+ 'browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc',
+ 'browser/chromeos/login/supervised/supervised_user_password_browsertest.cc',
+ 'browser/chromeos/login/supervised/supervised_user_test_base.cc',
+ 'browser/chromeos/login/supervised/supervised_user_test_base.h',
+ 'browser/chromeos/login/signin/oauth2_browsertest.cc',
'browser/chromeos/login/test/app_window_waiter.cc',
'browser/chromeos/login/test/app_window_waiter.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/test/wizard_in_process_browser_test.cc',
+ 'browser/chromeos/login/test/wizard_in_process_browser_test.h',
'browser/chromeos/login/test_login_utils.cc',
'browser/chromeos/login/test_login_utils.h',
- 'browser/chromeos/login/user_adding_screen_browsertest.cc',
- 'browser/chromeos/login/user_image_manager_browsertest.cc',
- 'browser/chromeos/login/user_image_manager_test_util.cc',
- 'browser/chromeos/login/user_image_manager_test_util.h',
- 'browser/chromeos/login/wallpaper_manager_policy_browsertest.cc',
+ 'browser/chromeos/login/ui/captive_portal_window_browsertest.cc',
+ 'browser/chromeos/login/ui/simple_web_view_dialog_browsertest.cc',
+ 'browser/chromeos/login/ui/user_adding_screen_browsertest.cc',
+ 'browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc',
+ 'browser/chromeos/login/users/avatar/user_image_manager_test_util.cc',
+ 'browser/chromeos/login/users/avatar/user_image_manager_test_util.h',
+ 'browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc',
+ 'browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc',
+ 'browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h',
'browser/chromeos/login/wizard_controller_browsertest.cc',
- 'browser/chromeos/login/wizard_in_process_browser_test.cc',
- 'browser/chromeos/login/wizard_in_process_browser_test.h',
'browser/chromeos/memory/oom_priority_manager_browsertest.cc',
'browser/chromeos/net/network_portal_detector_impl_browsertest.cc',
+ 'browser/chromeos/policy/blocking_login_browsertest.cc',
+ 'browser/chromeos/policy/device_cloud_policy_browsertest.cc',
'browser/chromeos/policy/device_local_account_browsertest.cc',
'browser/chromeos/policy/device_policy_cros_browser_test.cc',
'browser/chromeos/policy/device_policy_cros_browser_test.h',
'browser/chromeos/policy/policy_cert_verifier_browsertest.cc',
'browser/chromeos/policy/power_policy_browsertest.cc',
'browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc',
+ 'browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc',
'browser/chromeos/policy/variations_service_policy_browsertest.cc',
'browser/chromeos/power/peripheral_battery_observer_browsertest.cc',
'browser/chromeos/preferences_browsertest.cc',
'browser/content_settings/content_settings_browsertest.cc',
'browser/crash_recovery_browsertest.cc',
'browser/custom_handlers/protocol_handler_registry_browsertest.cc',
- 'browser/devtools/adb_client_socket_browsertest.cc',
- 'browser/devtools/devtools_adb_bridge_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',
+ 'browser/devtools/device/port_forwarding_browsertest.cc',
+ 'browser/devtools/device/usb/android_usb_browsertest.cc',
+ 'browser/devtools/devtools_window_testing.cc',
+ 'browser/devtools/devtools_window_testing.h',
'browser/devtools/devtools_sanity_browsertest.cc',
'browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc',
+ 'browser/dom_distiller/tab_utils_browsertest.cc',
'browser/do_not_track_browsertest.cc',
'browser/download/download_browsertest.cc',
'browser/download/download_browsertest.h',
'browser/download/download_started_animation_browsertest.cc',
'browser/download/save_page_browsertest.cc',
'browser/errorpage_browsertest.cc',
+ 'browser/extensions/active_script_controller_browsertest.cc',
'browser/extensions/active_tab_apitest.cc',
'browser/extensions/activity_log/activity_log_browsertest.cc',
+ 'browser/extensions/activity_log/ad_injection_browsertest.cc',
'browser/extensions/activity_log/uma_policy_browsertest.cc',
'browser/extensions/alert_apitest.cc',
'browser/extensions/all_urls_apitest.cc',
'browser/extensions/api/activity_log_private/activity_log_private_apitest.cc',
- 'browser/extensions/api/app_window/app_window_apitest.cc',
'browser/extensions/api/audio/audio_apitest.cc',
'browser/extensions/api/automation/automation_apitest.cc',
'browser/extensions/api/autotest_private/autotest_private_apitest.cc',
- 'browser/extensions/api/bluetooth/bluetooth_apitest.cc',
'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc',
'browser/extensions/api/braille_display_private/braille_display_private_apitest.cc',
'browser/extensions/api/braille_display_private/mock_braille_controller.cc',
'browser/extensions/api/braille_display_private/mock_braille_controller.h',
+ 'browser/extensions/api/browser/browser_apitest.cc',
'browser/extensions/api/bookmarks/bookmark_apitest.cc',
'browser/extensions/api/browsing_data/browsing_data_test.cc',
- 'browser/extensions/api/cast_channel/cast_channel_apitest.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/debugger/debugger_extension_apitest.cc',
'browser/extensions/api/declarative/declarative_apitest.cc',
'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/desktop_capture/desktop_capture_apitest.cc',
'browser/extensions/api/developer_private/developer_private_apitest.cc',
'browser/extensions/api/dial/dial_apitest.cc',
- 'browser/extensions/api/dns/dns_apitest.cc',
- 'browser/extensions/api/dns/mock_host_resolver_creator.cc',
- 'browser/extensions/api/dns/mock_host_resolver_creator.h',
'browser/extensions/api/downloads/downloads_api_browsertest.cc',
+ 'browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc',
'browser/extensions/api/extension_action/browser_action_apitest.cc',
'browser/extensions/api/extension_action/browser_action_browsertest.cc',
'browser/extensions/api/extension_action/page_action_apitest.cc',
'browser/extensions/api/file_system/file_system_apitest_chromeos.cc',
'browser/extensions/api/font_settings/font_settings_apitest.cc',
'browser/extensions/api/gcm/gcm_apitest.cc',
+ 'browser/extensions/api/gcd_private/gcd_private_apitest.cc',
'browser/extensions/api/history/history_apitest.cc',
'browser/extensions/api/hotword_private/hotword_private_apitest.cc',
'browser/extensions/api/i18n/i18n_apitest.cc',
'browser/extensions/api/identity/identity_apitest.cc',
'browser/extensions/api/idle/idle_apitest.cc',
'browser/extensions/api/idltest/idltest_apitest.cc',
+ 'browser/extensions/api/image_writer_private/image_writer_private_apitest.cc',
+ 'browser/extensions/api/image_writer_private/test_utils.cc',
'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
+ 'browser/extensions/api/log_private/log_private_apitest_chromeos.cc',
'browser/extensions/api/management/management_api_browsertest.cc',
'browser/extensions/api/management/management_apitest.cc',
'browser/extensions/api/management/management_browsertest.cc',
'browser/extensions/api/mdns/mdns_apitest.cc',
'browser/extensions/api/media_galleries/media_galleries_apitest.cc',
+ 'browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc',
'browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc',
'browser/extensions/api/messaging/native_messaging_apitest.cc',
'browser/extensions/api/metrics_private/metrics_apitest.cc',
'browser/extensions/api/module/module_apitest.cc',
'browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc',
+ 'browser/extensions/api/notification_provider/notification_provider_apitest.cc',
'browser/extensions/api/notifications/notifications_apitest.cc',
'browser/extensions/api/omnibox/omnibox_api_browsertest.cc',
'browser/extensions/api/page_capture/page_capture_apitest.cc',
'browser/extensions/api/push_messaging/push_messaging_canary_test.cc',
'browser/extensions/api/push_messaging/sync_setup_helper.cc',
'browser/extensions/api/reading_list_private/reading_list_private_apitest.cc',
- 'browser/extensions/api/runtime/runtime_apitest.cc',
- 'browser/extensions/api/serial/serial_apitest.cc',
+ 'browser/extensions/api/screenlock_private/screenlock_private_apitest.cc',
'browser/extensions/api/sessions/sessions_apitest.cc',
'browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc',
'browser/extensions/api/socket/socket_apitest.cc',
'browser/extensions/api/sockets_udp/sockets_udp_apitest.cc',
'browser/extensions/api/storage/settings_apitest.cc',
'browser/extensions/api/streams_private/streams_private_apitest.cc',
+ 'browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc',
'browser/extensions/api/sync_file_system/sync_file_system_apitest.cc',
'browser/extensions/api/system_indicator/system_indicator_apitest.cc',
'browser/extensions/api/system_cpu/system_cpu_apitest.cc',
'browser/extensions/api/terminal/terminal_private_apitest.cc',
'browser/extensions/api/test/apitest_apitest.cc',
'browser/extensions/api/top_sites/top_sites_apitest.cc',
- 'browser/extensions/api/usb/usb_apitest.cc',
- 'browser/extensions/api/usb/usb_manual_apitest.cc',
'browser/extensions/api/web_navigation/web_navigation_apitest.cc',
'browser/extensions/api/web_request/web_request_apitest.cc',
'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc',
'browser/extensions/browsertest_util.h',
'browser/extensions/browsertest_util_browsertest.cc',
'browser/extensions/chrome_app_api_browsertest.cc',
+ 'browser/extensions/chrome_ui_overrides_browsertest.cc',
+ 'browser/extensions/content_verifier_browsertest.cc',
'browser/extensions/content_script_apitest.cc',
'browser/extensions/content_security_policy_apitest.cc',
'browser/extensions/convert_web_app_browsertest.cc',
'browser/extensions/extension_resource_request_policy_apitest.cc',
'browser/extensions/extension_startup_browsertest.cc',
'browser/extensions/extension_storage_apitest.cc',
+ 'browser/extensions/extension_storage_monitor_browsertest.cc',
'browser/extensions/extension_tabs_apitest.cc',
- 'browser/extensions/extension_toolbar_model_browsertest.cc',
'browser/extensions/extension_url_rewrite_browsertest.cc',
'browser/extensions/extension_view_host_factory_browsertest.cc',
'browser/extensions/extension_websocket_apitest.cc',
+ 'browser/extensions/extension_webui_apitest.cc',
'browser/extensions/gpu_browsertest.cc',
'browser/extensions/isolated_app_browsertest.cc',
'browser/extensions/lazy_background_page_apitest.cc',
'browser/extensions/webstore_inline_installer_browsertest.cc',
'browser/extensions/webstore_installer_test.cc',
'browser/extensions/webstore_installer_test.h',
+ 'browser/extensions/webstore_reinstaller_browsertest.cc',
'browser/extensions/webstore_startup_installer_browsertest.cc',
'browser/extensions/window_open_apitest.cc',
'browser/external_extension_browsertest.cc',
'browser/geolocation/access_token_store_browsertest.cc',
'browser/geolocation/geolocation_browsertest.cc',
'browser/history/history_browsertest.cc',
- 'browser/history/multipart_browsertest.cc',
'browser/history/redirect_browsertest.cc',
'browser/iframe_browsertest.cc',
'browser/importer/firefox_importer_browsertest.cc',
'browser/importer/importer_unittest_utils.h',
'browser/infobars/infobar_extension_apitest.cc',
'browser/infobars/infobars_browsertest.cc',
+ 'browser/invalidation/profile_invalidation_provider_factory_browsertest.cc',
'browser/lifetime/browser_close_manager_browsertest.cc',
'browser/loadtimes_extension_bindings_browsertest.cc',
'browser/locale_tests_browsertest.cc',
- 'browser/managed_mode/managed_mode_browsertest.cc',
- 'browser/managed_mode/managed_mode_resource_throttle_browsertest.cc',
- 'browser/managed_mode/managed_user_service_browsertest.cc',
+ 'browser/supervised_user/supervised_user_browsertest.cc',
+ 'browser/supervised_user/supervised_user_resource_throttle_browsertest.cc',
+ 'browser/supervised_user/supervised_user_service_browsertest.cc',
'browser/media/encrypted_media_browsertest.cc',
'browser/media/media_browsertest.cc',
'browser/media/media_browsertest.h',
'browser/media/chrome_media_stream_infobar_browsertest.cc',
'browser/media/chrome_webrtc_apprtc_browsertest.cc',
+ 'browser/media/chrome_webrtc_audio_quality_browsertest.cc',
'browser/media/chrome_webrtc_browsertest.cc',
'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc',
- 'browser/media/chrome_webrtc_audio_quality_browsertest.cc',
+ 'browser/media/chrome_webrtc_getmediadevices_browsertest.cc',
+ 'browser/media/chrome_webrtc_perf_browsertest.cc',
'browser/media/chrome_webrtc_typing_detection_browsertest.cc',
'browser/media/chrome_webrtc_video_quality_browsertest.cc',
+ 'browser/media/chrome_webrtc_webcam_browsertest.cc',
'browser/media/encrypted_media_istypesupported_browsertest.cc',
'browser/media/test_license_server.cc',
'browser/media/test_license_server.h',
'browser/net/nss_context_chromeos_browsertest.cc',
'browser/net/predictor_browsertest.cc',
'browser/net/proxy_browsertest.cc',
+ 'browser/net/sdch_browsertest.cc',
'browser/net/websocket_browsertest.cc',
'browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc',
'browser/notifications/message_center_notifications_browsertest.cc',
- 'browser/notifications/sync_notifier/sync_notifier_test_utils.cc',
- 'browser/notifications/sync_notifier/sync_notifier_test_utils.h',
'browser/password_manager/password_manager_browsertest.cc',
- 'browser/performance_monitor/performance_monitor_browsertest.cc',
+ 'browser/plugins/npapi_infobar_browsertest.cc',
'browser/policy/cloud/cloud_policy_browsertest.cc',
'browser/policy/cloud/cloud_policy_manager_browsertest.cc',
'browser/policy/cloud/component_cloud_policy_browsertest.cc',
'browser/policy/cloud/test_request_interceptor.h',
'browser/policy/policy_browsertest.cc',
'browser/policy/policy_prefs_browsertest.cc',
+ 'browser/plugins/npapi_infobar_browsertest.cc',
'browser/prefetch/prefetch_browsertest.cc',
'browser/prefs/pref_functional_browsertest.cc',
- 'browser/prefs/pref_hash_browsertest.cc',
'browser/prefs/pref_service_browsertest.cc',
'browser/prefs/synced_pref_change_registrar_browsertest.cc',
+ 'browser/prefs/tracked/pref_hash_browsertest.cc',
'browser/prerender/prerender_browsertest.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_preview_dialog_controller_browsertest.cc',
- 'browser/printing/printing_layout_browsertest.cc',
+ 'browser/printing/print_preview_pdf_generated_browsertest.cc',
'browser/process_singleton_browsertest.cc',
+ 'browser/profiles/host_zoom_map_browsertest.cc',
'browser/profiles/profile_browsertest.cc',
'browser/profiles/profile_list_desktop_browsertest.cc',
'browser/profiles/profile_manager_browsertest.cc',
'browser/renderer_context_menu/render_view_context_menu_test_util.h',
'browser/renderer_context_menu/spellchecker_submenu_observer_browsertest.cc',
'browser/renderer_context_menu/spelling_menu_observer_browsertest.cc',
+ 'browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc',
'browser/renderer_host/render_process_host_chrome_browsertest.cc',
- 'browser/renderer_host/web_cache_manager_browsertest.cc',
'browser/repost_form_warning_browsertest.cc',
+ 'browser/resources/pdf/pdf_extension_test.cc',
'browser/safe_browsing/local_safebrowsing_test_server.cc',
'browser/safe_browsing/safe_browsing_blocking_page_test.cc',
'browser/safe_browsing/safe_browsing_service_browsertest.cc',
'browser/safe_browsing/safe_browsing_test.cc',
+ 'browser/search/suggestions/image_manager_impl_browsertest.cc',
'browser/service_process/service_process_control_browsertest.cc',
'browser/services/gcm/fake_gcm_profile_service.cc',
'browser/services/gcm/fake_gcm_profile_service.h',
'browser/sessions/better_session_restore_browsertest.cc',
'browser/sessions/persistent_tab_restore_service_browsertest.cc',
'browser/sessions/session_restore_browsertest.cc',
+ 'browser/sessions/session_restore_browsertest_chromeos.cc',
'browser/sessions/tab_restore_browsertest.cc',
+ 'browser/signin/easy_unlock_service_browsertest_chromeos.cc',
'browser/signin/signin_browsertest.cc',
'browser/speech/extension_api/tts_extension_apitest.cc',
- 'browser/speech/speech_recognition_bubble_browsertest.cc',
'browser/spellchecker/spellcheck_service_browsertest.cc',
+ 'browser/ssl/chrome_ssl_host_state_delegate_test.cc',
'browser/ssl/ssl_browser_tests.cc',
'browser/ssl/ssl_client_certificate_selector_test.cc',
'browser/ssl/ssl_client_certificate_selector_test.h',
'browser/task_manager/task_manager_browsertest.cc',
'browser/task_manager/task_manager_browsertest_util.cc',
'browser/task_manager/task_manager_browsertest_util.h',
- 'browser/task_manager/task_manager_notification_browsertest.cc',
'browser/themes/theme_service_browsertest.cc',
'browser/translate/translate_browsertest.cc',
+ 'browser/translate/cld_data_harness.cc',
+ 'browser/translate/cld_data_harness.h',
'browser/translate/translate_manager_browsertest.cc',
'browser/ui/app_list/app_list_controller_browsertest.cc',
+ 'browser/ui/app_list/app_list_service_impl_browsertest.cc',
+ 'browser/ui/app_list/app_list_service_views_browsertest.cc',
'browser/ui/app_list/search/people/people_provider_browsertest.cc',
'browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc',
'browser/ui/ash/accelerator_commands_browsertest.cc',
'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
+ 'browser/ui/ash/keyboard_controller_browsertest.cc',
'browser/ui/ash/shelf_browsertest.cc',
'browser/ui/ash/volume_controller_browsertest_chromeos.cc',
'browser/ui/autofill/autofill_dialog_controller_browsertest.cc',
'browser/ui/autofill/autofill_dialog_view_tester.h',
'browser/ui/autofill/mock_address_validator.cc',
'browser/ui/autofill/mock_address_validator.h',
+ 'browser/ui/autofill/password_generation_popup_view_browsertest.cc',
+ 'browser/ui/autofill/password_generation_popup_view_tester.h',
'browser/ui/autofill/test_generated_credit_card_bubble_view.cc',
'browser/ui/autofill/test_generated_credit_card_bubble_view.h',
'browser/ui/autofill/test_generated_credit_card_bubble_controller.cc',
'browser/ui/browser_navigator_browsertest.cc',
'browser/ui/browser_navigator_browsertest.h',
'browser/ui/browser_navigator_browsertest_chromeos.cc',
+ 'browser/ui/browser_tabrestore_browsertest.cc',
'browser/ui/cocoa/accelerators_cocoa_browsertest.mm',
'browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm',
'browser/ui/cocoa/applescript/window_applescript_test.mm',
'browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm',
'browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.mm',
'browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h',
- 'browser/ui/cocoa/browser_window_cocoa_browsertest.mm',
'browser/ui/cocoa/browser_window_controller_browsertest.mm',
'browser/ui/cocoa/certificate_viewer_mac_browsertest.mm',
'browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm',
'browser/ui/cocoa/omnibox/omnibox_view_mac_browsertest.mm',
'browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm',
'browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm',
- 'browser/ui/cocoa/profile_signin_confirmation_view_controller_browsertest.mm',
+ 'browser/ui/cocoa/passwords/manage_passwords_bubble_browsertest.mm',
+ 'browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm',
'browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm',
'browser/ui/cocoa/view_id_util_browsertest.mm',
+ 'browser/ui/content_settings/content_setting_bubble_model_browsertest.cc',
'browser/ui/find_bar/find_bar_host_browsertest.cc',
'browser/ui/fullscreen/fullscreen_controller_browsertest.cc',
'browser/ui/global_error/global_error_service_browsertest.cc',
- 'browser/ui/gtk/bubble/bubble_gtk_browsertest.cc',
- 'browser/ui/gtk/confirm_bubble_gtk_browsertest.cc',
- 'browser/ui/gtk/location_bar_view_gtk_browsertest.cc',
- 'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc',
- 'browser/ui/gtk/view_id_util_browsertest.cc',
'browser/ui/login/login_prompt_browsertest.cc',
+ 'browser/ui/location_bar/location_bar_browsertest.cc',
'browser/ui/panels/panel_extension_browsertest.cc',
+ 'browser/ui/passwords/manage_passwords_test.cc',
'browser/ui/pdf/pdf_browsertest.cc',
'browser/ui/prefs/prefs_tab_helper_browsertest.cc',
+ 'browser/ui/settings_window_manager_browsertest.cc',
'browser/ui/startup/startup_browser_creator_browsertest.cc',
'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.cc',
'browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc',
'browser/ui/tab_modal_confirm_dialog_browsertest.h',
'browser/ui/toolbar/test_toolbar_model.cc',
'browser/ui/toolbar/test_toolbar_model.h',
- 'browser/ui/views/avatar_menu_button_browsertest.cc',
'browser/ui/views/autofill/autofill_dialog_view_tester_views.cc',
'browser/ui/views/autofill/autofill_dialog_view_tester_views.h',
'browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc',
+ 'browser/ui/views/autofill/password_generation_popup_view_tester_views.cc',
+ 'browser/ui/views/autofill/password_generation_popup_view_tester_views.h',
+ 'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc',
+ 'browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc',
'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
'browser/ui/views/frame/browser_view_browsertest.cc',
'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc',
'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
- 'browser/ui/views/new_avatar_menu_button_browsertest.cc',
+ 'browser/ui/views/profiles/avatar_menu_button_browsertest.cc',
+ 'browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc',
+ 'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
'browser/ui/views/select_file_dialog_extension_browsertest.cc',
'browser/ui/views/toolbar/browser_actions_container_browsertest.cc',
'browser/ui/views/toolbar/toolbar_view_browsertest.cc',
'browser/ui/webui/bidi_checker_web_ui_test.h',
'browser/ui/webui/bookmarks_ui_browsertest.cc',
'browser/ui/webui/chrome_url_data_manager_browsertest.cc',
+ 'browser/ui/webui/chromeos/set_time_ui_browsertest.js',
'browser/ui/webui/constrained_web_dialog_ui_browsertest.cc',
'browser/ui/webui/downloads_dom_handler_browsertest.cc',
'browser/ui/webui/downloads_ui_browsertest.cc',
'browser/ui/webui/identity_internals_ui_browsertest.h',
'browser/ui/webui/identity_internals_ui_browsertest.js',
'browser/ui/webui/inspect_ui_browsertest.cc',
+ 'browser/ui/webui/interstitials/interstitial_ui_browsertest.cc',
'browser/ui/webui/net_internals/net_internals_ui_browsertest.cc',
'browser/ui/webui/net_internals/net_internals_ui_browsertest.h',
'browser/ui/webui/ntp/most_visited_browsertest.cc',
'browser/ui/webui/options/browser_options_browsertest.js',
'browser/ui/webui/options/certificate_manager_browsertest.cc',
'browser/ui/webui/options/certificate_manager_browsertest.js',
+ 'browser/ui/webui/options/clear_browser_data_browsertest.cc',
'browser/ui/webui/options/chromeos/accounts_options_browsertest.cc',
'browser/ui/webui/options/chromeos/accounts_options_browsertest.js',
'browser/ui/webui/options/chromeos/bluetooth_options_browsertest.js',
+ 'browser/ui/webui/options/chromeos/date_time_options_browsertest.js',
'browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc',
'browser/ui/webui/options/chromeos/shared_options_browsertest.cc',
'browser/ui/webui/options/content_options_browsertest.js',
'browser/ui/webui/options/settings_app_browsertest.js',
'browser/ui/webui/options/settings_format_browsertest.js',
'browser/ui/webui/options/startup_page_list_browsertest.js',
+ 'browser/ui/webui/options/website_settings_browsertest.js',
'browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc',
'browser/ui/webui/policy_ui_browsertest.cc',
'browser/ui/webui/print_preview/print_preview_ui_browsertest.cc',
'browser/ui/webui/sync_setup_browsertest.js',
'browser/ui/webui/web_ui_test_handler.cc',
'browser/ui/webui/web_ui_test_handler.h',
+ 'browser/ui/zoom/zoom_controller_browsertest.cc',
'browser/unload_browsertest.cc',
+ 'common/mac/app_mode_chrome_locator_browsertest.mm',
'common/mac/mock_launchd.cc',
'common/mac/mock_launchd.h',
'common/time_format_browsertest.cc',
'test/base/browser_tests_main.cc',
'test/base/chrome_render_view_test.cc',
'test/base/chrome_render_view_test.h',
- 'test/base/web_ui_browsertest.cc',
- 'test/base/web_ui_browsertest.h',
+ 'test/base/web_ui_browser_test.cc',
+ 'test/base/web_ui_browser_test.h',
+ 'test/base/web_ui_browser_test_browsertest.cc',
'test/base/in_process_browser_test_browsertest.cc',
+ 'test/base/javascript_browser_test.cc',
+ 'test/base/javascript_browser_test.h',
'test/base/tracing_browsertest.cc',
'test/base/test_chrome_web_ui_controller_factory.cc',
'test/base/test_chrome_web_ui_controller_factory.h',
'test/data/webui/history_ui_browsertest.h',
'test/data/webui/mock4js_browsertest.js',
'test/data/webui/net_internals/bandwidth_view.js',
+ 'test/data/webui/net_internals/chromeos_view.js',
'test/data/webui/net_internals/dns_view.js',
'test/data/webui/net_internals/events_view.js',
'test/data/webui/net_internals/hsts_view.js',
- 'test/data/webui/net_internals/http_pipeline_view.js',
'test/data/webui/net_internals/log_util.js',
'test/data/webui/net_internals/log_view_painter.js',
'test/data/webui/net_internals/main.js',
'test/data/webui/print_preview.js',
'test/data/webui/sandboxstatus_browsertest.js',
'test/data/webui/webui_resource_browsertest.cc',
- 'test/gpu/gpu_feature_browsertest.cc',
'test/gpu/webgl_infobar_browsertest.cc',
'test/ppapi/ppapi_browsertest.cc',
'test/remoting/auth_browsertest.cc',
- 'test/remoting/launch_browsertest.cc',
+ 'test/remoting/fullscreen_browsertest.cc',
'test/remoting/key_code_conv.cc',
'test/remoting/key_code_conv.h',
'test/remoting/key_code_map.h',
+ 'test/remoting/launch_browsertest.cc',
'test/remoting/me2me_browsertest.cc',
'test/remoting/page_load_notification_observer.cc',
'test/remoting/page_load_notification_observer.h',
+ 'test/remoting/pin_browsertest.cc',
+ 'test/remoting/qunit_browser_test_runner.cc',
'test/remoting/remote_desktop_browsertest.cc',
'test/remoting/remote_desktop_browsertest.h',
+ 'test/remoting/scrollbar_browsertest.cc',
'test/remoting/waiter.cc',
'test/remoting/waiter.h',
- 'test/security_tests/sandbox_browsertest_linux.cc',
- 'test/security_tests/sandbox_browsertest_win.cc',
+ 'test/remoting/webapp_javascript_unittest.cc',
# TODO(craig): Rename this and run from base_unittests when the test
# is safe to run there. See http://crbug.com/78722 for details.
'../base/files/file_path_watcher_browsertest.cc',
'<(gypv8sh)',
'<(PRODUCT_DIR)/d8<(EXECUTABLE_SUFFIX)',
'<(mock_js)',
- '<(accessibility_audit_js)',
'<(test_api_js)',
'<(js2gtest)',
],
},
},
'conditions': [
+ ['cld2_data_source=="component"', {
+ 'sources': [
+ 'browser/translate/component_cld_data_harness.cc',
+ 'browser/translate/component_cld_data_harness.h',
+ ]},
+ ],
+ ['cld2_data_source=="standalone"', {
+ 'sources': [
+ 'browser/translate/standalone_cld_data_harness.cc',
+ 'browser/translate/standalone_cld_data_harness.h',
+ ]},
+ ],
+ ['cld2_data_source=="static"', {
+ 'sources': [
+ 'browser/translate/static_cld_data_harness.cc',
+ 'browser/translate/static_cld_data_harness.h',
+ ]},
+ ],
['enable_one_click_signin==0', {
'sources!': [
- 'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc',
'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.cc',
]
}],
- [ 'OS == "android"', {
- 'sources!': [
- 'browser/autofill/risk/fingerprint_browsertest.cc',
- ]
- }],
['enable_autofill_dialog==0', {
'sources!': [
'browser/ui/autofill/autofill_dialog_controller_browsertest.cc',
],
'dependencies': [
# Runtime dependency.
- '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome',
+ '../ppapi/native_client/src/trusted/plugin/plugin.gyp:nacl_trusted_plugin',
],
'conditions': [
['disable_nacl_untrusted==0', {
'../ppapi/native_client/native_client.gyp:nacl_irt',
'../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests',
'../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_background_keepalive',
- '../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_socket'
+ '../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_media_galleries',
],
'conditions': [
['chromeos==1', {
['exclude', '^browser/ui/webui/options/chromeos/'],
],
'sources!': [
+ 'browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc',
'browser/extensions/api/terminal/terminal_private_apitest.cc',
+ 'browser/invalidation/profile_invalidation_provider_factory_browsertest.cc',
'browser/net/nss_context_chromeos_browsertest.cc',
'browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc',
+ 'browser/ui/ash/keyboard_controller_browsertest.cc',
'browser/ui/views/select_file_dialog_extension_browsertest.cc',
'test/data/webui/certificate_viewer_dialog_test.js',
'test/data/webui/certificate_viewer_ui_test-inl.h',
'../apps/load_and_launch_browsertest.cc',
'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc',
+ # chromeos does not support profile list avatar menu
+ 'browser/profiles/profile_list_desktop_browsertest.cc',
'browser/service_process/service_process_control_browsertest.cc',
'browser/signin/signin_browsertest.cc',
# chromeos does not use cross-platform panels
'dependencies': [
'../dbus/dbus.gyp:dbus_test_support',
'../build/linux/system.gyp:dbus',
+ '../ui/login/login.gyp:login_resources',
],
}],
['configuration_policy==0', {
'browser/ui/webui/policy_ui_browsertest.cc',
],
}],
- ['input_speech==0', {
+ ['enable_web_speech==0', {
'sources/': [
['exclude', '^browser/speech/'],
['exclude', '^../content/browser/speech/'],
['exclude', '^browser/captive_portal/'],
],
}],
- ['internal_pdf', {
- 'dependencies': [
- '../pdf/pdf.gyp:pdf',
- ],
- }],
- ['OS!="linux" or toolkit_views==1', {
- 'sources!': [
- 'browser/ui/gtk/view_id_util_browsertest.cc',
- ],
- }],
['enable_webrtc==0', {
'sources!': [
'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc',
'browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc',
'browser/media/chrome_webrtc_browsertest.cc',
'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc',
- ],
+ 'browser/media/chrome_webrtc_getmediadevices_browsertest.cc',
+ ],
}],
['OS=="win"', {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
- 'browser_tests_exe_pdb_workaround',
'chrome_version_resources',
- 'security_tests', # run time dependency
],
'conditions': [
['win_use_allocator_shim==1', {
],
}],
],
- 'sources!': [
- # use_aura currently sets use_ash on Windows. So take these tests out
- # for win aura builds.
- # TODO: enable these for win_ash browser tests.
- 'browser/chromeos/system/tray_accessibility_browsertest.cc',
- 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
- 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
- 'browser/ui/ash/shelf_browsertest.cc',
- 'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc',
- 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
- ],
}, { # else: OS != "win"
'sources!': [
'app/chrome_command_ids.h',
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
'app/chrome_version.rc.version',
- # TODO(port): http://crbug.com/45770
- 'browser/printing/printing_layout_browsertest.cc',
],
}],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
+ ['chromeos==0 and use_aura==1', {
+ 'sources!': [
+ # On Windows and Linux, we currently don't support enough of the
+ # ash environment to run these unit tests.
+ #
+ # TODO: enable these on windows and linux.
+ 'browser/chromeos/system/tray_accessibility_browsertest.cc',
+ 'browser/ui/ash/accelerator_commands_browsertest.cc',
+ 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
+ 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
+ 'browser/ui/ash/shelf_browsertest.cc',
+ 'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc',
+ 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
],
}],
- ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+ ['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:ssl',
],
# chrome_resources.gyp:{packed_extra_resources,packed_resources},
# and can build this target standalone much faster.
'dependencies': [
+ 'app_mode_app_support',
'chrome',
'../components/components.gyp:breakpad_stubs',
+ '../third_party/ocmock/ocmock.gyp:ocmock',
],
'sources': [
+ 'browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc',
'browser/renderer_host/chrome_render_widget_host_view_mac_delegate_browsertest.cc',
+ 'browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm',
'browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc',
],
'sources!': [
# TODO(groby): This test depends on hunspell and we cannot run it on
# Mac, which does not use hunspell by default.
'browser/spellchecker/spellcheck_service_browsertest.cc',
+
+ # TODO(tapted): Enable toolkit-views browser_tests on Mac when their
+ # respective implementations are linked in. http://crbug.com/404979.
+ 'browser/ui/views/autofill/autofill_dialog_view_tester_views.cc',
+ 'browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc',
+ 'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc',
+ 'browser/ui/views/frame/browser_view_browsertest.cc',
+ 'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
+ 'browser/ui/views/profiles/avatar_menu_button_browsertest.cc',
+ 'browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc',
+ 'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
+ 'browser/ui/views/toolbar/browser_actions_container_browsertest.cc',
+ 'browser/ui/views/translate/translate_bubble_view_browsertest.cc',
+
# TODO(rouslan): This test depends on the custom dictionary UI,
# which is disabled on Mac.
'browser/ui/webui/options/edit_dictionary_browsertest.js',
'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc',
'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc',
],
- }],
+ }], # OS=="mac"
['OS=="mac" or OS=="win"', {
'sources': [
'browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc',
'browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc',
],
}],
- ['OS=="mac"', {
- 'sources': [
- 'browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc',
- ],
- }],
['os_posix == 0 or chromeos == 1', {
'sources!': [
'common/time_format_browsertest.cc',
}],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'conditions': [
- # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
+ ['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}],
+ ['OS=="win" or OS == "mac"', {
+ 'dependencies': [
+ '../components/components.gyp:wifi_test_support',
+ ],
+ }],
['chromeos == 1 or OS=="win" or OS == "mac"', {
'sources': [
'browser/extensions/api/networking_private/networking_private_apitest.cc',
],
}],
['OS!="android" and OS!="ios"', {
+ 'sources': [
+ 'browser/copresence/chrome_whispernet_client_browsertest.cc',
+ ],
+ 'dependencies': [
+ '../components/components.gyp:copresence',
+ # build time dependency.
+ '../v8/src/d8.gyp:d8#host',
+ ],
+ }],
+ ['OS!="android" and OS!="ios" and OS!="linux"', {
# npapi test plugin doesn't build on android or ios
'dependencies': [
# build time dependency.
'../content/content_shell_and_tests.gyp:copy_npapi_test_plugin',
- '../v8/src/d8.gyp:d8#host',
],
}],
['enable_app_list==0', {
'sources/': [
+ ['exclude', '^browser/apps/drive/'],
['exclude', '^browser/ui/app_list/'],
['exclude', '^browser/ui/webui/app_list/'],
],
'sources/': [
['exclude', '^browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc'],
['exclude', '^browser/printing/cloud_print/test/.*'],
- ['exclude', '^browser/printing/printing_layout_browsertest.cc'],
['exclude', '^browser/printing/print_preview_dialog_controller_browsertest.cc'],
+ ['exclude', '^browser/printing/print_preview_pdf_generated_browsertest.cc'],
+ ['exclude', '^browser/service_process/service_process_control_browsertest.cc'],
['exclude', '^browser/ui/webui/print_preview/print_preview_ui_browsertest.cc'],
- ['exclude', '^renderer/printing/print_web_view_helper_browsertest.cc'],
['exclude', '^test/data/webui/print_preview.cc'],
['exclude', '^test/data/webui/print_preview.h'],
['exclude', '^test/data/webui/print_preview.js'],
],
}],
+ ['enable_printing==0', {
+ 'sources/': [
+ ['exclude', '^renderer/printing/print_web_view_helper_browsertest.cc'],
+ ],
+ }],
['enable_mdns==1', {
'sources' : [
'browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc',
]
}],
['enable_autofill_dialog!=1 or OS=="android" or OS=="ios"', {
- '!dependencies': [
+ 'dependencies!': [
'../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
],
}],
+ ['use_ozone==1', {
+ 'sources!': [
+ # crbug.com/362698
+ 'browser/chromeos/input_method/input_method_engine_browsertests.cc',
+ 'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
+ ],
+ }],
+ ['remoting==1', {
+ 'dependencies': [
+ '../remoting/remoting.gyp:remoting_webapp',
+ ]
+ }, {
+ 'sources/': [
+ ['exclude', '^test/remoting'],
+ ],
+ }],
+ ['use_x11==1', {
+ 'dependencies': [
+ '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+ ],
+ }],
], # conditions
}, # target browser_tests
{
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
- '../media/cast/test/utility/utility.gyp:cast_test_utility',
+ '../media/cast/cast.gyp:cast_test_utility',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'<(gypv8sh)',
'<(PRODUCT_DIR)/d8<(EXECUTABLE_SUFFIX)',
'<(mock_js)',
- '<(accessibility_audit_js)',
'<(test_api_js)',
'<(js2gtest)',
],
['OS=="win"', {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
'dependencies': [
'chrome_version_resources',
],
- 'msvs_large_pdb': 1,
'conditions': [
['win_use_allocator_shim==1', {
'dependencies': [
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
- ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+ ['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:ssl',
],
}],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'conditions': [
- # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
+ ['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
], # conditions
}, # target performance_browser_tests
{
- 'target_name': 'performance_ui_tests',
- 'type': 'executable',
- 'dependencies': [
- 'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
- 'debugger',
- 'test/perf/perf_test.gyp:*',
- 'test_support_common',
- 'test_support_ui',
- '../base/base.gyp:base',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
- '../testing/perf/perf_test.gyp:*',
- ],
- 'sources': [
- # TODO(darin): Move other UIPerfTests here.
- 'test/perf/dom_checker_uitest.cc',
- 'test/perf/feature_startup_test.cc',
- 'test/perf/frame_rate/frame_rate_tests.cc',
- 'test/perf/generate_profile.cc',
- 'test/perf/generate_profile.h',
- 'test/perf/memory_test.cc',
- 'test/perf/perf_ui_test_suite.cc',
- 'test/perf/run_all_perfuitests.cc',
- 'test/perf/shutdown_test.cc',
- 'test/perf/startup_test.cc',
- 'test/perf/tab_switching_test.cc',
- ],
- 'conditions': [
- ['OS=="win" and buildtype=="Official"', {
- 'configurations': {
- 'Release': {
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'WholeProgramOptimization': 'false',
- },
- },
- },
- },
- }],
- ['OS=="win"', {
- 'conditions': [
- ['win_use_allocator_shim==1', {
- 'dependencies': [
- '<(allocator_target)',
- ],
- }],
- ],
- 'msvs_large_pdb': 1,
- 'configurations': {
- 'Debug_Base': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
- },
- },
- },
- },
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- 'msvs_disabled_warnings': [ 4267, ],
- }],
- ['OS=="mac"', {
- 'sources': [
- 'test/perf/mach_ports_test.cc',
- ],
- }],
- ['use_x11==1', {
- 'dependencies': [
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
- ],
- }],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
- ['os_posix == 1 and OS != "mac" and OS != "android"', {
- 'conditions': [
- # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
- 'dependencies': [
- '../base/allocator/allocator.gyp:allocator',
- ],
- }],
- ],
- }],
- ['toolkit_views==1', {
- 'dependencies': [
- '../ui/views/views.gyp:views',
- ],
- }],
- ],
- },
- {
'target_name': 'test_support_sync_integration',
'type': 'static_library',
'dependencies': [
'chrome',
'test_support_common',
'../base/base.gyp:base',
+ '../components/components.gyp:invalidation',
+ '../components/components.gyp:invalidation_test_support',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../sync/sync.gyp:sync',
'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/migration_waiter.cc',
+ 'browser/sync/test/integration/migration_waiter.h',
+ 'browser/sync/test/integration/migration_watcher.cc',
+ 'browser/sync/test/integration/migration_watcher.h',
+ 'browser/sync/test/integration/multi_client_status_change_checker.cc',
+ 'browser/sync/test/integration/multi_client_status_change_checker.h',
'browser/sync/test/integration/passwords_helper.cc',
'browser/sync/test/integration/passwords_helper.h',
'browser/sync/test/integration/p2p_invalidation_forwarder.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',
'chrome_resources.gyp:packed_resources',
'common',
'renderer',
+ 'test_support_common',
'test_support_sync_integration',
'../sync/sync.gyp:sync',
'../testing/gmock.gyp:gmock',
'browser/sync/test/integration/sessions_helper.h',
'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_backup_rollback_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_extensions_sync_test.cc',
- 'browser/sync/test/integration/single_client_managed_user_settings_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_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/sync_auth_test.cc',
'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
],
'conditions': [
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
- ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+ ['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:ssl',
],
],
}],
['OS=="win"', {
- 'msvs_large_pdb': 1,
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
'test/data/resource.rc',
],
'conditions': [
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
- ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', {
+ ['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:ssl',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
],
- 'msvs_large_pdb': 1,
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
],
],
},
{
- # Documentation: http://dev.chromium.org/developers/testing/pyauto
- # Deprecated. Do not add additional dependencies.
- 'target_name': 'pyautolib',
- 'variables': {
- 'conditions': [
- ['enable_automation==1 and OS=="linux"', {
- 'python_arch': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
- }],
- ],
- },
- 'conditions': [
- ['enable_automation==1 and OS=="linux" and target_arch==python_arch', {
- 'type': 'loadable_module',
- 'product_prefix': '_',
- 'dependencies': [
- 'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
- 'chrome_resources.gyp:theme_resources',
- 'debugger',
- 'test_support_common',
- '../skia/skia.gyp:skia',
- '../sync/sync.gyp:sync',
- '../testing/gtest.gyp:gtest',
- ],
- 'export_dependent_settings': [
- 'test_support_common',
- ],
- 'include_dirs': [
- '..',
- '<(sysroot)/usr/include/python<(python_ver)',
- ],
- 'link_settings': {
- 'libraries': [
- '-lpython<(python_ver)',
- ],
- },
- 'cflags': [
- '-Wno-uninitialized',
- '-Wno-self-assign', # to keep clang happy for generated code.
- ],
- 'sources': [
- 'test/automation/proxy_launcher.cc',
- 'test/automation/proxy_launcher.h',
- 'test/pyautolib/pyautolib.cc',
- 'test/pyautolib/pyautolib.h',
- 'test/ui/ui_test.cc',
- 'test/ui/ui_test.h',
- 'test/ui/ui_test_suite.cc',
- 'test/ui/ui_test_suite.h',
- '<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
- '<@(pyautolib_sources)',
- ],
- 'conditions': [
- # Disable the type profiler. _POSIX_C_SOURCE and _XOPEN_SOURCE
- # conflict between <Python.h> and <typeinfo>.
- ['clang_type_profiler==1', {
- 'cflags_cc!': [
- '-fintercept-allocation-functions',
- ],
- }],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
- ['asan==1', {
- 'cflags!': [ '-fsanitize=address' ],
- }],
- ],
- 'actions': [
- {
- 'variables' : {
- 'swig_args': [ '-I..',
- '-python',
- '-c++',
- '-threads',
- '-outdir',
- '<(PRODUCT_DIR)',
- '-o',
- '<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
- ],
- 'conditions': [
- ['chromeos==1', {
- 'swig_args': [
- '-DOS_CHROMEOS',
- ]
- }],
- ],
- },
- 'action_name': 'pyautolib_swig',
- 'inputs': [
- 'test/pyautolib/argc_argv.i',
- 'test/pyautolib/pyautolib.i',
- '<@(pyautolib_sources)',
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/pyautolib_wrap.cc',
- '<(PRODUCT_DIR)/pyautolib.py',
- ],
- 'action': [ 'python',
- '../tools/swig/swig.py',
- '<@(swig_args)',
- 'test/pyautolib/pyautolib.i',
- ],
- 'message': 'Generating swig wrappers for pyautolib',
- },
- ], # actions
- }, {
- 'type': 'none',
- }],
- ], # conditions
- }, # target 'pyautolib'
- {
- # Required for WebRTC PyAuto tests.
- 'target_name': 'webrtc_test_tools',
- 'type': 'none',
- 'dependencies': [
- 'pyautolib',
- '../third_party/libjingle/libjingle.gyp:peerconnection_server',
- '../third_party/webrtc/tools/tools.gyp:frame_analyzer',
- '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
- ],
- }, # target 'webrtc_test_tools'
- {
# Executable to measure time to load libraries.
'target_name': 'load_library_perf_tests',
'type': '<(gtest_target_type)',
}],
],
}, # target 'load_library_perf_tests'
+ # temporary target to keep cros compiling until it removes references to pyauto
+ {
+ 'target_name': 'pyautolib',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:run_all_unittests',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'include_dirs': [
+ '..,'
+ ],
+ },
],
'conditions': [
- ['OS=="mac"', {
- 'targets': [
- {
- # This is the mac equivalent of the security_tests target below. It
- # generates a framework bundle which bundles tests to be run in a
- # renderer process. The test code is built as a framework so it can be
- # run in the context of a renderer without shipping the code to end
- # users.
- 'target_name': 'renderer_sandbox_tests',
- 'type': 'shared_library',
- 'product_name': 'Renderer Sandbox Tests',
- 'mac_bundle': 1,
- 'xcode_settings': {
- 'INFOPLIST_FILE': 'test/security_tests/sandbox_tests_mac-Info.plist',
- },
- 'sources': [
- 'test/security_tests/renderer_sandbox_tests_mac.mm',
- ],
- 'include_dirs': [
- '..',
- ],
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
- ],
- },
- }, # target renderer_sandbox_tests
- {
- # Tests for Mac app launcher.
- 'target_name': 'app_mode_app_tests',
- 'type': 'executable',
- 'product_name': 'app_mode_app_tests',
- 'dependencies': [
- '../base/base.gyp:test_support_base',
- '../chrome/common_constants.gyp:common_constants',
- '../testing/gtest.gyp:gtest',
- 'chrome.gyp:chrome', # run time dependency
- 'app_mode_app_support',
- ],
- 'sources': [
- 'common/mac/app_mode_chrome_locator_unittest.mm',
- 'test/base/app_mode_app_tests.cc',
- ],
- 'include_dirs': [
- '..',
- ],
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
- '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
- ],
- },
- }, # target app_mode_app_tests
- ],
- }],
['OS!="mac"', {
'targets': [
{
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
- }],
['OS=="win"', {
'configurations': {
'Debug_Base': {
}],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'conditions': [
- # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
+ ['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
},
],
},], # OS!="mac"
- ['OS=="win"', {
- 'targets': [
- {
- 'target_name': 'security_tests',
- 'type': 'shared_library',
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'test/security_tests/ipc_security_tests.cc',
- 'test/security_tests/ipc_security_tests.h',
- 'test/security_tests/security_tests.cc',
- '../sandbox/win/tests/validation_tests/commands.cc',
- '../sandbox/win/tests/validation_tests/commands.h',
- ],
- },
- ]}, # 'targets'
- ], # OS=="win"
['OS == "android"', {
'targets': [
{
'includes': [ '../build/uiautomator_test.gypi' ],
},
{
+ 'target_name': 'chrome_sync_shell_test_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'chrome_java',
+ 'chrome_sync_shell_apk_java',
+ 'chrome_java_test_support',
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_java_test_support',
+ '../content/content_shell_and_tests.gyp:content_java_test_support',
+ ],
+ 'variables': {
+ 'apk_name': 'ChromeSyncShellTest',
+ 'java_in_dir': 'android/sync_shell/javatests',
+ 'additional_src_dirs': [ 'android/shell/javatests', ],
+ 'is_test_apk': 1,
+ },
+ 'includes': [ '../build/java_apk.gypi' ],
+ },
+ {
'target_name': 'chrome_java_test_support',
'type': 'none',
'variables': {
- 'package_name': 'chrome_java_test_support',
'java_in_dir': '../chrome/test/android/javatests',
},
'dependencies': [
['test_isolation_mode != "noop"', {
'targets': [
{
- 'target_name': 'angle_unittests_run',
- 'type': 'none',
- 'dependencies': [
- '../gpu/gpu.gyp:angle_unittests',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'angle_unittests.isolate',
- ],
- 'sources': [
- 'angle_unittests.isolate',
- ],
- },
- {
'target_name': 'browser_tests_run',
'type': 'none',
'dependencies': [
'sources': [
'browser_tests.isolate',
],
- },
- {
- 'target_name': 'content_gl_tests_run',
- 'type': 'none',
- 'dependencies': [
- '../content/content_shell_and_tests.gyp:content_gl_tests',
- 'chrome_run',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'content_gl_tests.isolate',
- ],
- 'sources': [
- 'content_gl_tests.isolate',
- ],
- },
- {
- 'target_name': 'gles2_conform_test_run',
- 'type': 'none',
- 'dependencies': [
- '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'gles2_conform_test.isolate',
- ],
- 'sources': [
- 'gles2_conform_test.isolate',
- ],
- },
- {
- 'target_name': 'gl_tests_run',
- 'type': 'none',
- 'dependencies': [
- '../gpu/gpu.gyp:gl_tests',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'gl_tests.isolate',
- ],
- 'sources': [
- 'gl_tests.isolate',
+ 'conditions': [
+ ['use_x11==1', {
+ 'dependencies': [
+ '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+ ],
+ }],
],
},
{
'sync_integration_tests.isolate',
],
},
- {
- 'target_name': 'tab_capture_performance_tests_run',
- 'type': 'none',
- 'dependencies': [
- 'performance_browser_tests',
- 'chrome_run',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'tab_capture_performance_tests.isolate',
- ],
- 'sources': [
- 'tab_capture_performance_tests.isolate',
- ],
- },
- {
- 'target_name': 'telemetry_gpu_test_run',
- 'type': 'none',
- 'dependencies': [
- 'chrome_run',
- '../tools/telemetry/telemetry.gyp:bitmaptools#host',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'telemetry_gpu_test.isolate',
- ],
- 'sources': [
- 'telemetry_gpu_test.isolate',
- ],
- },
],
- }],
- ['OS=="win"', {
- 'targets' : [
- {
- # This target is only depended upon in Windows.
- 'target_name': 'browser_tests_exe_pdb_workaround',
- 'type': 'static_library',
- 'sources': [ 'empty_pdb_workaround.cc' ],
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- # This *in the compile phase* must match the pdb name that's
- # output by the final link. See empty_pdb_workaround.cc for
- # more details.
- 'DebugInformationFormat': '3',
- 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb',
+ 'conditions': [
+ ['archive_gpu_tests==1', {
+ 'targets': [
+ {
+ 'target_name': 'gpu_tests_base',
+ 'type': 'none',
+ 'dependencies': [
+ # depend on icu to fix races. http://crbug.com/417583
+ '../third_party/icu/icu.gyp:icudata',
+ ],
+ 'direct_dependent_settings': {
+ 'includes': [
+ '../build/isolate.gypi',
+ ],
+ },
},
- },
- },
+ {
+ 'target_name': 'angle_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../gpu/gpu.gyp:angle_unittests',
+ 'gpu_tests_base',
+ ],
+ 'includes': [
+ 'angle_unittests.isolate',
+ ],
+ 'sources': [
+ 'angle_unittests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'gl_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../gpu/gpu.gyp:gl_tests',
+ 'gpu_tests_base',
+ ],
+ 'includes': [
+ 'gl_tests.isolate',
+ ],
+ 'sources': [
+ 'gl_tests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'tab_capture_end2end_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'browser_tests_run',
+ 'gpu_tests_base',
+ ],
+ 'includes': [
+ 'tab_capture_end2end_tests.isolate',
+ ],
+ 'sources': [
+ 'tab_capture_end2end_tests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'telemetry_gpu_test_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'chrome_run',
+ '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+ 'gpu_tests_base',
+ ],
+ 'includes': [
+ 'telemetry_gpu_test.isolate',
+ ],
+ 'sources': [
+ 'telemetry_gpu_test.isolate',
+ ],
+ },
+ {
+ 'target_name': 'gpu_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../gpu/gpu.gyp:gpu_unittests',
+ 'gpu_tests_base',
+ ],
+ 'includes': [
+ 'gpu_unittests.isolate',
+ ],
+ 'sources': [
+ 'gpu_unittests.isolate',
+ ],
+ },
+ ],
+ 'conditions': [
+ ['internal_gles2_conform_tests==1', {
+ 'targets': [
+ {
+ 'target_name': 'gles2_conform_test_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
+ 'gpu_tests_base',
+ ],
+ 'includes': [
+ 'gles2_conform_test.isolate',
+ ],
+ 'sources': [
+ 'gles2_conform_test.isolate',
+ ],
+ },
+ ],
+ }],
+ ],
+ }],
],
}],
[ 'enable_mdns == 1', {
projects / platform / framework / web / crosswalk.git / blobdiff