Skip to content

GitLab

T
tangled
Commit c53ecc72 authored by jam@chromium.org's avatar jam@chromium.org
Browse files
Options

Move the corresponding cc files from content\test to be alongside their... 

Move the corresponding cc files from content\test to be alongside their headers in content\public\test, now that DEPS supports fine-grained exceptions.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10826311

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151523 0039d316-1c4b-4281-b951-d872f2087c98
parent d378f198
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 26 deletions
content/content_tests.gypi
View file @ c53ecc72
......@@ -26,32 +26,57 @@
'..',
],
'sources': [
'public/test/accessibility_test_utils_win.cc',
'public/test/accessibility_test_utils_win.h',
'public/test/browser_test.h',
'public/test/browser_test_base.cc',
'public/test/browser_test_base.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/js_injection_ready_observer.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/render_view_fake_resources_test.cc',
'public/test/render_view_fake_resources_test.h',
'public/test/render_view_test.cc',
'public/test/render_view_test.h',
'public/test/render_widget_browsertest.cc',
'public/test/render_widget_browsertest.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_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_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
......@@ -77,29 +102,18 @@
'common/test_url_constants.h',
'gpu/gpu_idirect3d9_mock_win.cc',
'gpu/gpu_idirect3d9_mock_win.h',
'test/accessibility_test_utils_win.cc',
'test/browser_test_base.cc',
'test/browser_test_utils.cc',
'test/content_test_suite.cc',
'test/content_test_suite.h',
'test/content_test_suite_base.cc',
'test/download_test_observer.cc',
'test/gpu/gpu_test_config.cc',
'test/gpu/gpu_test_config.h',
'test/gpu/gpu_test_expectations_parser.cc',
'test/gpu/gpu_test_expectations_parser.h',
'test/mock_download_item.cc',
'test/mock_download_manager.cc',
'test/mock_keyboard.cc',
'test/mock_keyboard_driver_win.cc',
'test/mock_keyboard_driver_win.h',
'test/mock_keyboard.h',
'test/mock_notification_observer.cc',
'test/mock_render_process.cc',
'test/mock_render_process.h',
'test/mock_render_process_host.cc',
'test/mock_render_thread.cc',
'test/mock_resource_context.cc',
'test/net/url_request_failed_job.cc',
'test/net/url_request_failed_job.h',
'test/net/url_request_mock_http_job.cc',
......@@ -110,28 +124,14 @@
'test/net/url_request_slow_http_job.h',
'test/net/url_request_abort_on_end_job.cc',
'test/net/url_request_abort_on_end_job.h',
'test/render_view_fake_resources_test.cc',
'test/render_view_test.cc',
'test/render_widget_browsertest.cc',
'test/test_browser_context.cc',
'test/test_browser_thread.cc',
'test/test_content_browser_client.cc',
'test/test_content_browser_client.h',
'test/test_content_client.cc',
'test/test_content_client.h',
'test/test_content_client_initializer.cc',
'test/test_file_error_injector.cc',
'test/test_navigation_observer.cc',
'test/test_notification_tracker.cc',
'test/test_renderer_host.cc',
'test/test_render_view_host_factory.cc',
'test/test_render_view_host_factory.h',
'test/test_launcher.cc',
'test/test_utils.cc',
'test/test_web_contents_view.cc',
'test/test_web_contents_view.h',
'test/unittest_test_suite.cc',
'test/web_contents_tester.cc',
# TODO(phajdan.jr): Those files should be moved to webkit
# test support target.
......
content/public/test/DEPS
View file @ c53ecc72
......@@ -2,3 +2,13 @@ include_rules = [
"-content",
"+content/public",
]
# Ensure we don't leak internal content headers through public headers.
specific_include_rules = {
".*\.cc": [
# Testing utilities can access anything in content/
"+content",
"+media/base",
"+third_party/iaccessible2",
],
}
content/test/DEPS
View file @ c53ecc72
......@@ -2,7 +2,6 @@ include_rules = [
# Testing utilities can access anything in content/
"+content",
"+media/base", # For ChannelLayout in WebRTC tests.
"+third_party/iaccessible2",
"+ui/aura/test/test_aura_initializer.h",
"+ui/base/resource/data_pack.h",
]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment