diff options
73 files changed, 132 insertions, 136 deletions
diff --git a/components/dom_distiller/content/DEPS b/components/dom_distiller/content/DEPS index 58162ae..d6b816f 100644 --- a/components/dom_distiller/content/DEPS +++ b/components/dom_distiller/content/DEPS @@ -2,7 +2,6 @@ include_rules = [ "+components/keyed_service", "+content/public", "+content/shell", - "+content/test", "+net/base", "+net/test", "+ui/base/l10n", diff --git a/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc b/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc index 4c72eb7..5a240c2 100644 --- a/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc +++ b/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc @@ -8,8 +8,8 @@ #include "components/dom_distiller/content/distiller_page_web_contents.h" #include "components/dom_distiller/core/distiller_page.h" #include "content/public/browser/browser_context.h" +#include "content/public/test/content_browser_test.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" #include "net/test/embedded_test_server/embedded_test_server.h" using content::ContentBrowserTest; diff --git a/components/dom_distiller/standalone/DEPS b/components/dom_distiller/standalone/DEPS index d56a447..5fa9138 100644 --- a/components/dom_distiller/standalone/DEPS +++ b/components/dom_distiller/standalone/DEPS @@ -2,7 +2,6 @@ include_rules = [ "+components/dom_distiller/content", "+content/public", "+content/shell", - "+content/test", "+net", "+ui", ] diff --git a/components/dom_distiller/standalone/content_extractor.cc b/components/dom_distiller/standalone/content_extractor.cc index a3b37e8..6f16b01 100644 --- a/components/dom_distiller/standalone/content_extractor.cc +++ b/components/dom_distiller/standalone/content_extractor.cc @@ -19,8 +19,8 @@ #include "components/dom_distiller/core/task_tracker.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" +#include "content/public/test/content_browser_test.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" #include "net/dns/mock_host_resolver.h" #include "ui/base/resource/resource_bundle.h" diff --git a/content/app/mojo/mojo_browsertest.cc b/content/app/mojo/mojo_browsertest.cc index ce1fc95..f578b57 100644 --- a/content/app/mojo/mojo_browsertest.cc +++ b/content/app/mojo/mojo_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/test/content_browser_test.h" +#include "content/public/test/content_browser_test.h" #include "mojo/service_manager/service_manager.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc index 2fd8806..b380f96 100644 --- a/content/browser/accessibility/accessibility_win_browsertest.cc +++ b/content/browser/accessibility/accessibility_win_browsertest.cc @@ -17,10 +17,10 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" #include "content/test/accessibility_browser_test_utils.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "third_party/iaccessible2/ia2_api_all.h" #include "third_party/isimpledom/ISimpleDOMNode.h" diff --git a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc index 1ce26de..4bee21d 100644 --- a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc +++ b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc @@ -10,10 +10,10 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_widget_host_view.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" #include "content/test/accessibility_browser_test_utils.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "ui/accessibility/ax_node.h" #include "ui/accessibility/ax_tree.h" diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index e26dcff..cffb3b9 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc @@ -23,10 +23,10 @@ #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" #include "content/test/accessibility_browser_test_utils.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" // TODO(aboxhall): Create expectations on Android for these diff --git a/content/browser/bookmarklet_browsertest.cc b/content/browser/bookmarklet_browsertest.cc index 35523ee..9381962 100644 --- a/content/browser/bookmarklet_browsertest.cc +++ b/content/browser/bookmarklet_browsertest.cc @@ -5,10 +5,10 @@ #include "base/strings/string_util.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc index 16dfcfd..f8cb658 100644 --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc @@ -30,10 +30,10 @@ #include "content/public/common/drop_data.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" diff --git a/content/browser/child_process_security_policy_browsertest.cc b/content/browser/child_process_security_policy_browsertest.cc index c7cfe39..67d36e4 100644 --- a/content/browser/child_process_security_policy_browsertest.cc +++ b/content/browser/child_process_security_policy_browsertest.cc @@ -10,9 +10,9 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/render_process_host.h" #include "content/public/common/result_codes.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { diff --git a/content/browser/compositor/image_transport_factory_browsertest.cc b/content/browser/compositor/image_transport_factory_browsertest.cc index 766b52e..13998b5 100644 --- a/content/browser/compositor/image_transport_factory_browsertest.cc +++ b/content/browser/compositor/image_transport_factory_browsertest.cc @@ -6,7 +6,7 @@ #include "cc/output/context_provider.h" #include "content/browser/compositor/image_transport_factory.h" #include "content/public/browser/gpu_data_manager.h" -#include "content/test/content_browser_test.h" +#include "content/public/test/content_browser_test.h" #include "gpu/GLES2/gl2extchromium.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/content/browser/cross_site_transfer_browsertest.cc b/content/browser/cross_site_transfer_browsertest.cc index b04acc12..fff180d 100644 --- a/content/browser/cross_site_transfer_browsertest.cc +++ b/content/browser/cross_site_transfer_browsertest.cc @@ -11,12 +11,12 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/base/escape.h" #include "net/dns/mock_host_resolver.h" #include "net/url_request/url_request.h" diff --git a/content/browser/database_browsertest.cc b/content/browser/database_browsertest.cc index 373a06f..d3cc669 100644 --- a/content/browser/database_browsertest.cc +++ b/content/browser/database_browsertest.cc @@ -10,10 +10,10 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/device_orientation/device_inertial_sensor_browsertest.cc b/content/browser/device_orientation/device_inertial_sensor_browsertest.cc index a176f71..0dadba3 100644 --- a/content/browser/device_orientation/device_inertial_sensor_browsertest.cc +++ b/content/browser/device_orientation/device_inertial_sensor_browsertest.cc @@ -11,9 +11,9 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" namespace content { diff --git a/content/browser/devtools/renderer_overrides_handler_browsertest.cc b/content/browser/devtools/renderer_overrides_handler_browsertest.cc index 3759fc0..d869d9d 100644 --- a/content/browser/devtools/renderer_overrides_handler_browsertest.cc +++ b/content/browser/devtools/renderer_overrides_handler_browsertest.cc @@ -8,9 +8,9 @@ #include "content/browser/devtools/renderer_overrides_handler.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/web_contents.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" namespace content { diff --git a/content/browser/dom_storage/dom_storage_browsertest.cc b/content/browser/dom_storage/dom_storage_browsertest.cc index b2aa9f1..8d9e31d 100644 --- a/content/browser/dom_storage/dom_storage_browsertest.cc +++ b/content/browser/dom_storage/dom_storage_browsertest.cc @@ -7,9 +7,9 @@ #include "content/common/dom_storage/dom_storage_types.h" #include "content/public/common/content_paths.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" namespace content { diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc index 1bbef54..6aa94d9 100644 --- a/content/browser/download/download_browsertest.cc +++ b/content/browser/download/download_browsertest.cc @@ -25,6 +25,8 @@ #include "content/public/common/content_switches.h" #include "content/public/common/webplugininfo.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/download_test_observer.h" #include "content/public/test/test_file_error_injector.h" #include "content/public/test/test_utils.h" @@ -32,8 +34,6 @@ #include "content/shell/browser/shell_browser_context.h" #include "content/shell/browser/shell_download_manager_delegate.h" #include "content/shell/browser/shell_network_delegate.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" #include "content/test/net/url_request_slow_download_job.h" #include "net/test/spawned_test_server/spawned_test_server.h" diff --git a/content/browser/download/drag_download_file_browsertest.cc b/content/browser/download/drag_download_file_browsertest.cc index 5ea0e57..986171d 100644 --- a/content/browser/download/drag_download_file_browsertest.cc +++ b/content/browser/download/drag_download_file_browsertest.cc @@ -14,13 +14,13 @@ #include "content/public/browser/content_browser_client.h" #include "content/public/browser/power_save_blocker.h" #include "content/public/common/content_client.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/download_test_observer.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_browser_context.h" #include "content/shell/browser/shell_download_manager_delegate.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" #include "content/test/net/url_request_slow_download_job.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc index 11a0851..283e53a 100644 --- a/content/browser/download/mhtml_generation_browsertest.cc +++ b/content/browser/download/mhtml_generation_browsertest.cc @@ -8,10 +8,10 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "content/public/browser/web_contents.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/download/save_package_browsertest.cc b/content/browser/download/save_package_browsertest.cc index 3910332..2c7a652 100644 --- a/content/browser/download/save_package_browsertest.cc +++ b/content/browser/download/save_package_browsertest.cc @@ -4,9 +4,9 @@ #include "base/files/scoped_temp_dir.h" #include "content/browser/download/save_package.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" namespace content { diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc index a3a83ef..51fc416 100644 --- a/content/browser/fileapi/file_system_browsertest.cc +++ b/content/browser/fileapi/file_system_browsertest.cc @@ -13,9 +13,9 @@ #include "content/public/browser/storage_partition.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "webkit/browser/quota/quota_manager.h" using quota::QuotaManager; diff --git a/content/browser/frame_host/frame_tree_browsertest.cc b/content/browser/frame_host/frame_tree_browsertest.cc index 150abff..bc5f1cb 100644 --- a/content/browser/frame_host/frame_tree_browsertest.cc +++ b/content/browser/frame_host/frame_tree_browsertest.cc @@ -10,11 +10,11 @@ #include "content/public/browser/notification_types.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/dns/mock_host_resolver.h" namespace content { diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc index 4e1d007..cb1901f 100644 --- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc +++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc @@ -24,11 +24,11 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" #include "net/dns/mock_host_resolver.h" #include "net/test/spawned_test_server/spawned_test_server.h" diff --git a/content/browser/gpu/compositor_util_browsertest.cc b/content/browser/gpu/compositor_util_browsertest.cc index c43909f..7c52007 100644 --- a/content/browser/gpu/compositor_util_browsertest.cc +++ b/content/browser/gpu/compositor_util_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "content/browser/gpu/compositor_util.h" -#include "content/test/content_browser_test.h" +#include "content/public/test/content_browser_test.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc index e417375..b343f1a 100644 --- a/content/browser/gpu/gpu_ipc_browsertests.cc +++ b/content/browser/gpu/gpu_ipc_browsertests.cc @@ -11,7 +11,7 @@ #include "content/common/gpu/gpu_process_launch_causes.h" #include "content/public/browser/gpu_data_manager.h" #include "content/public/common/content_switches.h" -#include "content/test/content_browser_test.h" +#include "content/public/test/content_browser_test.h" #include "ui/gl/gl_switches.h" #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc index 5a23893..478a07b 100644 --- a/content/browser/indexed_db/indexed_db_browsertest.cc +++ b/content/browser/indexed_db/indexed_db_browsertest.cc @@ -21,9 +21,9 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "webkit/browser/database/database_util.h" #include "webkit/browser/quota/quota_manager.h" diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc index 239da69..9836d04 100644 --- a/content/browser/loader/resource_dispatcher_host_browsertest.cc +++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc @@ -12,12 +12,12 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/browser/shell_network_delegate.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_failed_job.h" #include "content/test/net/url_request_mock_http_job.h" #include "net/base/net_errors.h" diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc index d9ef168..f284add 100644 --- a/content/browser/media/media_browsertest.cc +++ b/content/browser/media/media_browsertest.cc @@ -9,8 +9,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" // TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) && _MSC_VER == 1700 diff --git a/content/browser/media/media_browsertest.h b/content/browser/media/media_browsertest.h index 8bffb3d..b242db3 100644 --- a/content/browser/media/media_browsertest.h +++ b/content/browser/media/media_browsertest.h @@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "content/test/content_browser_test.h" +#include "content/public/test/content_browser_test.h" namespace content { diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc index 2002124..4a5b5a8 100644 --- a/content/browser/media/media_canplaytype_browsertest.cc +++ b/content/browser/media/media_canplaytype_browsertest.cc @@ -6,8 +6,8 @@ #include "content/browser/media/media_browsertest.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" const char* kProbably = "probably"; const char* kMaybe = "maybe"; diff --git a/content/browser/media/webrtc_aecdump_browsertest.cc b/content/browser/media/webrtc_aecdump_browsertest.cc index ff8cd14..2a4d8ea 100644 --- a/content/browser/media/webrtc_aecdump_browsertest.cc +++ b/content/browser/media/webrtc_aecdump_browsertest.cc @@ -11,8 +11,8 @@ #include "base/test/trace_event_analyzer.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/webrtc_content_browsertest_base.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index 62b50da..cec4227 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -9,9 +9,9 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/webrtc_content_browsertest_base.h" #include "media/audio/audio_manager.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc index 62aadb8..03493c0 100644 --- a/content/browser/media/webrtc_getusermedia_browsertest.cc +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc @@ -12,9 +12,9 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/webrtc_content_browsertest_base.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/perf/perf_test.h" diff --git a/content/browser/media/webrtc_internals_browsertest.cc b/content/browser/media/webrtc_internals_browsertest.cc index ed2a0da..8e071c7 100644 --- a/content/browser/media/webrtc_internals_browsertest.cc +++ b/content/browser/media/webrtc_internals_browsertest.cc @@ -9,9 +9,9 @@ #include "base/values.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" using std::string; diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc index 9c37d50..4fe4b13 100644 --- a/content/browser/plugin_browsertest.cc +++ b/content/browser/plugin_browsertest.cc @@ -12,11 +12,11 @@ #include "content/public/browser/resource_dispatcher_host_delegate.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" #include "content/shell/common/shell_switches.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/url_request/url_request.h" diff --git a/content/browser/plugin_data_remover_impl_browsertest.cc b/content/browser/plugin_data_remover_impl_browsertest.cc index 8308a51..3dfe492 100644 --- a/content/browser/plugin_data_remover_impl_browsertest.cc +++ b/content/browser/plugin_data_remover_impl_browsertest.cc @@ -10,9 +10,9 @@ #include "content/browser/plugin_data_remover_impl.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" +#include "content/public/test/content_browser_test.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" namespace content { diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc index e99f3e5..44f4754 100644 --- a/content/browser/plugin_service_impl_browsertest.cc +++ b/content/browser/plugin_service_impl_browsertest.cc @@ -13,10 +13,10 @@ #include "content/public/browser/resource_context.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" +#include "content/public/test/content_browser_test.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" #include "testing/gmock/include/gmock/gmock.h" namespace content { diff --git a/content/browser/renderer_host/input/touch_action_browsertest.cc b/content/browser/renderer_host/input/touch_action_browsertest.cc index 61a0516..46d693e 100644 --- a/content/browser/renderer_host/input/touch_action_browsertest.cc +++ b/content/browser/renderer_host/input/touch_action_browsertest.cc @@ -22,10 +22,10 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/events/event_switches.h" #include "ui/events/latency_info.h" diff --git a/content/browser/renderer_host/input/touch_input_browsertest.cc b/content/browser/renderer_host/input/touch_input_browsertest.cc index 5154473..59a3625 100644 --- a/content/browser/renderer_host/input/touch_input_browsertest.cc +++ b/content/browser/renderer_host/input/touch_input_browsertest.cc @@ -13,9 +13,9 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/common/content_switches.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/events/event_switches.h" #include "ui/events/latency_info.h" diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc index ef59bf5..b1c89a5 100644 --- a/content/browser/renderer_host/render_process_host_browsertest.cc +++ b/content/browser/renderer_host/render_process_host_browsertest.cc @@ -9,9 +9,9 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" namespace content { diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc index 3d2253b..b26d355 100644 --- a/content/browser/renderer_host/render_view_host_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_browsertest.cc @@ -15,9 +15,9 @@ #include "content/public/common/content_paths.h" #include "content/public/common/frame_navigate_params.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/base/host_port_pair.h" #include "net/base/net_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/renderer_host/render_widget_host_browsertest.cc b/content/browser/renderer_host/render_widget_host_browsertest.cc index 32715e8..47e5981 100644 --- a/content/browser/renderer_host/render_widget_host_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_browsertest.cc @@ -7,9 +7,9 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_paths.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc index 648acfb..efe7f6a 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -19,9 +19,9 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "media/base/video_frame.h" #include "media/filters/skcanvas_video_renderer.h" #include "net/base/net_util.h" diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc index a5896f4..9fadec0 100644 --- a/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc @@ -15,10 +15,10 @@ #include "content/public/browser/storage_partition.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" namespace content { diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc index b833a0f..a0a526d 100644 --- a/content/browser/service_worker/service_worker_browsertest.cc +++ b/content/browser/service_worker/service_worker_browsertest.cc @@ -22,9 +22,9 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" namespace content { diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index c1f0565..c4054b4 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc @@ -11,10 +11,10 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index 416b0dc..e90ec66 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc @@ -13,10 +13,10 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/dns/mock_host_resolver.h" #include "url/gurl.h" diff --git a/content/browser/speech/input_tag_speech_browsertest.cc b/content/browser/speech/input_tag_speech_browsertest.cc index 10c1878..53529c4 100644 --- a/content/browser/speech/input_tag_speech_browsertest.cc +++ b/content/browser/speech/input_tag_speech_browsertest.cc @@ -16,11 +16,11 @@ #include "content/public/common/speech_recognition_error.h" #include "content/public/common/speech_recognition_result.h" #include "content/public/common/url_constants.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/fake_speech_recognition_manager.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "third_party/WebKit/public/web/WebInputEvent.h" namespace content { diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index f97d222..e734843 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_browsertest.cc @@ -15,10 +15,10 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/mock_google_streaming_server.h" #include "media/audio/mock_audio_manager.h" #include "media/audio/test_audio_input_controller_factory.h" diff --git a/content/browser/tracing/tracing_controller_browsertest.cc b/content/browser/tracing/tracing_controller_browsertest.cc index 8449486..36f0dce 100644 --- a/content/browser/tracing/tracing_controller_browsertest.cc +++ b/content/browser/tracing/tracing_controller_browsertest.cc @@ -6,9 +6,9 @@ #include "base/run_loop.h" #include "content/browser/tracing/tracing_controller_impl.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" namespace content { diff --git a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc index 876e3db..2a42dda 100644 --- a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc +++ b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc @@ -15,10 +15,10 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc index f89a2ba..0754799 100644 --- a/content/browser/web_contents/web_contents_impl_browsertest.cc +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc @@ -16,10 +16,10 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/common/content_paths.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc index 016372c..9b0b16b 100644 --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc @@ -21,10 +21,10 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" diff --git a/content/browser/webkit_browsertest.cc b/content/browser/webkit_browsertest.cc index 5394f5b..d4b60158 100644 --- a/content/browser/webkit_browsertest.cc +++ b/content/browser/webkit_browsertest.cc @@ -4,9 +4,9 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/web_contents.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_abort_on_end_job.h" namespace content { diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc index 0926a21..d1ece80 100644 --- a/content/browser/webui/web_ui_mojo_browsertest.cc +++ b/content/browser/webui/web_ui_mojo_browsertest.cc @@ -18,8 +18,8 @@ #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_utils.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/test/data/web_ui_test_mojo_bindings.mojom.h" #include "grit/content_resources.h" #include "mojo/public/bindings/js/constants.h" diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index 4884d03..fd352eb 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -16,12 +16,12 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/content_paths.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/base/test_data_directory.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "url/gurl.h" diff --git a/content/child/site_isolation_policy_browsertest.cc b/content/child/site_isolation_policy_browsertest.cc index 15cd06e..20d14eff 100644 --- a/content/child/site_isolation_policy_browsertest.cc +++ b/content/child/site_isolation_policy_browsertest.cc @@ -5,8 +5,8 @@ #include "base/command_line.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" namespace content { diff --git a/content/common/gpu/client/context_provider_command_buffer_browsertest.cc b/content/common/gpu/client/context_provider_command_buffer_browsertest.cc index eb552e5..d6378ad 100644 --- a/content/common/gpu/client/context_provider_command_buffer_browsertest.cc +++ b/content/common/gpu/client/context_provider_command_buffer_browsertest.cc @@ -5,7 +5,7 @@ #include "content/browser/gpu/browser_gpu_channel_host_factory.h" #include "content/common/gpu/client/context_provider_command_buffer.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" -#include "content/test/content_browser_test.h" +#include "content/public/test/content_browser_test.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 03b8b44..e0dea47 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -911,16 +911,13 @@ 'content.gyp:content_browser', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', - '../ui/accessibility/accessibility.gyp:ax_gen', ], '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', + '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', ], }, { @@ -1078,6 +1075,8 @@ '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/webui_resource_browsertest.cc', diff --git a/content/test/content_browser_test.cc b/content/public/test/content_browser_test.cc index 41df7f7..8d26969 100644 --- a/content/test/content_browser_test.cc +++ b/content/public/test/content_browser_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/test/content_browser_test.h" +#include "content/public/test/content_browser_test.h" #include "base/command_line.h" #include "base/files/file_path.h" diff --git a/content/test/content_browser_test.h b/content/public/test/content_browser_test.h index d59c296..7fa9d34 100644 --- a/content/test/content_browser_test.h +++ b/content/public/test/content_browser_test.h @@ -2,20 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_TEST_CONTENT_BROWSER_TEST_H_ -#define CONTENT_TEST_CONTENT_BROWSER_TEST_H_ +#ifndef CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ +#define CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ #include "base/memory/scoped_ptr.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_base.h" -class GURL; - namespace content { -class ContentRendererClient; class Shell; class ShellMainDelegate; +// Base class for browser tests which use content_shell. class ContentBrowserTest : public BrowserTestBase { protected: ContentBrowserTest(); @@ -52,4 +50,4 @@ class ContentBrowserTest : public BrowserTestBase { } // namespace content -#endif // CONTENT_TEST_CONTENT_BROWSER_TEST_H_ +#endif // CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_H_ diff --git a/content/test/content_browser_test_utils.cc b/content/public/test/content_browser_test_utils.cc index 083f404..44e5089 100644 --- a/content/test/content_browser_test_utils.cc +++ b/content/public/test/content_browser_test_utils.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/test/content_browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "base/bind.h" #include "base/files/file_path.h" diff --git a/content/test/content_browser_test_utils.h b/content/public/test/content_browser_test_utils.h index 09f44b8..2afc936 100644 --- a/content/test/content_browser_test_utils.h +++ b/content/public/test/content_browser_test_utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_H_ -#define CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_H_ +#ifndef CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_UTILS_H_ +#define CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_UTILS_H_ #include "base/memory/ref_counted.h" #include "ui/gfx/native_widget_types.h" @@ -17,7 +17,8 @@ namespace gfx { class Rect; } -// A collections of functions designed for use with content_browsertests. +// A collections of functions designed for use with content_shell based browser +// tests. // Note: if a function here also works with browser_tests, it should be in // content\public\test\browser_test_utils.h @@ -77,4 +78,4 @@ void SetWindowBounds(gfx::NativeWindow window, const gfx::Rect& bounds); } // namespace content -#endif // CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_H_ +#endif // CONTENT_PUBLIC_TEST_CONTENT_BROWSER_TEST_UTILS_H_ diff --git a/content/test/content_browser_test_utils_mac.mm b/content/public/test/content_browser_test_utils_mac.mm index d850890..629f63f 100644 --- a/content/test/content_browser_test_utils_mac.mm +++ b/content/public/test/content_browser_test_utils_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/test/content_browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include <Carbon/Carbon.h> #import <Cocoa/Cocoa.h> diff --git a/content/renderer/browser_render_view_browsertest.cc b/content/renderer/browser_render_view_browsertest.cc index 3557f6f..1172d02 100644 --- a/content/renderer/browser_render_view_browsertest.cc +++ b/content/renderer/browser_render_view_browsertest.cc @@ -19,14 +19,14 @@ #include "content/public/common/content_switches.h" #include "content/public/renderer/render_view.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" #include "content/shell/browser/shell_browser_context.h" #include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/common/shell_content_client.h" #include "content/shell/renderer/shell_content_renderer_client.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/base/net_errors.h" #include "net/disk_cache/disk_cache.h" #include "net/http/failing_http_transaction_factory.h" diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index f3861b2..7ecb34c 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -13,11 +13,11 @@ #include "content/public/common/content_switches.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_observer.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/renderer/savable_resources.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" #include "net/url_request/url_request_context.h" #include "third_party/WebKit/public/platform/WebCString.h" diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc index 03efe3f..667bacf 100644 --- a/content/renderer/resource_fetcher_browsertest.cc +++ b/content/renderer/resource_fetcher_browsertest.cc @@ -13,10 +13,10 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/renderer/render_view.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" diff --git a/content/renderer/savable_resources_browsertest.cc b/content/renderer/savable_resources_browsertest.cc index aa7b728..344dbe4 100644 --- a/content/renderer/savable_resources_browsertest.cc +++ b/content/renderer/savable_resources_browsertest.cc @@ -8,10 +8,10 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "content/public/renderer/render_view.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/renderer/savable_resources.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" namespace content { diff --git a/content/test/content_browser_test_test.cc b/content/test/content_browser_test_test.cc index 21b4543..1714f0b 100644 --- a/content/test/content_browser_test_test.cc +++ b/content/test/content_browser_test_test.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/test/content_browser_test.h" +#include "content/public/test/content_browser_test.h" #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { diff --git a/content/test/webrtc_content_browsertest_base.cc b/content/test/webrtc_content_browsertest_base.cc index b52a68e..e3f7191 100644 --- a/content/test/webrtc_content_browsertest_base.cc +++ b/content/test/webrtc_content_browsertest_base.cc @@ -9,8 +9,8 @@ #include "base/strings/utf_string_conversions.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test_utils.h" namespace content { diff --git a/content/test/webrtc_content_browsertest_base.h b/content/test/webrtc_content_browsertest_base.h index 8d0112c..16745f7 100644 --- a/content/test/webrtc_content_browsertest_base.h +++ b/content/test/webrtc_content_browsertest_base.h @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/test/content_browser_test.h" +#include "content/public/test/content_browser_test.h" namespace base { class CommandLine; diff --git a/content/test/webui_resource_browsertest.cc b/content/test/webui_resource_browsertest.cc index 18ee37e..011b141 100644 --- a/content/test/webui_resource_browsertest.cc +++ b/content/test/webui_resource_browsertest.cc @@ -8,9 +8,9 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_paths.h" #include "content/public/test/browser_test_utils.h" +#include "content/public/test/content_browser_test.h" +#include "content/public/test/content_browser_test_utils.h" #include "content/shell/browser/shell.h" -#include "content/test/content_browser_test.h" -#include "content/test/content_browser_test_utils.h" #include "grit/content_resources.h" #include "grit/webui_resources.h" #include "net/base/net_util.h" |