diff options
Diffstat (limited to 'chromium/content/content_tests.gypi')
| -rw-r--r-- | chromium/content/content_tests.gypi | 789 |
1 files changed, 480 insertions, 309 deletions
diff --git a/chromium/content/content_tests.gypi b/chromium/content/content_tests.gypi index 6ac19670386..d17648d9b60 100644 --- a/chromium/content/content_tests.gypi +++ b/chromium/content/content_tests.gypi @@ -5,6 +5,40 @@ { 'targets': [ { + 'target_name': 'layouttest_support_content', + 'type': 'static_library', + 'conditions': [ + ['OS=="android"', { + 'dependencies': [ + 'test_support_content_jni_headers', + ], + }], + ['OS!="ios"', { + # layouttest_support_content is not supported nor required on iOS. + 'dependencies': [ + 'test_support_content', + '../skia/skia.gyp:skia', + '../ui/accessibility/accessibility.gyp:ax_gen', + '../v8/tools/gyp/v8.gyp:v8', + ], + 'include_dirs': [ + '..', + '<(SHARED_INTERMEDIATE_DIR)', + ], + 'sources': [ + 'public/test/layouttest_support.h', + 'public/test/nested_message_pump_android.cc', + 'public/test/nested_message_pump_android.h', + 'test/layouttest_support.cc', + 'test/test_media_stream_renderer_factory.cc', + 'test/test_media_stream_renderer_factory.h', + 'test/test_video_frame_provider.cc', + 'test/test_video_frame_provider.h', + ], + }], + ], + }, + { 'target_name': 'test_support_content', 'type': 'static_library', 'dependencies': [ @@ -12,13 +46,17 @@ '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', + '../ui/accessibility/accessibility.gyp:ax_gen', + '../ui/base/ui_base.gyp:ui_base', + '../ui/base/ui_base.gyp:ui_base_test_support', '../ui/events/events.gyp:dom4_keycode_converter', '../ui/events/events.gyp:events_base', - '../ui/gfx/gfx.gyp:gfx', + '../ui/events/events.gyp:events_test_support', + '../ui/events/events.gyp:gesture_detection', + '../ui/gfx/gfx.gyp:gfx_test_support', '../ui/resources/ui_resources.gyp:ui_resources', - '../ui/ui.gyp:ui', - '../ui/ui_unittests.gyp:ui_test_support', '../url/url.gyp:url_lib', + '../webkit/common/webkit_common.gyp:webkit_common', 'browser/speech/proto/speech_proto.gyp:speech_proto', 'content.gyp:content_app_both', 'content.gyp:content_browser', @@ -28,6 +66,8 @@ '..', ], 'sources': [ + 'public/test/async_file_test_helper.cc', + 'public/test/async_file_test_helper.h', 'public/test/browser_test_base.cc', 'public/test/browser_test_base.h', 'public/test/browser_test.h', @@ -39,7 +79,10 @@ 'public/test/download_test_observer.h', 'public/test/fake_speech_recognition_manager.cc', 'public/test/fake_speech_recognition_manager.h', - 'public/test/layouttest_support.h', + 'public/test/javascript_test_observer.cc', + 'public/test/javascript_test_observer.h', + 'public/test/mock_blob_url_request_context.cc', + 'public/test/mock_blob_url_request_context.h', 'public/test/mock_download_item.cc', 'public/test/mock_download_item.h', 'public/test/mock_download_manager.cc', @@ -52,8 +95,10 @@ 'public/test/mock_render_thread.h', 'public/test/mock_resource_context.cc', 'public/test/mock_resource_context.h', - 'public/test/nested_message_pump_android.cc', - 'public/test/nested_message_pump_android.h', + 'public/test/mock_special_storage_policy.cc', + 'public/test/mock_special_storage_policy.h', + 'public/test/mock_storage_client.cc', + 'public/test/mock_storage_client.h', 'public/test/render_view_test.cc', 'public/test/render_view_test.h', 'public/test/render_widget_test.cc', @@ -108,11 +153,14 @@ 'browser/renderer_host/compositing_iosurface_transformer_mac.h', 'browser/renderer_host/media/mock_media_observer.cc', 'browser/renderer_host/media/mock_media_observer.h', - 'gpu/gpu_idirect3d9_mock_win.cc', - 'gpu/gpu_idirect3d9_mock_win.h', + 'test/appcache_test_helper.cc', + 'test/appcache_test_helper.h', + 'test/content_browser_test_utils_internal.cc', + 'test/content_browser_test_utils_internal.h', 'test/content_test_suite.cc', 'test/content_test_suite.h', - 'test/layouttest_support.cc', + 'test/frame_load_waiter.cc', + 'test/frame_load_waiter.h', 'test/mock_google_streaming_server.cc', 'test/mock_google_streaming_server.h', 'test/mock_keyboard.cc', @@ -138,14 +186,12 @@ 'test/net/url_request_slow_download_job.h', 'test/ppapi_unittest.cc', 'test/ppapi_unittest.h', - 'test/test_backing_store.cc', - 'test/test_backing_store.h', 'test/test_content_browser_client.cc', 'test/test_content_browser_client.h', 'test/test_content_client.cc', 'test/test_content_client.h', - 'test/test_media_stream_client.cc', - 'test/test_media_stream_client.h', + 'test/test_frame_navigation_observer.cc', + 'test/test_frame_navigation_observer.h', 'test/test_render_frame_host.cc', 'test/test_render_frame_host.h', 'test/test_render_frame_host_factory.cc', @@ -154,33 +200,34 @@ 'test/test_render_view_host.h', 'test/test_render_view_host_factory.cc', 'test/test_render_view_host_factory.h', - 'test/test_video_frame_provider.cc', - 'test/test_video_frame_provider.h', 'test/test_web_contents.cc', 'test/test_web_contents.h', - 'test/test_web_contents_view.cc', - 'test/test_web_contents_view.h', 'test/test_webkit_platform_support.cc', 'test/test_webkit_platform_support.h', 'test/web_gesture_curve_mock.cc', 'test/web_gesture_curve_mock.h', - 'test/web_layer_tree_view_impl_for_testing.cc', - 'test/web_layer_tree_view_impl_for_testing.h', 'test/webkit_support.cc', 'test/webkit_support.h', - 'test/webkit_support_glue.cc', + 'test/webkit_unit_test_support.cc', + 'test/webkit_unit_test_support.h', + 'test/web_layer_tree_view_impl_for_testing.cc', + 'test/web_layer_tree_view_impl_for_testing.h', 'test/weburl_loader_mock.cc', 'test/weburl_loader_mock.h', 'test/weburl_loader_mock_factory.cc', 'test/weburl_loader_mock_factory.h', - - # TODO(kinuko): Those files should be moved to content/public/test. - '../webkit/browser/appcache/appcache_test_helper.cc', - '../webkit/browser/appcache/appcache_test_helper.h', - '../webkit/browser/fileapi/async_file_test_helper.cc', - '../webkit/browser/fileapi/async_file_test_helper.h', ], 'conditions': [ + ['enable_plugins==0', { + 'sources!': [ + 'test/ppapi_unittest.cc', + ], + }], + ['input_speech==0', { + 'sources!': [ + 'test/mock_google_streaming_server.cc', + ], + }], ['OS == "ios"', { 'sources/': [ # iOS only needs a small portion of content; exclude all the @@ -213,11 +260,13 @@ ], 'dependencies': [ 'content.gyp:content_child', + 'content.gyp:content_common', 'content.gyp:content_gpu', 'content.gyp:content_ppapi_plugin', 'content.gyp:content_renderer', 'content.gyp:content_utility', 'content.gyp:content_worker', + '../cc/cc.gyp:cc', '../cc/cc_tests.gyp:cc_test_support', '../media/media.gyp:media', '../ppapi/ppapi_internal.gyp:ppapi_host', @@ -225,50 +274,39 @@ '../ppapi/ppapi_internal.gyp:ppapi_shared', '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', '../third_party/WebKit/public/blink.gyp:blink', - '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner', '../ui/surface/surface.gyp:surface', + '../v8/tools/gyp/v8.gyp:v8', '../webkit/child/webkit_child.gyp:webkit_child', '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', - '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', - '../webkit/glue/webkit_glue.gyp:glue', - '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', - '../webkit/renderer/webkit_renderer.gyp:webkit_renderer', '../webkit/storage_browser.gyp:webkit_storage_browser', '../webkit/storage_common.gyp:webkit_storage_common', ], + 'export_dependent_settings': [ + '../third_party/WebKit/public/blink.gyp:blink', + ], }], - ['OS == "win" or toolkit_uses_gtk == 1', { + ['OS == "win"', { 'dependencies': [ '../sandbox/sandbox.gyp:sandbox', ], }], ['enable_webrtc==1', { 'sources': [ - 'renderer/media/mock_media_stream_dependency_factory.cc', - 'renderer/media/mock_media_stream_dependency_factory.h', 'renderer/media/mock_media_stream_dispatcher.cc', 'renderer/media/mock_media_stream_dispatcher.h', - 'renderer/media/mock_media_stream_registry.cc', - 'renderer/media/mock_media_stream_registry.h', 'renderer/media/mock_peer_connection_impl.cc', 'renderer/media/mock_peer_connection_impl.h', 'renderer/media/mock_web_rtc_peer_connection_handler_client.cc', 'renderer/media/mock_web_rtc_peer_connection_handler_client.h', - 'test/webrtc_audio_device_test.cc', - 'test/webrtc_audio_device_test.h', + 'renderer/media/webrtc/mock_peer_connection_dependency_factory.cc', + 'renderer/media/webrtc/mock_peer_connection_dependency_factory.h', ], 'dependencies': [ '../third_party/libjingle/libjingle.gyp:libjingle_webrtc', '../third_party/libjingle/libjingle.gyp:libpeerconnection', - '../third_party/webrtc/modules/modules.gyp:audio_device', '../third_party/webrtc/modules/modules.gyp:video_capture_module', ], }], - ['toolkit_uses_gtk == 1', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - }], ['use_glib == 1', { 'dependencies': [ '../build/linux/system.gyp:glib', @@ -277,8 +315,13 @@ ['use_aura==1', { 'dependencies': [ '../ui/aura/aura.gyp:aura_test_support', - '../ui/compositor/compositor.gyp:compositor', '../ui/resources/ui_resources.gyp:ui_test_pak', + '../ui/wm/wm.gyp:wm', + ], + }], + ['use_aura==1 or OS=="mac"', { + 'dependencies': [ + '../ui/compositor/compositor.gyp:compositor', ], }], ['OS=="win"', { @@ -294,7 +337,6 @@ ['OS=="android"', { 'dependencies': [ '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', - 'test_support_content_jni_headers', ], }], ], @@ -303,10 +345,11 @@ 'target_name': 'content_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ + 'browser/service_worker/service_worker_proto.gyp:database_proto', + 'browser/speech/proto/speech_proto.gyp:speech_proto', 'content.gyp:content_browser', 'content.gyp:content_common', 'test_support_content', - 'browser/speech/proto/speech_proto.gyp:speech_proto', '../base/base.gyp:test_support_base', '../crypto/crypto.gyp:crypto', '../net/net.gyp:net_test_support', @@ -315,27 +358,57 @@ '../sql/sql.gyp:test_support_sql', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', + '../third_party/re2/re2.gyp:re2', + '../ui/accessibility/accessibility.gyp:accessibility', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', - '../ui/ui.gyp:ui', - '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', + '../ui/gfx/gfx.gyp:gfx_geometry', ], 'include_dirs': [ '..', '<(SHARED_INTERMEDIATE_DIR)', # Needed by key_systems_unittest.cc. ], 'sources': [ + 'browser/accessibility/accessibility_mode_helper_unittest.cc', 'browser/accessibility/browser_accessibility_mac_unittest.mm', 'browser/accessibility/browser_accessibility_manager_unittest.cc', 'browser/accessibility/browser_accessibility_win_unittest.cc', + 'browser/appcache/appcache_database_unittest.cc', + 'browser/appcache/appcache_disk_cache_unittest.cc', + 'browser/appcache/appcache_group_unittest.cc', + 'browser/appcache/appcache_host_unittest.cc', + 'browser/appcache/appcache_quota_client_unittest.cc', + 'browser/appcache/appcache_request_handler_unittest.cc', + 'browser/appcache/appcache_response_unittest.cc', + 'browser/appcache/appcache_service_unittest.cc', + 'browser/appcache/appcache_storage_unittest.cc', + 'browser/appcache/appcache_storage_impl_unittest.cc', + 'browser/appcache/appcache_unittest.cc', + 'browser/appcache/appcache_update_job_unittest.cc', + 'browser/appcache/appcache_url_request_job_unittest.cc', 'browser/appcache/chrome_appcache_service_unittest.cc', - 'browser/aura/software_browser_compositor_output_surface_unittest.cc', - 'browser/aura/software_output_device_ozone_unittest.cc', + 'browser/appcache/manifest_parser_unittest.cc', + 'browser/appcache/mock_appcache_policy.cc', + 'browser/appcache/mock_appcache_policy.h', + 'browser/appcache/mock_appcache_service.cc', + 'browser/appcache/mock_appcache_service.h', + 'browser/appcache/mock_appcache_storage.cc', + 'browser/appcache/mock_appcache_storage.h', + 'browser/appcache/mock_appcache_storage_unittest.cc', + 'browser/battery_status/battery_status_service_unittest.cc', 'browser/browser_thread_unittest.cc', 'browser/browser_url_handler_impl_unittest.cc', 'browser/byte_stream_unittest.cc', 'browser/child_process_security_policy_unittest.cc', - 'browser/device_orientation/data_fetcher_impl_android_unittest.cc', - 'browser/device_orientation/data_fetcher_shared_memory_base_unittest.cc', + 'browser/compositor/software_browser_compositor_output_surface_unittest.cc', + 'browser/compositor/software_output_device_ozone_unittest.cc', + 'browser/databases_table_unittest.cc', + 'browser/database_quota_client_unittest.cc', + 'browser/database_tracker_unittest.cc', + 'browser/database_util_unittest.cc', + 'browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc', + 'browser/device_sensors/sensor_manager_android_unittest.cc', + 'browser/devtools/embedded_worker_devtools_manager_unittest.cc', 'browser/devtools/devtools_http_handler_unittest.cc', 'browser/devtools/devtools_manager_unittest.cc', 'browser/dom_storage/dom_storage_area_unittest.cc', @@ -349,10 +422,12 @@ 'browser/download/file_metadata_unittest_linux.cc', 'browser/download/rate_estimator_unittest.cc', 'browser/download/save_package_unittest.cc', + 'browser/fileapi/blob_storage_context_unittest.cc', 'browser/fileapi/blob_url_request_job_unittest.cc', 'browser/fileapi/copy_or_move_file_validator_unittest.cc', 'browser/fileapi/copy_or_move_operation_delegate_unittest.cc', 'browser/fileapi/dragged_file_util_unittest.cc', + 'browser/fileapi/external_mount_points_unittest.cc', 'browser/fileapi/file_system_context_unittest.cc', 'browser/fileapi/file_system_dir_url_request_job_unittest.cc', 'browser/fileapi/file_system_file_stream_reader_unittest.cc', @@ -361,20 +436,39 @@ 'browser/fileapi/file_system_operation_runner_unittest.cc', 'browser/fileapi/file_system_quota_client_unittest.cc', 'browser/fileapi/file_system_url_request_job_unittest.cc', + 'browser/fileapi/file_system_url_unittest.cc', + 'browser/fileapi/file_system_usage_cache_unittest.cc', 'browser/fileapi/file_writer_delegate_unittest.cc', 'browser/fileapi/fileapi_message_filter_unittest.cc', + 'browser/fileapi/isolated_context_unittest.cc', + 'browser/fileapi/local_file_stream_reader_unittest.cc', + 'browser/fileapi/local_file_stream_writer_unittest.cc', 'browser/fileapi/local_file_util_unittest.cc', + 'browser/fileapi/mock_file_change_observer.cc', + 'browser/fileapi/mock_file_change_observer.h', + 'browser/fileapi/mock_url_request_delegate.cc', + 'browser/fileapi/mock_url_request_delegate.h', + 'browser/fileapi/native_file_util_unittest.cc', 'browser/fileapi/obfuscated_file_util_unittest.cc', 'browser/fileapi/plugin_private_file_system_backend_unittest.cc', 'browser/fileapi/recursive_operation_delegate_unittest.cc', + 'browser/fileapi/sandbox_database_test_helper.cc', + 'browser/fileapi/sandbox_database_test_helper.h', + 'browser/fileapi/sandbox_directory_database_unittest.cc', 'browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc', 'browser/fileapi/sandbox_file_system_backend_unittest.cc', + 'browser/fileapi/sandbox_isolated_origin_database_unittest.cc', + 'browser/fileapi/sandbox_origin_database_unittest.cc', + 'browser/fileapi/sandbox_prioritized_origin_database_unittest.cc', + 'browser/fileapi/timed_task_helper_unittest.cc', 'browser/fileapi/transient_file_util_unittest.cc', 'browser/fileapi/upload_file_system_file_element_reader_unittest.cc', 'browser/frame_host/frame_tree_unittest.cc', 'browser/frame_host/navigation_controller_impl_unittest.cc', 'browser/frame_host/navigation_entry_impl_unittest.cc', 'browser/frame_host/render_frame_host_manager_unittest.cc', + 'browser/frame_host/render_widget_host_view_child_frame_unittest.cc', + 'browser/frame_host/render_widget_host_view_guest_unittest.cc', 'browser/gamepad/gamepad_provider_unittest.cc', 'browser/gamepad/gamepad_test_helpers.cc', 'browser/gamepad/gamepad_test_helpers.h', @@ -385,8 +479,10 @@ 'browser/geolocation/wifi_data_provider_common_unittest.cc', 'browser/geolocation/wifi_data_provider_linux_unittest.cc', 'browser/geolocation/wifi_data_provider_unittest_win.cc', + 'browser/gpu/gpu_data_manager_impl_private_unittest.cc', 'browser/gpu/shader_disk_cache_unittest.cc', 'browser/host_zoom_map_impl_unittest.cc', + 'browser/indexed_db/indexed_db_active_blob_registry_unittest.cc', 'browser/indexed_db/indexed_db_backing_store_unittest.cc', 'browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc', 'browser/indexed_db/indexed_db_database_unittest.cc', @@ -403,22 +499,39 @@ 'browser/indexed_db/mock_indexed_db_database_callbacks.h', 'browser/indexed_db/leveldb/leveldb_unittest.cc', 'browser/indexed_db/list_set_unittest.cc', - 'browser/loader/offline_policy_unittest.cc', 'browser/loader/resource_buffer_unittest.cc', 'browser/loader/resource_dispatcher_host_unittest.cc', 'browser/loader/resource_loader_unittest.cc', 'browser/loader/resource_scheduler_unittest.cc', + 'browser/loader/temporary_file_stream_unittest.cc', 'browser/loader/upload_data_stream_builder_unittest.cc', 'browser/mach_broker_mac_unittest.cc', + 'browser/media/capture/audio_mirroring_manager_unittest.cc', + 'browser/media/capture/video_capture_oracle_unittest.cc', + 'browser/media/capture/web_contents_audio_input_stream_unittest.cc', + 'browser/media/capture/web_contents_video_capture_device_unittest.cc', 'browser/media/media_internals_unittest.cc', + 'browser/media/midi_host_unittest.cc', 'browser/media/webrtc_identity_store_unittest.cc', 'browser/net/sqlite_persistent_cookie_store_unittest.cc', 'browser/notification_service_impl_unittest.cc', 'browser/plugin_loader_posix_unittest.cc', 'browser/power_monitor_message_broadcaster_unittest.cc', + 'browser/power_profiler/power_profiler_service_unittest.cc', + 'browser/quota/mock_quota_manager.cc', + 'browser/quota/mock_quota_manager.h', + 'browser/quota/mock_quota_manager_proxy.cc', + 'browser/quota/mock_quota_manager_proxy.h', + 'browser/quota/mock_quota_manager_unittest.cc', + 'browser/quota/quota_database_unittest.cc', + 'browser/quota/quota_backend_impl_unittest.cc', + 'browser/quota/quota_manager_unittest.cc', + 'browser/quota/quota_reservation_manager_unittest.cc', + 'browser/quota/quota_temporary_storage_evictor_unittest.cc', + 'browser/quota/storage_monitor_unittest.cc', + 'browser/quota/usage_tracker_unittest.cc', 'browser/renderer_host/compositing_iosurface_transformer_mac_unittest.cc', - 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', - 'browser/renderer_host/input/gesture_event_filter_unittest.cc', + 'browser/renderer_host/input/gesture_event_queue_unittest.cc', 'browser/renderer_host/input/input_router_impl_unittest.cc', 'browser/renderer_host/input/mock_input_ack_handler.cc', 'browser/renderer_host/input/mock_input_ack_handler.h', @@ -426,23 +539,19 @@ 'browser/renderer_host/input/mock_input_router_client.h', 'browser/renderer_host/input/synthetic_gesture_controller_unittest.cc', 'browser/renderer_host/input/tap_suppression_controller_unittest.cc', - 'browser/renderer_host/input/touch_event_queue_unittest.cc', 'browser/renderer_host/input/touch_action_filter_unittest.cc', + 'browser/renderer_host/input/touch_emulator_unittest.cc', + 'browser/renderer_host/input/touch_event_queue_unittest.cc', 'browser/renderer_host/media/audio_input_device_manager_unittest.cc', - 'browser/renderer_host/media/audio_mirroring_manager_unittest.cc', 'browser/renderer_host/media/audio_renderer_host_unittest.cc', 'browser/renderer_host/media/device_request_message_filter_unittest.cc', 'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc', 'browser/renderer_host/media/media_stream_manager_unittest.cc', 'browser/renderer_host/media/media_stream_ui_proxy_unittest.cc', - 'browser/renderer_host/media/midi_host_unittest.cc', 'browser/renderer_host/media/video_capture_buffer_pool_unittest.cc', 'browser/renderer_host/media/video_capture_controller_unittest.cc', 'browser/renderer_host/media/video_capture_host_unittest.cc', 'browser/renderer_host/media/video_capture_manager_unittest.cc', - 'browser/renderer_host/media/video_capture_oracle_unittest.cc', - 'browser/renderer_host/media/web_contents_audio_input_stream_unittest.cc', - 'browser/renderer_host/media/web_contents_video_capture_device_unittest.cc', 'browser/renderer_host/pepper/browser_ppapi_host_test.cc', 'browser/renderer_host/pepper/browser_ppapi_host_test.h', 'browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc', @@ -453,20 +562,30 @@ 'browser/renderer_host/render_view_host_unittest.cc', 'browser/renderer_host/render_widget_host_unittest.cc', 'browser/renderer_host/render_widget_host_view_aura_unittest.cc', - 'browser/renderer_host/render_widget_host_view_guest_unittest.cc', 'browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm', 'browser/renderer_host/render_widget_host_view_mac_unittest.mm', 'browser/renderer_host/software_frame_manager_unittest.cc', 'browser/renderer_host/text_input_client_mac_unittest.mm', 'browser/renderer_host/web_input_event_aura_unittest.cc', - 'browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc', 'browser/renderer_host/websocket_dispatcher_host_unittest.cc', 'browser/resolve_proxy_msg_helper_unittest.cc', 'browser/service_worker/embedded_worker_instance_unittest.cc', + 'browser/service_worker/embedded_worker_test_helper.cc', + 'browser/service_worker/embedded_worker_test_helper.h', 'browser/service_worker/service_worker_context_unittest.cc', + 'browser/service_worker/service_worker_database_unittest.cc', + 'browser/service_worker/service_worker_dispatcher_host_unittest.cc', 'browser/service_worker/service_worker_dispatcher_host_unittest.cc', + 'browser/service_worker/service_worker_handle_unittest.cc', + 'browser/service_worker/service_worker_job_unittest.cc', + 'browser/service_worker/service_worker_provider_host_unittest.cc', 'browser/service_worker/service_worker_registration_unittest.cc', 'browser/service_worker/service_worker_storage_unittest.cc', + 'browser/service_worker/service_worker_url_request_job_unittest.cc', + 'browser/service_worker/service_worker_utils_unittest.cc', + 'browser/service_worker/service_worker_version_unittest.cc', + 'browser/shared_worker/shared_worker_instance_unittest.cc', + 'browser/shared_worker/shared_worker_service_impl_unittest.cc', 'browser/site_instance_impl_unittest.cc', 'browser/speech/chunked_byte_buffer_unittest.cc', 'browser/speech/endpointer/endpointer_unittest.cc', @@ -480,6 +599,7 @@ 'browser/streams/stream_unittest.cc', 'browser/streams/stream_url_request_job_unittest.cc', 'browser/system_message_window_win_unittest.cc', + 'browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc', 'browser/web_contents/aura/window_slider_unittest.cc', 'browser/web_contents/web_contents_delegate_unittest.cc', 'browser/web_contents/web_contents_impl_unittest.cc', @@ -489,20 +609,32 @@ 'browser/web_contents/web_drag_source_mac_unittest.mm', 'browser/webui/web_ui_data_source_unittest.cc', 'browser/webui/web_ui_message_handler_unittest.cc', + 'child/blink_platform_unittest.cc', 'child/fileapi/webfilewriter_base_unittest.cc', 'child/indexed_db/indexed_db_dispatcher_unittest.cc', 'child/indexed_db/webidbcursor_impl_unittest.cc', + 'child/multipart_response_delegate_unittest.cc', 'child/npapi/plugin_lib_unittest.cc', 'child/power_monitor_broadcast_source_unittest.cc', 'child/resource_dispatcher_unittest.cc', 'child/site_isolation_policy_unittest.cc', + 'child/touch_fling_gesture_curve_unittest.cc', + 'child/webcrypto/shared_crypto_unittest.cc', + 'child/worker_task_runner_unittest.cc', 'common/android/address_parser_unittest.cc', + 'common/android/gin_java_bridge_value_unittest.cc', 'common/cc_messages_unittest.cc', 'common/common_param_traits_unittest.cc', + 'common/cursors/webcursor_unittest.cc', + 'common/database_connections_unittest.cc', + 'common/database_identifier_unittest.cc', 'common/dom_storage/dom_storage_map_unittest.cc', + 'common/fileapi/file_system_util_unittest.cc', 'common/gpu/gpu_memory_manager_unittest.cc', + 'common/host_shared_bitmap_manager_unittest.cc', 'common/indexed_db/indexed_db_key_unittest.cc', 'common/input/input_param_traits_unittest.cc', + 'common/input/web_input_event_traits_unittest.cc', 'common/inter_process_time_ticks_converter_unittest.cc', 'common/mac/attributed_string_coder_unittest.mm', 'common/mac/font_descriptor_unittest.mm', @@ -514,13 +646,18 @@ 'common/sandbox_mac_system_access_unittest.mm', 'common/sandbox_mac_unittest_helper.h', 'common/sandbox_mac_unittest_helper.mm', + 'common/shareable_file_reference_unittest.cc', 'common/webplugininfo_unittest.cc', 'renderer/active_notification_tracker_unittest.cc', 'renderer/android/email_detector_unittest.cc', 'renderer/android/phone_number_detector_unittest.cc', + 'renderer/battery_status/battery_status_dispatcher_unittest.cc', 'renderer/bmp_image_decoder_unittest.cc', - 'renderer/device_orientation/device_motion_event_pump_unittest.cc', - 'renderer/device_orientation/device_orientation_event_pump_unittest.cc', + 'renderer/compositor_bindings/web_animation_unittest.cc', + 'renderer/compositor_bindings/web_float_animation_curve_unittest.cc', + 'renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc', + 'renderer/device_sensors/device_motion_event_pump_unittest.cc', + 'renderer/device_sensors/device_orientation_event_pump_unittest.cc', 'renderer/disambiguation_popup_helper_unittest.cc', 'renderer/dom_storage/dom_storage_cached_area_unittest.cc', 'renderer/ico_image_decoder_unittest.cc', @@ -530,99 +667,35 @@ 'renderer/media/audio_message_filter_unittest.cc', 'renderer/media/audio_renderer_mixer_manager_unittest.cc', 'renderer/media/buffered_data_source_unittest.cc', + 'renderer/media/buffered_data_source_host_impl_unittest.cc', 'renderer/media/buffered_resource_loader_unittest.cc', 'renderer/media/cache_util_unittest.cc', 'renderer/media/crypto/key_systems_unittest.cc', + 'renderer/media/render_media_log_unittest.cc', 'renderer/media/test_response_generator.cc', 'renderer/media/test_response_generator.h', + 'renderer/media/video_capture_impl_manager_unittest.cc', 'renderer/media/video_capture_impl_unittest.cc', 'renderer/media/video_capture_message_filter_unittest.cc', - 'renderer/media/video_destination_handler_unittest.cc', + 'renderer/media/video_frame_compositor_unittest.cc', 'renderer/media/webaudiosourceprovider_impl_unittest.cc', + 'renderer/media/webrtc/video_destination_handler_unittest.cc', 'renderer/npapi/webplugin_impl_unittest.cc', - 'renderer/paint_aggregator_unittest.cc', 'renderer/pepper/host_var_tracker_unittest.cc', 'renderer/pepper/mock_resource.h', 'renderer/pepper/pepper_broker_unittest.cc', 'renderer/pepper/v8_var_converter_unittest.cc', + 'renderer/render_frame_impl_unittest.cc', 'renderer/render_thread_impl_unittest.cc', - 'renderer/render_view_impl_unittest.cc', 'renderer/render_widget_unittest.cc', + 'renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc', 'renderer/skia_benchmarking_extension_unittest.cc', 'renderer/v8_value_converter_impl_unittest.cc', - 'renderer/webcrypto/webcrypto_impl_unittest.cc', + 'test/fileapi_test_file_set.cc', + 'test/fileapi_test_file_set.h', 'test/image_decoder_test.cc', 'test/image_decoder_test.h', 'test/run_all_unittests.cc', - '../webkit/browser/appcache/appcache_database_unittest.cc', - '../webkit/browser/appcache/appcache_group_unittest.cc', - '../webkit/browser/appcache/appcache_host_unittest.cc', - '../webkit/browser/appcache/appcache_quota_client_unittest.cc', - '../webkit/browser/appcache/appcache_request_handler_unittest.cc', - '../webkit/browser/appcache/appcache_response_unittest.cc', - '../webkit/browser/appcache/appcache_service_unittest.cc', - '../webkit/browser/appcache/appcache_storage_impl_unittest.cc', - '../webkit/browser/appcache/appcache_storage_unittest.cc', - '../webkit/browser/appcache/appcache_unittest.cc', - '../webkit/browser/appcache/appcache_update_job_unittest.cc', - '../webkit/browser/appcache/appcache_url_request_job_unittest.cc', - '../webkit/browser/appcache/manifest_parser_unittest.cc', - '../webkit/browser/appcache/mock_appcache_policy.cc', - '../webkit/browser/appcache/mock_appcache_policy.h', - '../webkit/browser/appcache/mock_appcache_service.cc', - '../webkit/browser/appcache/mock_appcache_service.h', - '../webkit/browser/appcache/mock_appcache_storage.cc', - '../webkit/browser/appcache/mock_appcache_storage.h', - '../webkit/browser/appcache/mock_appcache_storage_unittest.cc', - '../webkit/browser/blob/blob_storage_context_unittest.cc', - '../webkit/browser/blob/local_file_stream_reader_unittest.cc', - '../webkit/browser/blob/mock_blob_url_request_context.cc', - '../webkit/browser/blob/mock_blob_url_request_context.h', - '../webkit/browser/database/database_quota_client_unittest.cc', - '../webkit/browser/database/database_tracker_unittest.cc', - '../webkit/browser/database/database_util_unittest.cc', - '../webkit/browser/database/databases_table_unittest.cc', - '../webkit/browser/fileapi/external_mount_points_unittest.cc', - '../webkit/browser/fileapi/file_system_url_unittest.cc', - '../webkit/browser/fileapi/file_system_usage_cache_unittest.cc', - '../webkit/browser/fileapi/isolated_context_unittest.cc', - '../webkit/browser/fileapi/local_file_stream_writer_unittest.cc', - '../webkit/browser/fileapi/mock_file_change_observer.cc', - '../webkit/browser/fileapi/mock_file_change_observer.h', - '../webkit/browser/fileapi/native_file_util_unittest.cc', - '../webkit/browser/fileapi/quota/quota_backend_impl_unittest.cc', - '../webkit/browser/fileapi/quota/quota_reservation_manager_unittest.cc', - '../webkit/browser/fileapi/sandbox_database_test_helper.cc', - '../webkit/browser/fileapi/sandbox_database_test_helper.h', - '../webkit/browser/fileapi/sandbox_directory_database_unittest.cc', - '../webkit/browser/fileapi/sandbox_isolated_origin_database_unittest.cc', - '../webkit/browser/fileapi/sandbox_origin_database_unittest.cc', - '../webkit/browser/fileapi/sandbox_prioritized_origin_database_unittest.cc', - '../webkit/browser/fileapi/test_file_set.cc', - '../webkit/browser/fileapi/test_file_set.h', - '../webkit/browser/fileapi/timed_task_helper_unittest.cc', - '../webkit/child/multipart_response_delegate_unittest.cc', - '../webkit/child/touch_fling_gesture_curve_unittest.cc', - '../webkit/child/worker_task_runner_unittest.cc', - '../webkit/common/blob/shareable_file_reference_unittest.cc', - '../webkit/common/cursors/webcursor_unittest.cc', - '../webkit/common/database/database_connections_unittest.cc', - '../webkit/common/database/database_identifier_unittest.cc', - '../webkit/common/fileapi/file_system_util_unittest.cc', - '../webkit/glue/webkit_glue_unittest.cc', - '../webkit/common/user_agent/user_agent_unittest.cc', - '../webkit/browser/quota/mock_quota_manager.cc', - '../webkit/browser/quota/mock_quota_manager.h', - '../webkit/browser/quota/mock_quota_manager_unittest.cc', - '../webkit/browser/quota/mock_special_storage_policy.cc', - '../webkit/browser/quota/mock_special_storage_policy.h', - '../webkit/browser/quota/mock_storage_client.cc', - '../webkit/browser/quota/mock_storage_client.h', - '../webkit/browser/quota/quota_database_unittest.cc', - '../webkit/browser/quota/quota_manager_unittest.cc', - '../webkit/browser/quota/quota_temporary_storage_evictor_unittest.cc', - '../webkit/browser/quota/usage_tracker_unittest.cc', - '../webkit/renderer/cpp_variant_unittest.cc', ], 'conditions': [ ['OS == "ios"', { @@ -644,6 +717,8 @@ 'content.gyp:content_renderer', 'content_resources.gyp:content_resources', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../cc/cc.gyp:cc', + '../cc/cc_tests.gyp:cc_test_support', '../gpu/gpu.gyp:gpu', '../gpu/gpu.gyp:gpu_unittest_utils', '../ipc/ipc.gyp:test_support_ipc', @@ -657,11 +732,7 @@ '../third_party/libjingle/libjingle.gyp:libjingle', '../ui/compositor/compositor.gyp:compositor_test_support', '../ui/gl/gl.gyp:gl', - '../v8/tools/gyp/v8.gyp:v8', - '../webkit/common/webkit_common.gyp:webkit_common', - '../webkit/glue/webkit_glue.gyp:glue', '../webkit/child/webkit_child.gyp:webkit_child', - '../webkit/renderer/webkit_renderer.gyp:webkit_renderer', '../webkit/storage_browser.gyp:webkit_storage_browser', '../webkit/storage_common.gyp:webkit_storage_common', ], @@ -675,7 +746,7 @@ ], 'sources!': [ 'browser/plugin_loader_posix_unittest.cc', - 'renderer/media/video_destination_handler_unittest.cc', + 'renderer/media/webrtc/video_destination_handler_unittest.cc', ], }], ['enable_webrtc==1', { @@ -687,33 +758,50 @@ 'browser/renderer_host/p2p/socket_host_tcp_unittest.cc', 'browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc', 'browser/renderer_host/p2p/socket_host_udp_unittest.cc', + 'browser/renderer_host/p2p/socket_host_unittest.cc', 'renderer/media/media_stream_audio_processor_unittest.cc', - 'renderer/media/media_stream_dependency_factory_unittest.cc', + 'renderer/media/media_stream_constraints_util_unittest.cc', 'renderer/media/media_stream_dispatcher_unittest.cc', 'renderer/media/media_stream_impl_unittest.cc', + 'renderer/media/media_stream_video_capture_source_unittest.cc', + 'renderer/media/media_stream_video_source_unittest.cc', + 'renderer/media/media_stream_video_track_unittest.cc', + 'renderer/media/mock_media_stream_registry.cc', + 'renderer/media/mock_media_stream_registry.h', + 'renderer/media/mock_media_stream_video_sink.cc', + 'renderer/media/mock_media_stream_video_sink.h', + 'renderer/media/mock_media_stream_video_source.cc', + 'renderer/media/mock_media_stream_video_source.h', + 'renderer/media/mock_media_constraint_factory.cc', 'renderer/media/rtc_peer_connection_handler_unittest.cc', 'renderer/media/rtc_video_decoder_unittest.cc', 'renderer/media/video_source_handler_unittest.cc', + 'renderer/media/webrtc/media_stream_remote_video_source_unittest.cc', + 'renderer/media/webrtc/media_stream_track_metrics_unittest.cc', + 'renderer/media/webrtc/peer_connection_dependency_factory_unittest.cc', + 'renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc', + 'renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc', + 'renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc', 'renderer/media/webrtc_audio_capturer_unittest.cc', - 'renderer/media/webrtc_audio_device_unittest.cc', + 'renderer/media/webrtc_audio_renderer_unittest.cc', 'renderer/media/webrtc_identity_service_unittest.cc', 'renderer/media/webrtc_local_audio_source_provider_unittest.cc', 'renderer/media/webrtc_local_audio_track_unittest.cc', + 'renderer/media/webrtc_uma_histograms_unittest.cc', ], 'dependencies': [ '../third_party/libjingle/libjingle.gyp:libjingle_webrtc', '../third_party/libjingle/libjingle.gyp:libpeerconnection', '../third_party/webrtc/modules/modules.gyp:video_capture_module', - '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine', ] }, { 'sources!': [ - 'renderer/media/video_destination_handler_unittest.cc', + 'renderer/media/webrtc/video_destination_handler_unittest.cc', ], }], ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', { 'sources': [ - 'browser/renderer_host/media/desktop_capture_device_unittest.cc', + 'browser/media/capture/desktop_capture_device_unittest.cc', ], 'dependencies': [ '../third_party/webrtc/modules/modules.gyp:desktop_capture', @@ -721,7 +809,7 @@ }], ['enable_webrtc==1 and chromeos==1', { 'sources': [ - 'browser/renderer_host/media/desktop_capture_device_aura_unittest.cc', + 'browser/media/capture/desktop_capture_device_aura_unittest.cc', ], }], # TODO(jrg): remove the OS=="android" section? @@ -764,14 +852,17 @@ 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, }], ['chromeos==1', { + 'dependencies': [ + '../chromeos/chromeos.gyp:chromeos', + ], 'sources/': [ - ['exclude', '^browser/renderer_host/gtk_key_bindings_handler_unittest.cc'], ['exclude', '^browser/geolocation/wifi_data_provider_linux_unittest.cc'], ], }], ['use_aura==1', { 'dependencies': [ '../ui/aura/aura.gyp:aura', + '../ui/wm/wm.gyp:wm', ] }], ['use_aura==1 or toolkit_views==1', { @@ -779,9 +870,16 @@ '../ui/events/events.gyp:events_test_support', ], }], + ['use_aura!=1 and OS!="mac"', { + 'sources/': [ + ['exclude', '^browser/compositor/'], + ], + }], ['OS == "android"', { 'sources': [ + 'browser/renderer_host/java/gin_java_method_invocation_helper_unittest.cc', 'browser/renderer_host/java/jni_helper_unittest.cc', + 'renderer/java/gin_java_bridge_value_converter_unittest.cc', ], 'sources!': [ 'browser/geolocation/network_location_provider_unittest.cc', @@ -795,46 +893,51 @@ '../third_party/libvpx/libvpx.gyp:libvpx', ], }], - ['OS == "android" and gtest_target_type == "shared_library"', { + ['OS == "android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', ], }], - ['use_aura!=1 and OS!="win" and OS!="android"', { + ['use_aura!=1 and OS!="android"', { 'sources!': [ 'browser/renderer_host/input/tap_suppression_controller_unittest.cc', ], }], - ['enable_webrtc==1 and google_tv==1', { - 'sources': [ - 'renderer/media/rtc_video_decoder_factory_tv_unittest.cc', + ['use_dbus==0', { + 'sources!': [ + 'browser/geolocation/wifi_data_provider_linux_unittest.cc', ], }], - ['use_dbus==0', { + ['OS!="win" and OS!="mac"', { 'sources!': [ - 'browser/geolocation/wifi_data_provider_linux_unittest.cc', + 'common/plugin_list_unittest.cc', ], - }], + }], + ['use_ozone==1', { + 'dependencies': [ + '../ui/ozone/ozone.gyp:ozone_base', + ], + }], ], }, ], 'conditions': [ ['test_isolation_mode != "noop"', { 'targets': [ - { - 'target_name': 'content_unittests_run', - 'type': 'none', - 'dependencies': [ - 'content_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - 'content_unittests.isolate', - ], - 'sources': [ - 'content_unittests.isolate', - ], - }, + { + 'target_name': 'content_unittests_run', + 'type': 'none', + 'dependencies': [ + 'content_unittests', + ], + 'includes': [ + '../build/isolate.gypi', + 'content_unittests.isolate', + ], + 'sources': [ + 'content_unittests.isolate', + ], + }, ], }], ['OS!="ios"', { @@ -844,6 +947,7 @@ 'type': '<(gtest_target_type)', 'defines!': ['CONTENT_IMPLEMENTATION'], 'dependencies': [ + 'content.gyp:content_browser', 'content.gyp:content_common', 'test_support_content', '../base/base.gyp:test_support_base', @@ -852,14 +956,23 @@ '../testing/gtest.gyp:gtest', '../testing/perf/perf_test.gyp:*', '../ui/gfx/gfx.gyp:gfx', + '../ui/gfx/gfx.gyp:gfx_geometry', ], 'include_dirs': [ '..', ], 'sources': [ + 'browser/renderer_host/input/input_router_impl_perftest.cc', 'common/cc_messages_perftest.cc', 'test/run_all_perftests.cc', ], + 'conditions': [ + ['OS == "android"', { + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + ], + }], + ], }, { 'target_name': 'content_browser_test_support', @@ -870,15 +983,37 @@ '../testing/gtest.gyp:gtest', ], 'sources': [ - 'test/accessibility_browser_test_utils.cc', - 'test/accessibility_browser_test_utils.h', - 'test/content_browser_test.cc', - 'test/content_browser_test.h', - 'test/content_browser_test_utils.cc', - 'test/content_browser_test_utils.h', - 'test/content_browser_test_utils_mac.mm', - 'test/cpp_binding_example.cc', - 'test/cpp_binding_example.h', + 'test/content_test_launcher.cc', + 'public/test/content_browser_test.cc', + 'public/test/content_browser_test.h', + 'public/test/content_browser_test_utils.cc', + 'public/test/content_browser_test_utils.h', + 'public/test/content_browser_test_utils_mac.mm', + ], + 'conditions': [ + ['OS=="android"', { + 'dependencies': [ + 'content.gyp:content_app_both', + ], + }, { + 'dependencies': [ + 'content.gyp:content_browser', + ], + }], + ], + }, + { + 'target_name': 'web_ui_test_mojo_bindings', + 'type': 'static_library', + 'dependencies': [ + '../mojo/mojo.gyp:mojo_cpp_bindings', + ], + 'sources': [ + 'test/data/web_ui_test_mojo_bindings.mojom', + ], + 'includes': [ '../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ], + 'export_dependent_settings': [ + '../mojo/mojo.gyp:mojo_cpp_bindings', ], }, { @@ -893,32 +1028,42 @@ 'content_resources.gyp:content_resources', 'content_shell_lib', 'content_shell_pak', + 'test_support_content', + 'web_ui_test_mojo_bindings', '../base/base.gyp:test_support_base', '../gin/gin.gyp:gin', '../gpu/gpu.gyp:gpu', '../ipc/ipc.gyp:test_support_ipc', '../media/media.gyp:media_test_support', '../media/media.gyp:shared_memory_support', + '../mojo/mojo.gyp:mojo_common_test_support', + '../mojo/mojo.gyp:mojo_cpp_bindings', + '../mojo/mojo.gyp:mojo_environment_chromium', + '../mojo/mojo.gyp:mojo_js_bindings', + '../mojo/mojo.gyp:mojo_service_manager', + '../mojo/mojo.gyp:mojo_system_impl', '../net/net.gyp:net_test_support', '../ppapi/ppapi_internal.gyp:ppapi_host', '../ppapi/ppapi_internal.gyp:ppapi_ipc', '../ppapi/ppapi_internal.gyp:ppapi_proxy', '../ppapi/ppapi_internal.gyp:ppapi_shared', + '../ppapi/ppapi_internal.gyp:ppapi_tests', '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/WebKit/public/blink.gyp:blink', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/mesa/mesa.gyp:osmesa', + '../ui/accessibility/accessibility.gyp:accessibility', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', + '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', '../ui/snapshot/snapshot.gyp:snapshot', - '../ui/ui.gyp:ui', '../webkit/child/webkit_child.gyp:webkit_child', - '../webkit/glue/webkit_glue.gyp:glue', - '../webkit/renderer/webkit_renderer.gyp:webkit_renderer', + '../ui/accessibility/accessibility.gyp:ax_gen', ], 'include_dirs': [ '..', @@ -931,23 +1076,19 @@ 'HAS_OUT_OF_PROC_TEST_RUNNER', ], 'sources': [ + 'app/mojo/mojo_browsertest.cc', + 'browser/accessibility/accessibility_mode_browsertest.cc', 'browser/accessibility/accessibility_win_browsertest.cc', + 'browser/accessibility/android_hit_testing_browsertest.cc', 'browser/accessibility/cross_platform_accessibility_browsertest.cc', 'browser/accessibility/dump_accessibility_tree_browsertest.cc', - 'browser/aura/image_transport_factory_browsertest.cc', + 'browser/battery_status/battery_status_browsertest.cc', + 'browser/compositor/image_transport_factory_browsertest.cc', 'browser/bookmarklet_browsertest.cc', - 'browser/browser_plugin/browser_plugin_host_browsertest.cc', - 'browser/browser_plugin/test_browser_plugin_embedder.cc', - 'browser/browser_plugin/test_browser_plugin_embedder.h', - 'browser/browser_plugin/test_browser_plugin_guest.cc', - 'browser/browser_plugin/test_browser_plugin_guest.h', - 'browser/browser_plugin/test_browser_plugin_guest_delegate.cc', - 'browser/browser_plugin/test_browser_plugin_guest_delegate.h', - 'browser/browser_plugin/test_browser_plugin_guest_manager.cc', - 'browser/browser_plugin/test_browser_plugin_guest_manager.h', 'browser/child_process_security_policy_browsertest.cc', + 'browser/cross_site_transfer_browsertest.cc', 'browser/database_browsertest.cc', - 'browser/device_orientation/device_inertial_sensor_browsertest.cc', + 'browser/device_sensors/device_inertial_sensor_browsertest.cc', 'browser/devtools/renderer_overrides_handler_browsertest.cc', 'browser/dom_storage/dom_storage_browsertest.cc', 'browser/download/download_browsertest.cc', @@ -955,37 +1096,43 @@ 'browser/download/mhtml_generation_browsertest.cc', 'browser/download/save_package_browsertest.cc', 'browser/fileapi/file_system_browsertest.cc', + 'browser/frame_host/frame_tree_browsertest.cc', 'browser/frame_host/render_frame_host_manager_browsertest.cc', + 'browser/frame_host/navigation_controller_impl_browsertest.cc', 'browser/gpu/compositor_util_browsertest.cc', 'browser/gpu/gpu_ipc_browsertests.cc', 'browser/indexed_db/indexed_db_browsertest.cc', + 'browser/indexed_db/mock_browsertest_indexed_db_class_factory.cc', + 'browser/indexed_db/mock_browsertest_indexed_db_class_factory.h', 'browser/loader/resource_dispatcher_host_browsertest.cc', 'browser/media/encrypted_media_browsertest.cc', 'browser/media/media_browsertest.cc', 'browser/media/media_browsertest.h', + 'browser/media/media_canplaytype_browsertest.cc', 'browser/media/media_source_browsertest.cc', - 'browser/media/webrtc_internals_browsertest.cc', 'browser/plugin_data_remover_impl_browsertest.cc', 'browser/plugin_browsertest.cc', 'browser/plugin_service_impl_browsertest.cc', + 'browser/renderer_host/input/touch_action_browsertest.cc', 'browser/renderer_host/input/touch_input_browsertest.cc', 'browser/renderer_host/render_process_host_browsertest.cc', 'browser/renderer_host/render_view_host_browsertest.cc', 'browser/renderer_host/render_widget_host_browsertest.cc', 'browser/renderer_host/render_widget_host_view_browsertest.cc', 'browser/security_exploit_browsertest.cc', + 'browser/service_worker/service_worker_browsertest.cc', 'browser/session_history_browsertest.cc', 'browser/site_per_process_browsertest.cc', - 'browser/speech/input_tag_speech_browsertest.cc', 'browser/speech/speech_recognition_browsertest.cc', 'browser/tracing/tracing_controller_browsertest.cc', + 'browser/web_contents/opened_by_dom_browsertest.cc', 'browser/web_contents/touch_editable_impl_aura_browsertest.cc', 'browser/web_contents/web_contents_impl_browsertest.cc', 'browser/web_contents/web_contents_view_aura_browsertest.cc', 'browser/webkit_browsertest.cc', + 'browser/webui/web_ui_mojo_browsertest.cc', 'browser/worker_host/test/worker_browsertest.cc', 'child/site_isolation_policy_browsertest.cc', - 'common/gpu/client/context_provider_command_buffer_browsertest.cc', 'renderer/accessibility/renderer_accessibility_browsertest.cc', 'renderer/browser_plugin/browser_plugin_browsertest.cc', 'renderer/browser_plugin/browser_plugin_browsertest.h', @@ -993,7 +1140,7 @@ 'renderer/browser_plugin/mock_browser_plugin.h', 'renderer/browser_plugin/mock_browser_plugin_manager.cc', 'renderer/browser_plugin/mock_browser_plugin_manager.h', - 'renderer/cpp_bound_class_unittest.cc', + 'renderer/browser_render_view_browsertest.cc', 'renderer/dom_serializer_browsertest.cc', 'renderer/gin_browsertest.cc', 'renderer/mouse_lock_dispatcher_browsertest.cc', @@ -1009,8 +1156,12 @@ 'renderer/render_widget_browsertest.cc', 'renderer/resource_fetcher_browsertest.cc', 'renderer/savable_resources_browsertest.cc', + 'test/accessibility_browser_test_utils.cc', + 'test/accessibility_browser_test_utils.h', 'test/content_browser_test_test.cc', - 'test/content_test_launcher.cc', + 'test/ppapi/ppapi_browsertest.cc', + 'test/ppapi/ppapi_test.cc', + 'test/ppapi/ppapi_test.h', 'test/webui_resource_browsertest.cc', ], 'conditions': [ @@ -1053,10 +1204,6 @@ }, # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], - }, { # OS!="win" - 'sources!': [ - 'browser/accessibility/accessibility_win_browsertest.cc', - ], }], ['OS=="win" and win_use_allocator_shim==1', { 'dependencies': [ @@ -1068,6 +1215,11 @@ 'browser/accessibility/dump_accessibility_tree_browsertest.cc', ], }], + ['OS!="android"', { + 'sources!': [ + 'browser/accessibility/android_hit_testing_browsertest.cc', + ] + }], ['OS=="android"', { 'sources': [ 'shell/android/browsertests_apk/content_browser_tests_android.cc', @@ -1086,15 +1238,6 @@ 'renderer/external_popup_menu_browsertest.cc', ], }], - ['use_aura==1', { - 'sources!': [ - 'browser/accessibility/accessibility_win_browsertest.cc', - ], - }, { - 'sources/': [ - ['exclude', '^browser/aura/'], - ], - }], ['use_aura==1 and OS!="win"', { 'sources!': [ 'browser/plugin_browsertest.cc', @@ -1105,7 +1248,12 @@ '../ui/events/events.gyp:events_test_support', ], }], - ['OS!="android" and OS!="ios"', { + ['use_aura!=1 and OS!="mac"', { + 'sources/': [ + ['exclude', '^browser/compositor/'], + ], + }], + ['OS!="android" and OS!="ios" and OS!="linux"', { # npapi test plugin doesn't build on android or ios 'dependencies': [ # Runtime dependencies @@ -1115,6 +1263,10 @@ ['enable_webrtc==1', { 'sources': [ 'browser/media/webrtc_browsertest.cc', + 'browser/media/webrtc_getusermedia_browsertest.cc', + 'browser/media/webrtc_internals_browsertest.cc', + 'test/webrtc_content_browsertest_base.cc', + 'test/webrtc_content_browsertest_base.h', ], 'dependencies': [ '../testing/perf/perf_test.gyp:perf_test', @@ -1127,7 +1279,13 @@ 'sources!': [ 'browser/plugin_service_impl_browsertest.cc', 'browser/plugin_data_remover_impl_browsertest.cc', + 'test/ppapi/ppapi_browsertest.cc', + 'test/ppapi/ppapi_test.cc', + 'test/ppapi/ppapi_test.h', ], + 'dependencies!': [ + '../ppapi/ppapi_internal.gyp:ppapi_tests', + ] }], ['input_speech==0', { 'sources/': [ @@ -1138,6 +1296,7 @@ 'sources!': [ # These tests depend on single process mode, which is disabled # in official builds. + 'renderer/browser_render_view_browsertest.cc', 'renderer/dom_serializer_browsertest.cc', 'renderer/resource_fetcher_browsertest.cc', 'renderer/savable_resources_browsertest.cc', @@ -1154,20 +1313,21 @@ '../base/base.gyp:test_support_base', '../gpu/gpu.gyp:command_buffer_common', '../testing/gtest.gyp:gtest', + '../third_party/WebKit/public/blink.gyp:blink', + '../ui/base/ui_base.gyp:ui_base', + '../v8/tools/gyp/v8.gyp:v8', '../ui/gfx/gfx.gyp:gfx', + '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', - '../third_party/WebKit/public/blink.gyp:blink', - # The following two dependencies provide the missing - # symbol HeapProfilerStart in Linux component builds. + # The following dependency provides the missing symbol + # HeapProfilerStart in Linux component builds. '../webkit/child/webkit_child.gyp:webkit_child', - '../webkit/glue/webkit_glue.gyp:glue', ], 'include_dirs': [ '..', ], 'sources': [ - 'common/gpu/client/gl_helper_unittests.cc', + 'common/gpu/client/gl_helper_unittest.cc', 'common/gpu/client/gpu_in_process_context_tests.cc', ], 'conditions': [ @@ -1186,13 +1346,13 @@ 'test_support_content', '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', + '../third_party/WebKit/public/blink.gyp:blink', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', + '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', - '../third_party/WebKit/public/blink.gyp:blink', # The following two dependencies provide the missing # symbol HeapProfilerStart in Linux component builds. - '../webkit/glue/webkit_glue.gyp:glue', '../webkit/child/webkit_child.gyp:webkit_child', ], 'include_dirs': [ @@ -1202,20 +1362,6 @@ 'common/gpu/client/gl_helper_benchmark.cc', ], }, - { - 'target_name': 'content_webkit_unit_test_support', - 'type': 'static_library', - 'dependencies': [ - 'test_support_content', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'test/webkit_unit_test_support.cc', - 'test/webkit_unit_test_support.h', - ], - }, ], }], ['chromeos==1 or OS=="win" or OS=="android"', { @@ -1224,13 +1370,14 @@ 'target_name': 'video_decode_accelerator_unittest', 'type': '<(gtest_target_type)', 'dependencies': [ - 'content.gyp:content', '../base/base.gyp:base', - '../testing/gtest.gyp:gtest', '../media/media.gyp:media', - '../ui/gl/gl.gyp:gl', + '../testing/gtest.gyp:gtest', + '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', - '../ui/ui.gyp:ui', + '../ui/gfx/gfx.gyp:gfx_geometry', + '../ui/gl/gl.gyp:gl', + 'content.gyp:content', ], 'include_dirs': [ '<(DEPTH)/third_party/khronos', @@ -1268,7 +1415,7 @@ }], ['(OS=="win" and win_use_allocator_shim==1) or ' '(os_posix == 1 and OS != "android" and ' - ' linux_use_tcmalloc==1)', { + ' use_allocator!="none")', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], @@ -1278,25 +1425,56 @@ '<(DEPTH)/third_party/libva', ], }], + ['use_x11==1', { + 'dependencies': [ + '../build/linux/system.gyp:x11', # Used by rendering_helper.cc + '../ui/gfx/x/gfx_x11.gyp:gfx_x11', + ], + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }, ] }], + ['chromeos==1 and use_x11 == 1 and target_arch != "arm"', { + 'targets': [ + { + 'target_name': 'vaapi_h264_decoder_unittest', + 'type': '<(gtest_target_type)', + 'dependencies': [ + 'content.gyp:content_common', + '../base/base.gyp:base', + '../build/linux/system.gyp:x11', + '../media/media.gyp:media', + '../testing/gtest.gyp:gtest', + '../third_party/libyuv/libyuv.gyp:libyuv', + '../ui/gfx/gfx.gyp:gfx_geometry', + ], + 'sources': [ + 'common/gpu/media/vaapi_h264_decoder_unittest.cc', + ], + 'include_dirs': [ + '<(DEPTH)/third_party/libva', + ], + }, + ] + }], ['chromeos==1 and target_arch == "arm"', { 'targets': [ { 'target_name': 'video_encode_accelerator_unittest', 'type': 'executable', 'dependencies': [ - 'content.gyp:content', '../base/base.gyp:base', - '../testing/gtest.gyp:gtest', '../media/media.gyp:media', - '../ui/gl/gl.gyp:gl', - '../ui/gfx/gfx.gyp:gfx', - '../ui/ui.gyp:ui', + '../media/media.gyp:media_test_support', + '../testing/gtest.gyp:gtest', + '../ui/base/ui_base.gyp:ui_base', + '../ui/gfx/gfx.gyp:gfx', + '../ui/gfx/gfx.gyp:gfx_geometry', + '../ui/gl/gl.gyp:gl', + 'content.gyp:content', ], 'sources': [ 'common/gpu/media/video_accelerator_unittest_helpers.h', @@ -1305,34 +1483,7 @@ }, ] }], - ['chromeos == 1 or OS == "linux"', { - 'targets': [ - { - 'target_name': 'h264_parser_unittest', - 'type': 'executable', - 'dependencies': [ - 'content.gyp:content_common', - '../base/base.gyp:base', - '../testing/gtest.gyp:gtest', - ], - 'sources': [ - 'common/gpu/media/h264_bit_reader_unittest.cc', - 'common/gpu/media/h264_parser_unittest.cc', - ], - 'conditions': [ - ['linux_use_tcmalloc==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - } - ], - }], - # Special target to wrap a gtest_target_type==shared_library - # content_unittests into an android apk for execution. - # See base.gyp for TODO(jrg)s about this strategy. - ['OS == "android" and gtest_target_type == "shared_library"', { + ['OS == "android"', { 'targets': [ { 'target_name': 'content_gl_tests_apk', @@ -1343,7 +1494,6 @@ ], 'variables': { 'test_suite_name': 'content_gl_tests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_gl_tests<(SHARED_LIB_SUFFIX)', }, 'includes': [ '../build/apk_test.gypi', @@ -1358,7 +1508,6 @@ ], 'variables': { 'test_suite_name': 'content_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)', }, 'includes': [ '../build/apk_test.gypi' ], }, @@ -1366,6 +1515,7 @@ 'target_name': 'content_browsertests_apk', 'type': 'none', 'dependencies': [ + 'content.gyp:content_icudata', 'content.gyp:content_java', 'content_browsertests', 'content_java_test_support', @@ -1378,56 +1528,83 @@ 'native_lib_target': 'libcontent_browsertests', 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'], 'asset_location': '<(PRODUCT_DIR)/content_shell/assets', + 'conditions': [ + ['icu_use_data_file_flag==1', { + 'additional_input_paths': [ + '<(PRODUCT_DIR)/icudtl.dat', + ], + }], + ], }, 'includes': [ '../build/java_apk.gypi' ], }, { - 'target_name': 'content_linker_test_apk', + 'target_name': 'content_perftests_apk', 'type': 'none', 'dependencies': [ - 'content_android_linker_test', 'content.gyp:content_java', - 'content_shell_java', + 'content_perftests', ], 'variables': { - 'apk_name': 'ContentLinkerTest', - 'java_in_dir': 'shell/android/linker_test_apk', - 'resource_dir': 'shell/android/linker_test_apk/res', - 'native_lib_target': 'libcontent_android_linker_test', - 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'], - 'asset_location': '<(PRODUCT_DIR)/content_shell/assets', - 'use_content_linker': '1', - 'enable_content_linker_tests': '1', + 'test_suite_name': 'content_perftests', }, - 'includes': [ '../build/java_apk.gypi' ], + 'includes': [ '../build/apk_test.gypi' ], + }, + { + 'target_name': 'chromium_linker_test_apk', + 'type': 'none', + 'conditions': [ + ['target_arch != "x64" and target_arch != "arm64"', { + 'dependencies': [ + 'chromium_android_linker_test', + 'content.gyp:content_icudata', + 'content.gyp:content_java', + 'content_shell_java', + ], + 'variables': { + 'apk_name': 'ChromiumLinkerTest', + 'java_in_dir': 'shell/android/linker_test_apk', + 'resource_dir': 'shell/android/linker_test_apk/res', + 'native_lib_target': 'libchromium_android_linker_test', + 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'], + 'asset_location': '<(PRODUCT_DIR)/content_shell/assets', + 'use_chromium_linker': '1', + 'enable_chromium_linker_tests': '1', + 'conditions': [ + ['icu_use_data_file_flag==1', { + 'additional_input_paths': [ + '<(PRODUCT_DIR)/icudtl.dat', + ], + }], + ], + }, + 'includes': [ '../build/java_apk.gypi' ], + }, + ], + ], }, { - 'target_name': 'content_android_linker_test', + 'target_name': 'chromium_android_linker_test', 'type': 'shared_library', 'defines!': ['CONTENT_IMPLEMENTATION'], 'dependencies': [ - 'content_android_linker_test_jni_headers', + 'chromium_android_linker_test_jni_headers', 'content_shell_lib', # Required to include "content/public/browser/android/compositor.h" - # in content_linker_test_android.cc :-( + # in chromium_linker_test_android.cc :-( '../skia/skia.gyp:skia', ], 'sources': [ - 'shell/android/linker_test_apk/content_linker_test_android.cc', - 'shell/android/linker_test_apk/content_linker_test_linker_tests.cc', + 'shell/android/linker_test_apk/chromium_linker_test_android.cc', + 'shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc', ], }, { - 'target_name': 'content_android_linker_test_jni_headers', + 'target_name': 'chromium_android_linker_test_jni_headers', 'type': 'none', 'sources': [ - 'shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/LinkerTests.java', + 'shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java', ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/content/shell', - ], - }, 'variables': { 'jni_gen_package': 'content/shell', }, @@ -1441,7 +1618,6 @@ ], 'variables': { 'test_suite_name': 'video_decode_accelerator_unittest', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)', }, 'includes': [ '../build/apk_test.gypi' ], }, @@ -1455,11 +1631,6 @@ 'sources': [ 'public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java', ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/content/public/test', - ], - }, 'variables': { 'jni_gen_package': 'content/public/test', }, @@ -1505,7 +1676,7 @@ }, ], }], - ['OS!="android" and OS!="ios"', { + ['OS!="android" and OS!="ios" and OS!="linux"', { # npapi test plugin doesn't build on android or ios 'targets': [ { |