Chromium Code Reviews| Index: content/content_tests.gypi |
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
| index 725f69afa7c2b6b511348b14e38ff92a466250b2..5ec8a6849c1363ef33fb865feba72d30f08d6497 100644 |
| --- a/content/content_tests.gypi |
| +++ b/content/content_tests.gypi |
| @@ -3,8 +3,173 @@ |
| # found in the LICENSE file. |
| { |
| + 'variables': { |
| + 'layouttest_support_content_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', |
| + ], |
| + 'test_support_content_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', |
| + 'public/test/browser_test_utils.cc', |
| + 'public/test/browser_test_utils.h', |
| + 'public/test/content_test_suite_base.cc', |
| + 'public/test/content_test_suite_base.h', |
| + 'public/test/download_test_observer.cc', |
| + 'public/test/download_test_observer.h', |
| + 'public/test/fake_speech_recognition_manager.cc', |
| + 'public/test/fake_speech_recognition_manager.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', |
| + 'public/test/mock_download_manager.h', |
| + 'public/test/mock_notification_observer.cc', |
| + 'public/test/mock_notification_observer.h', |
| + 'public/test/mock_render_process_host.cc', |
| + 'public/test/mock_render_process_host.h', |
| + 'public/test/mock_render_thread.cc', |
| + 'public/test/mock_render_thread.h', |
| + 'public/test/mock_resource_context.cc', |
| + 'public/test/mock_resource_context.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', |
| + 'public/test/render_widget_test.h', |
| + 'public/test/sandbox_file_system_test_helper.cc', |
| + 'public/test/sandbox_file_system_test_helper.h', |
| + 'public/test/test_browser_context.cc', |
| + 'public/test/test_browser_context.h', |
| + 'public/test/test_browser_thread.cc', |
| + 'public/test/test_browser_thread.h', |
| + 'public/test/test_browser_thread_bundle.cc', |
| + 'public/test/test_browser_thread_bundle.h', |
| + 'public/test/test_content_client_initializer.cc', |
| + 'public/test/test_content_client_initializer.h', |
| + 'public/test/test_file_error_injector.cc', |
| + 'public/test/test_file_error_injector.h', |
| + 'public/test/test_file_system_backend.cc', |
| + 'public/test/test_file_system_backend.h', |
| + 'public/test/test_file_system_context.cc', |
| + 'public/test/test_file_system_context.h', |
| + 'public/test/test_file_system_options.cc', |
| + 'public/test/test_file_system_options.h', |
| + 'public/test/test_launcher.cc', |
| + 'public/test/test_launcher.h', |
| + 'public/test/test_navigation_observer.cc', |
| + 'public/test/test_navigation_observer.h', |
| + 'public/test/test_notification_tracker.cc', |
| + 'public/test/test_notification_tracker.h', |
| + 'public/test/test_renderer_host.cc', |
| + 'public/test/test_renderer_host.h', |
| + 'public/test/test_utils.cc', |
| + 'public/test/test_utils.h', |
| + 'public/test/unittest_test_suite.cc', |
| + 'public/test/unittest_test_suite.h', |
| + 'public/test/web_contents_tester.cc', |
| + 'public/test/web_contents_tester.h', |
| + 'app/startup_helper_win.cc', |
| + # TODO(phajdan.jr): All of those files should live in content/test (if |
| + # they're only used by content) or content/public/test (if they're used |
| + # by other embedders). |
| + 'browser/download/mock_download_file.cc', |
| + 'browser/download/mock_download_file.h', |
| + 'browser/geolocation/fake_access_token_store.cc', |
| + 'browser/geolocation/fake_access_token_store.h', |
| + 'browser/geolocation/mock_location_arbitrator.cc', |
| + 'browser/geolocation/mock_location_arbitrator.h', |
| + 'browser/geolocation/mock_location_provider.cc', |
| + 'browser/geolocation/mock_location_provider.h', |
| + 'browser/renderer_host/compositing_iosurface_shader_programs_mac.cc', |
| + 'browser/renderer_host/compositing_iosurface_shader_programs_mac.h', |
| + 'browser/renderer_host/compositing_iosurface_transformer_mac.cc', |
| + 'browser/renderer_host/compositing_iosurface_transformer_mac.h', |
| + 'browser/renderer_host/media/mock_media_observer.cc', |
| + 'browser/renderer_host/media/mock_media_observer.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/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', |
| + 'test/mock_keyboard.h', |
| + 'test/mock_keyboard_driver_win.cc', |
| + 'test/mock_keyboard_driver_win.h', |
| + 'test/mock_render_process.cc', |
| + 'test/mock_render_process.h', |
| + 'test/mock_webclipboard_impl.cc', |
| + 'test/mock_webclipboard_impl.h', |
| + 'test/mock_webframeclient.h', |
| + 'test/mock_weburlloader.cc', |
| + 'test/mock_weburlloader.h', |
| + 'test/net/url_request_abort_on_end_job.cc', |
| + 'test/net/url_request_abort_on_end_job.h', |
| + 'test/net/url_request_failed_job.cc', |
| + 'test/net/url_request_failed_job.h', |
| + 'test/net/url_request_mock_http_job.cc', |
| + 'test/net/url_request_mock_http_job.h', |
| + 'test/net/url_request_prepackaged_interceptor.cc', |
| + 'test/net/url_request_prepackaged_interceptor.h', |
| + 'test/net/url_request_slow_download_job.cc', |
| + 'test/net/url_request_slow_download_job.h', |
| + 'test/ppapi_unittest.cc', |
| + 'test/ppapi_unittest.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_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', |
| + 'test/test_render_frame_host_factory.h', |
| + 'test/test_render_view_host.cc', |
| + 'test/test_render_view_host.h', |
| + 'test/test_render_view_host_factory.cc', |
| + 'test/test_render_view_host_factory.h', |
| + 'test/test_web_contents.cc', |
| + 'test/test_web_contents.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/webkit_support.cc', |
| + 'test/webkit_support.h', |
| + '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', |
| + ] |
| + }, |
| 'targets': [ |
| { |
| +# GN version: //content/test:layouttest_support |
|
brettw
2014/06/30 17:26:06
I normally indent this with the 'target_name'. Sam
|
| 'target_name': 'layouttest_support_content', |
| 'type': 'static_library', |
| 'conditions': [ |
| @@ -25,20 +190,12 @@ |
| '..', |
| '<(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', |
| - ], |
| + 'sources': [ '<@(layouttest_support_content_sources)' ] |
| }], |
| ], |
| }, |
| { |
| +# GN version: //content/test:test_support |
| 'target_name': 'test_support_content', |
| 'type': 'static_library', |
| 'dependencies': [ |
| @@ -65,158 +222,7 @@ |
| 'include_dirs': [ |
| '..', |
| ], |
| - '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', |
| - 'public/test/browser_test_utils.cc', |
| - 'public/test/browser_test_utils.h', |
| - 'public/test/content_test_suite_base.cc', |
| - 'public/test/content_test_suite_base.h', |
| - 'public/test/download_test_observer.cc', |
| - 'public/test/download_test_observer.h', |
| - 'public/test/fake_speech_recognition_manager.cc', |
| - 'public/test/fake_speech_recognition_manager.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', |
| - 'public/test/mock_download_manager.h', |
| - 'public/test/mock_notification_observer.cc', |
| - 'public/test/mock_notification_observer.h', |
| - 'public/test/mock_render_process_host.cc', |
| - 'public/test/mock_render_process_host.h', |
| - 'public/test/mock_render_thread.cc', |
| - 'public/test/mock_render_thread.h', |
| - 'public/test/mock_resource_context.cc', |
| - 'public/test/mock_resource_context.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', |
| - 'public/test/render_widget_test.h', |
| - 'public/test/sandbox_file_system_test_helper.cc', |
| - 'public/test/sandbox_file_system_test_helper.h', |
| - 'public/test/test_browser_context.cc', |
| - 'public/test/test_browser_context.h', |
| - 'public/test/test_browser_thread.cc', |
| - 'public/test/test_browser_thread.h', |
| - 'public/test/test_browser_thread_bundle.cc', |
| - 'public/test/test_browser_thread_bundle.h', |
| - 'public/test/test_content_client_initializer.cc', |
| - 'public/test/test_content_client_initializer.h', |
| - 'public/test/test_file_error_injector.cc', |
| - 'public/test/test_file_error_injector.h', |
| - 'public/test/test_file_system_backend.cc', |
| - 'public/test/test_file_system_backend.h', |
| - 'public/test/test_file_system_context.cc', |
| - 'public/test/test_file_system_context.h', |
| - 'public/test/test_file_system_options.cc', |
| - 'public/test/test_file_system_options.h', |
| - 'public/test/test_launcher.cc', |
| - 'public/test/test_launcher.h', |
| - 'public/test/test_navigation_observer.cc', |
| - 'public/test/test_navigation_observer.h', |
| - 'public/test/test_notification_tracker.cc', |
| - 'public/test/test_notification_tracker.h', |
| - 'public/test/test_renderer_host.cc', |
| - 'public/test/test_renderer_host.h', |
| - 'public/test/test_utils.cc', |
| - 'public/test/test_utils.h', |
| - 'public/test/unittest_test_suite.cc', |
| - 'public/test/unittest_test_suite.h', |
| - 'public/test/web_contents_tester.cc', |
| - 'public/test/web_contents_tester.h', |
| - 'app/startup_helper_win.cc', |
| - # TODO(phajdan.jr): All of those files should live in content/test (if |
| - # they're only used by content) or content/public/test (if they're used |
| - # by other embedders). |
| - 'browser/download/mock_download_file.cc', |
| - 'browser/download/mock_download_file.h', |
| - 'browser/geolocation/fake_access_token_store.cc', |
| - 'browser/geolocation/fake_access_token_store.h', |
| - 'browser/geolocation/mock_location_arbitrator.cc', |
| - 'browser/geolocation/mock_location_arbitrator.h', |
| - 'browser/geolocation/mock_location_provider.cc', |
| - 'browser/geolocation/mock_location_provider.h', |
| - 'browser/renderer_host/compositing_iosurface_shader_programs_mac.cc', |
| - 'browser/renderer_host/compositing_iosurface_shader_programs_mac.h', |
| - 'browser/renderer_host/compositing_iosurface_transformer_mac.cc', |
| - 'browser/renderer_host/compositing_iosurface_transformer_mac.h', |
| - 'browser/renderer_host/media/mock_media_observer.cc', |
| - 'browser/renderer_host/media/mock_media_observer.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/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', |
| - 'test/mock_keyboard.h', |
| - 'test/mock_keyboard_driver_win.cc', |
| - 'test/mock_keyboard_driver_win.h', |
| - 'test/mock_render_process.cc', |
| - 'test/mock_render_process.h', |
| - 'test/mock_webclipboard_impl.cc', |
| - 'test/mock_webclipboard_impl.h', |
| - 'test/mock_webframeclient.h', |
| - 'test/mock_weburlloader.cc', |
| - 'test/mock_weburlloader.h', |
| - 'test/net/url_request_abort_on_end_job.cc', |
| - 'test/net/url_request_abort_on_end_job.h', |
| - 'test/net/url_request_failed_job.cc', |
| - 'test/net/url_request_failed_job.h', |
| - 'test/net/url_request_mock_http_job.cc', |
| - 'test/net/url_request_mock_http_job.h', |
| - 'test/net/url_request_prepackaged_interceptor.cc', |
| - 'test/net/url_request_prepackaged_interceptor.h', |
| - 'test/net/url_request_slow_download_job.cc', |
| - 'test/net/url_request_slow_download_job.h', |
| - 'test/ppapi_unittest.cc', |
| - 'test/ppapi_unittest.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_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', |
| - 'test/test_render_frame_host_factory.h', |
| - 'test/test_render_view_host.cc', |
| - 'test/test_render_view_host.h', |
| - 'test/test_render_view_host_factory.cc', |
| - 'test/test_render_view_host_factory.h', |
| - 'test/test_web_contents.cc', |
| - 'test/test_web_contents.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/webkit_support.cc', |
| - 'test/webkit_support.h', |
| - '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', |
| - ], |
| + 'sources': [ '<@(test_support_content_sources)' ], |
| 'conditions': [ |
| ['enable_plugins==0', { |
| 'sources!': [ |