'target_name': 'interactive_ui_tests',
'type': 'executable',
'dependencies': [
+ 'browser',
+ 'chrome_resources.gyp:chrome_resources',
+ 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources.gyp:packed_extra_resources',
+ 'chrome_resources.gyp:packed_resources',
+ 'debugger',
+ 'renderer',
+ 'test_support_common',
'../google_apis/google_apis.gyp:google_apis_test_support',
'../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',
'../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',
- 'browser',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
- 'chrome_resources.gyp:packed_extra_resources',
- 'chrome_resources.gyp:packed_resources',
- 'debugger',
- 'renderer',
- 'test_support_common',
+ '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
],
'include_dirs': [
'..',
'../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/extensions/window_open_interactive_apitest.cc',
'browser/mouseleave_browsertest.cc',
'browser/notifications/notification_browsertest.cc',
- 'browser/plugins/npapi_infobar_browsertest.cc',
'browser/password_manager/password_generation_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/ui/panels/test_panel_collection_squeeze_observer.cc',
'browser/ui/panels/test_panel_collection_squeeze_observer.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/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/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_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': [
# 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', {
}],
['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/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'
'../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/'],
'browser/chromeos/login/login_manager_test.h',
'browser/chromeos/login/login_ui_browsertest.cc',
'browser/chromeos/login/oobe_browsertest.cc',
+ 'browser/chromeos/login/screenshot_tester.h',
+ 'browser/chromeos/login/screenshot_tester.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/notification_browsertest.cc',
'browser/ui/panels/detached_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"', {
# 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',
],
'<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h',
'<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.cc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.h',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/mobile_device_list.cc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/mobile_device_list.h',
'test/chromedriver/chrome/adb.h',
'test/chromedriver/chrome/adb_impl.cc',
'test/chromedriver/chrome/adb_impl.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',
],
'message': 'Generating sources for embedding automation extension',
},
- {
- 'action_name': 'embed_mobile_devices_in_cpp',
- 'inputs': [
- 'test/chromedriver/cpp_source.py',
- 'test/chromedriver/embed_mobile_devices_in_cpp.py',
- '../third_party/WebKit/Source/devtools/front_end/sdk/OverridesSupport.js',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/mobile_device_list.cc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/mobile_device_list.h',
- ],
- 'action': [ 'python',
- 'test/chromedriver/embed_mobile_devices_in_cpp.py',
- '--directory',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome',
- '../third_party/WebKit/Source/devtools/front_end/sdk/OverridesSupport.js',
- ],
- 'message': 'Generating sources for embedding mobile devices in chromedriver',
- },
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
'test/chromedriver/capabilities.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/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',
'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',
'test/perf/perf_test.gyp:*',
'test_support_common',
'test_support_sync_integration',
- '../apps/common/api/api.gyp:apps_api',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
'../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/cast.gyp:cast_test_utility',
'../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',
# 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',
],
'../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',
+ '../extensions/browser/api/cast_channel/cast_channel_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/test_extension_registry_observer.h',
+ '../extensions/browser/test_extension_registry_observer.cc',
'../extensions/renderer/script_context_browsertest.cc',
# TODO(blundell): Bring up a components_browsertests target and move
# this test to be in that target. crbug.com/283846
'browser/apps/app_browsertest_util.cc',
'browser/apps/app_browsertest_util.h',
'browser/apps/app_crash_browsertest.cc',
+ 'browser/apps/app_view_browsertest.cc',
'browser/apps/app_window_browsertest.cc',
'browser/apps/app_url_redirector_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/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/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/auth/mock_authenticator.cc',
- 'browser/chromeos/login/auth/mock_authenticator.h',
'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/login_utils_browsertest.cc',
'browser/chromeos/login/login_manager_test.cc',
'browser/chromeos/login/login_manager_test.h',
- 'browser/chromeos/login/managed/managed_user_creation_browsertest.cc',
- 'browser/chromeos/login/managed/managed_user_password_browsertest.cc',
- 'browser/chromeos/login/managed/managed_user_test_base.cc',
- 'browser/chromeos/login/managed/managed_user_test_base.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/screens/mock_error_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/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/wizard_controller_browsertest.cc',
'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/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/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/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/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/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/sync_setup_helper.cc',
'browser/extensions/api/reading_list_private/reading_list_private_apitest.cc',
'browser/extensions/api/screenlock_private/screenlock_private_apitest.cc',
- 'browser/extensions/api/serial/serial_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/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/first_run/try_chrome_dialog_view_browsertest.cc',
'browser/geolocation/access_token_store_browsertest.cc',
'browser/geolocation/geolocation_browsertest.cc',
+ 'browser/guest_view/extension_options/extension_options_apitest.cc',
'browser/history/history_browsertest.cc',
'browser/history/redirect_browsertest.cc',
'browser/iframe_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/plugins/npapi_infobar_browsertest.cc',
- 'browser/password_manager/password_manager_browsertest.cc',
+ '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_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/print_preview_pdf_generated_browsertest.cc',
'browser/process_singleton_browsertest.cc',
'browser/profiles/host_zoom_map_browsertest.cc',
'browser/profiles/profile_browsertest.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/thumbnail_manager_browsertest.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/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/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_util.h',
'browser/themes/theme_service_browsertest.cc',
'browser/translate/translate_browsertest.cc',
- 'browser/translate/translate_browser_test_utils.cc',
- 'browser/translate/translate_browser_test_utils.h',
+ '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_views_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/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/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/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/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',
'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/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/waiter.cc',
'test/remoting/waiter.h',
+ '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',
},
},
'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/sync/one_click_signin_bubble_links_delegate_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', {
'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/'],
['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',
],
}],
['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',
],
['exclude', '^browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc'],
['exclude', '^browser/printing/cloud_print/test/.*'],
['exclude', '^browser/printing/print_preview_dialog_controller_browsertest.cc'],
+ ['exclude', '^browser/printing/print_preview_pdf_generated_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'],
['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',
'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/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',
['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',
['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',
+ ],
+ }],
],
},
{
],
},
{
- 'target_name': 'tab_capture_end2end_tests_run',
- 'type': 'none',
- 'dependencies': [
- 'browser_tests_run',
- ],
- 'includes': [
- '../build/isolate.gypi',
- 'tab_capture_end2end_tests.isolate',
- ],
- 'sources': [
- 'tab_capture_end2end_tests.isolate',
- ],
- },
- {
'target_name': 'tab_capture_performance_tests_run',
'type': 'none',
'dependencies': [
'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',
+ ],
+ 'conditions': [
+ ['archive_gpu_tests==1', {
+ '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': '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': 'gl_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ '../gpu/gpu.gyp:gl_tests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ 'gl_tests.isolate',
+ ],
+ 'sources': [
+ 'gl_tests.isolate',
+ ],
+ },
+ {
+ 'target_name': 'tab_capture_end2end_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'browser_tests_run',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ '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',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ 'telemetry_gpu_test.isolate',
+ ],
+ 'sources': [
+ 'telemetry_gpu_test.isolate',
+ ],
+ },
],
- 'sources': [
- 'telemetry_gpu_test.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',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ 'gles2_conform_test.isolate',
+ ],
+ 'sources': [
+ 'gles2_conform_test.isolate',
+ ],
+ },
+ ],
+ }],
],
- },
+ }],
],
}],
[ 'enable_mdns == 1', {
projects / platform / framework / web / crosswalk.git / blobdiff