diff options
25 files changed, 37 insertions, 37 deletions
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc index f223c602..aac9b6c 100644 --- a/content/browser/devtools/devtools_manager_unittest.cc +++ b/content/browser/devtools/devtools_manager_unittest.cc @@ -7,7 +7,6 @@ #include "base/time/time.h" #include "content/browser/devtools/devtools_manager_impl.h" #include "content/browser/devtools/render_view_devtools_agent_host.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/common/view_messages.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/devtools_agent_host.h" @@ -16,6 +15,7 @@ #include "content/public/browser/devtools_external_agent_proxy_delegate.h" #include "content/public/browser/web_contents_delegate.h" #include "content/test/test_content_browser_client.h" +#include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc index 3045c42..47fd1b4 100644 --- a/content/browser/download/save_package_unittest.cc +++ b/content/browser/download/save_package_unittest.cc @@ -10,8 +10,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/download/save_package.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/test/net/url_request_mock_http_job.h" +#include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc index 30475ec..c68e199 100644 --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc @@ -14,7 +14,6 @@ #include "content/browser/frame_host/navigation_controller_impl.h" #include "content/browser/frame_host/navigation_entry_impl.h" #include "content/browser/frame_host/navigation_entry_screenshot_manager.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/common/view_messages.h" @@ -29,6 +28,7 @@ #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_notification_tracker.h" #include "content/public/test/test_utils.h" +#include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" #include "net/base/net_util.h" #include "skia/ext/platform_canvas.h" diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc index f7f3a81..2ba5fb8 100644 --- a/content/browser/frame_host/render_frame_host_manager_unittest.cc +++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc @@ -6,7 +6,6 @@ #include "content/browser/frame_host/navigation_controller_impl.h" #include "content/browser/frame_host/navigation_entry_impl.h" #include "content/browser/frame_host/render_frame_host_manager.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" #include "content/browser/webui/web_ui_controller_factory_registry.h" #include "content/common/view_messages.h" @@ -28,6 +27,7 @@ #include "content/public/test/test_notification_tracker.h" #include "content/test/test_content_browser_client.h" #include "content/test/test_content_client.h" +#include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc index 8bf1450..12d5042 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc +++ b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc @@ -10,11 +10,11 @@ #include "content/browser/renderer_host/input/synthetic_pinch_gesture.h" #include "content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h" #include "content/browser/renderer_host/render_widget_host_delegate.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/common/input/input_event.h" #include "content/common/input/synthetic_smooth_scroll_gesture_params.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_context.h" +#include "content/test/test_render_view_host.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/gfx/point_f.h" diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc index 7b00597..34bb833 100644 --- a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc +++ b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc @@ -16,7 +16,6 @@ #include "content/browser/renderer_host/media/web_contents_capture_util.h" #include "content/browser/renderer_host/render_view_host_factory.h" #include "content/browser/renderer_host/render_widget_host_impl.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/port/browser/render_widget_host_view_frame_subscriber.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" @@ -24,6 +23,7 @@ #include "content/public/test/test_browser_context.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" +#include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" #include "media/base/video_util.h" #include "media/base/yuv_convert.h" diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 3196097..e81e67f 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -5,7 +5,6 @@ #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/child_process_security_policy_impl.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/common/input_messages.h" #include "content/common/view_messages.h" #include "content/port/browser/render_view_host_delegate_view.h" @@ -16,6 +15,7 @@ #include "content/public/common/url_constants.h" #include "content/public/test/mock_render_process_host.h" #include "content/test/test_content_browser_client.h" +#include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" #include "net/base/net_util.h" #include "third_party/WebKit/public/web/WebDragOperation.h" diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index 423c8fc..eba2dea 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -17,7 +17,6 @@ #include "content/browser/renderer_host/overscroll_controller.h" #include "content/browser/renderer_host/overscroll_controller_delegate.h" #include "content/browser/renderer_host/render_widget_host_delegate.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/common/input/synthetic_web_input_event_builders.h" #include "content/common/input_messages.h" #include "content/common/view_messages.h" @@ -29,6 +28,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_context.h" +#include "content/test/test_render_view_host.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" diff --git a/content/browser/renderer_host/render_widget_host_view_guest_unittest.cc b/content/browser/renderer_host/render_widget_host_view_guest_unittest.cc index a112634..b99743a 100644 --- a/content/browser/renderer_host/render_widget_host_view_guest_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_view_guest_unittest.cc @@ -8,11 +8,11 @@ #include "base/message_loop/message_loop.h" #include "content/browser/renderer_host/render_widget_host_delegate.h" #include "content/browser/renderer_host/render_widget_host_impl.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/common/view_messages.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_context.h" +#include "content/test/test_render_view_host.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm index 0a4b795..69252d4 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm @@ -9,7 +9,6 @@ #include "base/strings/utf_string_conversions.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/renderer_host/render_widget_host_delegate.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/common/gpu/gpu_messages.h" #include "content/common/input_messages.h" #include "content/common/view_messages.h" @@ -18,6 +17,7 @@ #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_context.h" #include "content/public/test/test_utils.h" +#include "content/test/test_render_view_host.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/test/cocoa_test_event_utils.h" diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc index 05b3ae7..ac3c192 100644 --- a/content/browser/site_instance_impl_unittest.cc +++ b/content/browser/site_instance_impl_unittest.cc @@ -12,7 +12,6 @@ #include "content/browser/frame_host/navigation_entry_impl.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/renderer_host/render_view_host_impl.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/browser/webui/web_ui_controller_factory_registry.h" @@ -26,6 +25,7 @@ #include "content/public/test/test_browser_thread.h" #include "content/test/test_content_browser_client.h" #include "content/test/test_content_client.h" +#include "content/test/test_render_view_host.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/url_util.h" diff --git a/content/browser/web_contents/web_contents_delegate_unittest.cc b/content/browser/web_contents/web_contents_delegate_unittest.cc index d5d60c3..0de5919 100644 --- a/content/browser/web_contents/web_contents_delegate_unittest.cc +++ b/content/browser/web_contents/web_contents_delegate_unittest.cc @@ -5,10 +5,10 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/test/test_browser_context.h" +#include "content/test/test_render_view_host.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc index 083dce0..7926b4c4 100644 --- a/content/browser/web_contents/web_contents_impl_unittest.cc +++ b/content/browser/web_contents/web_contents_impl_unittest.cc @@ -7,7 +7,6 @@ #include "content/browser/frame_host/interstitial_page_impl.h" #include "content/browser/frame_host/navigation_entry_impl.h" #include "content/browser/renderer_host/render_view_host_impl.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" #include "content/browser/webui/web_ui_controller_factory_registry.h" #include "content/common/view_messages.h" @@ -27,6 +26,7 @@ #include "content/public/test/test_utils.h" #include "content/test/test_content_browser_client.h" #include "content/test/test_content_client.h" +#include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/web_contents/web_drag_dest_mac_unittest.mm b/content/browser/web_contents/web_drag_dest_mac_unittest.mm index b79c118..a7dcede 100644 --- a/content/browser/web_contents/web_drag_dest_mac_unittest.mm +++ b/content/browser/web_contents/web_drag_dest_mac_unittest.mm @@ -6,9 +6,9 @@ #import "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "content/browser/renderer_host/test_render_view_host.h" #import "content/browser/web_contents/web_drag_dest_mac.h" #include "content/public/common/drop_data.h" +#include "content/test/test_render_view_host.h" #include "content/test/test_web_contents.h" #include "testing/gtest/include/gtest/gtest.h" #import "third_party/mozilla/NSPasteboard+Utils.h" diff --git a/content/content_tests.gypi b/content/content_tests.gypi index bb1a53f..c5eb0ee 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -108,12 +108,6 @@ 'browser/renderer_host/compositing_iosurface_transformer_mac.h', 'browser/renderer_host/media/mock_media_observer.cc', 'browser/renderer_host/media/mock_media_observer.h', - 'browser/renderer_host/test_backing_store.cc', - 'browser/renderer_host/test_backing_store.h', - 'browser/frame_host/test_render_frame_host.cc', - 'browser/frame_host/test_render_frame_host.h', - 'browser/renderer_host/test_render_view_host.cc', - 'browser/renderer_host/test_render_view_host.h', 'gpu/gpu_idirect3d9_mock_win.cc', 'gpu/gpu_idirect3d9_mock_win.h', 'test/content_test_suite.cc', @@ -144,14 +138,20 @@ '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_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_video_frame_provider.cc', diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc index 06986e6..a876c4f 100644 --- a/content/public/test/test_renderer_host.cc +++ b/content/public/test/test_renderer_host.cc @@ -8,13 +8,13 @@ #include "content/browser/frame_host/navigation_entry_impl.h" #include "content/browser/renderer_host/render_view_host_factory.h" #include "content/browser/renderer_host/render_widget_host_impl.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_context.h" #include "content/test/test_render_frame_host_factory.h" +#include "content/test/test_render_view_host.h" #include "content/test/test_render_view_host_factory.h" #include "content/test/test_web_contents.h" diff --git a/content/browser/renderer_host/test_backing_store.cc b/content/test/test_backing_store.cc index 74fa44d..e9415d2 100644 --- a/content/browser/renderer_host/test_backing_store.cc +++ b/content/test/test_backing_store.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/browser/renderer_host/test_backing_store.h" +#include "content/test/test_backing_store.h" namespace content { diff --git a/content/browser/renderer_host/test_backing_store.h b/content/test/test_backing_store.h index 4b76851..0ee09f5 100644 --- a/content/browser/renderer_host/test_backing_store.h +++ b/content/test/test_backing_store.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_BROWSER_RENDERER_HOST_TEST_TEST_BACKING_STORE_H_ -#define CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_BACKING_STORE_H_ +#ifndef CONTENT_TEST_TEST_BACKING_STORE_H_ +#define CONTENT_TEST_TEST_BACKING_STORE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -36,4 +36,4 @@ class TestBackingStore : public BackingStore { } // namespace content -#endif // CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_BACKING_STORE_H_ +#endif // CONTENT_TEST_TEST_BACKING_STORE_H_ diff --git a/content/browser/frame_host/test_render_frame_host.cc b/content/test/test_render_frame_host.cc index f833d08..263eb45 100644 --- a/content/browser/frame_host/test_render_frame_host.cc +++ b/content/test/test_render_frame_host.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/browser/frame_host/test_render_frame_host.h" +#include "content/test/test_render_frame_host.h" namespace content { diff --git a/content/browser/frame_host/test_render_frame_host.h b/content/test/test_render_frame_host.h index 68d7cd0..9f74e39 100644 --- a/content/browser/frame_host/test_render_frame_host.h +++ b/content/test/test_render_frame_host.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_BROWSER_FRAME_HOST_TEST_RENDER_FRAME_HOST_H_ -#define CONTENT_BROWSER_FRAME_HOST_TEST_RENDER_FRAME_HOST_H_ +#ifndef CONTENT_TEST_TEST_RENDER_FRAME_HOST_H_ +#define CONTENT_TEST_TEST_RENDER_FRAME_HOST_H_ #include "base/basictypes.h" #include "content/browser/frame_host/render_frame_host_impl.h" @@ -28,4 +28,4 @@ class TestRenderFrameHost : public RenderFrameHostImpl { } // namespace content -#endif // CONTENT_BROWSER_FRAME_HOST_TEST_RENDER_FRAME_HOST_H_ +#endif // CONTENT_TEST_TEST_RENDER_FRAME_HOST_H_ diff --git a/content/test/test_render_frame_host_factory.cc b/content/test/test_render_frame_host_factory.cc index 1ec7e8b..8bf5b88 100644 --- a/content/test/test_render_frame_host_factory.cc +++ b/content/test/test_render_frame_host_factory.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" -#include "content/browser/frame_host/test_render_frame_host.h" +#include "content/test/test_render_frame_host.h" namespace content { diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/test/test_render_view_host.cc index bc8279c..772adda 100644 --- a/content/browser/renderer_host/test_render_view_host.cc +++ b/content/test/test_render_view_host.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/test/test_render_view_host.h" #include "base/memory/scoped_ptr.h" #include "content/browser/dom_storage/dom_storage_context_wrapper.h" #include "content/browser/dom_storage/session_storage_namespace_impl.h" -#include "content/browser/renderer_host/test_backing_store.h" #include "content/browser/site_instance_impl.h" #include "content/common/dom_storage/dom_storage_types.h" #include "content/common/view_messages.h" @@ -16,6 +15,7 @@ #include "content/public/browser/storage_partition.h" #include "content/public/common/content_client.h" #include "content/public/common/page_state.h" +#include "content/test/test_backing_store.h" #include "content/test/test_web_contents.h" #include "media/base/video_frame.h" #include "ui/gfx/rect.h" diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/test/test_render_view_host.h index 19add78..fd44b5c 100644 --- a/content/browser/renderer_host/test_render_view_host.h +++ b/content/test/test_render_view_host.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_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ -#define CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ +#ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ +#define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ #include <string> #include <vector> @@ -383,4 +383,4 @@ class RenderViewHostImplTestHarness : public RenderViewHostTestHarness { } // namespace content -#endif // CONTENT_BROWSER_RENDERER_HOST_TEST_RENDER_VIEW_HOST_H_ +#endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ diff --git a/content/test/test_render_view_host_factory.cc b/content/test/test_render_view_host_factory.cc index ebba612..6cd4e8a 100644 --- a/content/test/test_render_view_host_factory.cc +++ b/content/test/test_render_view_host_factory.cc @@ -4,9 +4,9 @@ #include "content/test/test_render_view_host_factory.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" #include "content/public/browser/render_process_host_factory.h" +#include "content/test/test_render_view_host.h" namespace content { diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc index d36a9d8..a2a42e6 100644 --- a/content/test/test_web_contents.cc +++ b/content/test/test_web_contents.cc @@ -9,7 +9,6 @@ #include "content/browser/browser_url_handler_impl.h" #include "content/browser/frame_host/navigation_entry_impl.h" #include "content/browser/renderer_host/render_view_host_impl.h" -#include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" #include "content/common/view_messages.h" #include "content/public/browser/notification_registrar.h" @@ -18,6 +17,7 @@ #include "content/public/common/page_state.h" #include "content/public/common/page_transition_types.h" #include "content/public/test/mock_render_process_host.h" +#include "content/test/test_render_view_host.h" namespace content { |