diff options
55 files changed, 182 insertions, 195 deletions
diff --git a/chrome/browser/renderer_host/test/renderer_accessibility_browsertest.cc b/chrome/browser/accessibility/renderer_accessibility_browsertest.cc index dafd77b..1e8697f 100644 --- a/chrome/browser/renderer_host/test/renderer_accessibility_browsertest.cc +++ b/chrome/browser/accessibility/renderer_accessibility_browsertest.cc @@ -7,15 +7,15 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/render_widget_host.h" -#include "chrome/browser/renderer_host/render_widget_host_view.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/render_messages.h" #include "chrome/common/notification_type.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/render_widget_host.h" +#include "content/browser/renderer_host/render_widget_host_view.h" +#include "content/browser/tab_contents/tab_contents.h" #if defined(OS_WIN) #include <atlbase.h> diff --git a/chrome/browser/autocomplete_history_manager_unittest.cc b/chrome/browser/autocomplete_history_manager_unittest.cc index 6645263..52e004f 100644 --- a/chrome/browser/autocomplete_history_manager_unittest.cc +++ b/chrome/browser/autocomplete_history_manager_unittest.cc @@ -9,12 +9,12 @@ #include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete_history_manager.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/test/testing_browser_process.h" #include "chrome/test/testing_browser_process_test.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/form_data.h" diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc index 4aa6504..518ba51 100644 --- a/chrome/browser/autofill/autofill_manager_unittest.cc +++ b/chrome/browser/autofill/autofill_manager_unittest.cc @@ -20,13 +20,13 @@ #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/autofill_messages.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_browser_process.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ipc/ipc_test_sink.h" diff --git a/chrome/browser/autofill/autofill_metrics_unittest.cc b/chrome/browser/autofill/autofill_metrics_unittest.cc index b955792..13fe17a 100644 --- a/chrome/browser/autofill/autofill_metrics_unittest.cc +++ b/chrome/browser/autofill/autofill_metrics_unittest.cc @@ -12,9 +12,9 @@ #include "chrome/browser/autofill/autofill_manager.h" #include "chrome/browser/autofill/autofill_metrics.h" #include "chrome/browser/autofill/personal_data_manager.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/test/testing_browser_process.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/form_data.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc index 16b63fe..906d42f 100644 --- a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc +++ b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/renderer_host/test/test_render_view_host.h" - -#include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/offline/offline_load_page.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/test_tab_contents.h" static const char* kURL1 = "http://www.google.com/"; static const char* kURL2 = "http://www.gmail.com/"; diff --git a/chrome/browser/content_setting_bubble_model_unittest.cc b/chrome/browser/content_setting_bubble_model_unittest.cc index 0a45cd6..b56a973 100644 --- a/chrome/browser/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/content_setting_bubble_model_unittest.cc @@ -6,14 +6,14 @@ #include "base/auto_reset.h" #include "base/command_line.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/testing_profile.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" class ContentSettingBubbleModelTest : public RenderViewHostTestHarness { diff --git a/chrome/browser/content_setting_image_model_unittest.cc b/chrome/browser/content_setting_image_model_unittest.cc index 358f01c..6ffe3fa 100644 --- a/chrome/browser/content_setting_image_model_unittest.cc +++ b/chrome/browser/content_setting_image_model_unittest.cc @@ -3,13 +3,12 @@ // found in the LICENSE file. #include "chrome/browser/content_setting_image_model.h" - -#include "chrome/browser/browser_thread.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/test/testing_profile.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "net/base/cookie_options.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/debugger/devtools_manager_unittest.cc b/chrome/browser/debugger/devtools_manager_unittest.cc index 751410a..b2a7d2a 100644 --- a/chrome/browser/debugger/devtools_manager_unittest.cc +++ b/chrome/browser/debugger/devtools_manager_unittest.cc @@ -6,9 +6,9 @@ #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_window.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "testing/gtest/include/gtest/gtest.h" #include "chrome/common/render_messages.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/download/download_request_limiter_unittest.cc b/chrome/browser/download/download_request_limiter_unittest.cc index 27d769a..c31f0f6 100644 --- a/chrome/browser/download/download_request_limiter_unittest.cc +++ b/chrome/browser/download/download_request_limiter_unittest.cc @@ -4,9 +4,9 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/download/download_request_limiter.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/navigation_controller.h" #include "testing/gtest/include/gtest/gtest.h" class DownloadRequestLimiterTest diff --git a/chrome/browser/download/save_package_unittest.cc b/chrome/browser/download/save_package_unittest.cc index 5dd5d78..45ccf61 100644 --- a/chrome/browser/download/save_package_unittest.cc +++ b/chrome/browser/download/save_package_unittest.cc @@ -10,8 +10,8 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/download/save_package.h" #include "chrome/browser/net/url_request_mock_http_job.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/extension_webnavigation_unittest.cc b/chrome/browser/extensions/extension_webnavigation_unittest.cc index cfeada0..4739706 100644 --- a/chrome/browser/extensions/extension_webnavigation_unittest.cc +++ b/chrome/browser/extensions/extension_webnavigation_unittest.cc @@ -5,13 +5,12 @@ // Tests common functionality used by the Chrome Extensions webNavigation API // implementation. -#include "testing/gtest/include/gtest/gtest.h" - #include "base/values.h" #include "chrome/browser/extensions/extension_webnavigation_api.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" +#include "testing/gtest/include/gtest/gtest.h" class FrameNavigationStateTest : public RenderViewHostTestHarness { diff --git a/chrome/browser/geolocation/geolocation_exceptions_table_model_unittest.cc b/chrome/browser/geolocation/geolocation_exceptions_table_model_unittest.cc index 5dd18a1..6331991 100644 --- a/chrome/browser/geolocation/geolocation_exceptions_table_model_unittest.cc +++ b/chrome/browser/geolocation/geolocation_exceptions_table_model_unittest.cc @@ -4,10 +4,10 @@ #include "chrome/browser/geolocation/geolocation_exceptions_table_model.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/common/content_settings_helper.h" #include "chrome/test/testing_profile.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc index 7cb2d9d..02e4282 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc @@ -12,14 +12,14 @@ #include "chrome/browser/geolocation/location_arbitrator.h" #include "chrome/browser/geolocation/location_provider.h" #include "chrome/browser/geolocation/mock_location_provider.h" -#include "chrome/browser/renderer_host/mock_render_process_host.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_type.h" #include "chrome/common/render_messages.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/mock_render_process_host.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" // TestTabContentsWithPendingInfoBar ------------------------------------------ diff --git a/chrome/browser/notifications/desktop_notification_service_unittest.cc b/chrome/browser/notifications/desktop_notification_service_unittest.cc index 05a3dd5..9894012 100644 --- a/chrome/browser/notifications/desktop_notification_service_unittest.cc +++ b/chrome/browser/notifications/desktop_notification_service_unittest.cc @@ -11,9 +11,9 @@ #include "chrome/browser/notifications/notifications_prefs_cache.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_pref_update.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" diff --git a/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc b/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc index 693f1ec..6c6c182 100644 --- a/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc +++ b/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc @@ -5,9 +5,9 @@ #include "chrome/browser/notifications/notification_exceptions_table_model.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/test/testing_profile.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc index 9ad7445..edf382c 100644 --- a/chrome/browser/password_manager/password_manager_unittest.cc +++ b/chrome/browser/password_manager/password_manager_unittest.cc @@ -11,10 +11,10 @@ #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/password_manager/password_manager_delegate.h" #include "chrome/browser/password_manager/password_store.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/url_constants.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/chrome/browser/renderer_host/render_widget_host_view_mac_unittest.mm index 7b593b9..933d89c 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac_unittest.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac_unittest.mm @@ -5,10 +5,10 @@ #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" #include "base/mac/scoped_nsautorelease_pool.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/test_event_utils.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/plugins/npapi/webplugin.h" diff --git a/chrome/browser/renderer_host/test/DEPS b/chrome/browser/renderer_host/test/DEPS deleted file mode 100644 index f433b7d..0000000 --- a/chrome/browser/renderer_host/test/DEPS +++ /dev/null @@ -1,4 +0,0 @@ -include_rules = [
- # See README.txt in this directory for why we do this.
- "+chrome/browser/tab_contents",
-]
diff --git a/chrome/browser/renderer_host/test/README.txt b/chrome/browser/renderer_host/test/README.txt deleted file mode 100644 index bf230e5..0000000 --- a/chrome/browser/renderer_host/test/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -These test files would normally go in the parent directory next to the
-corresponding implementation files. However, they depend on the tab_contents
-directory which we don't want the normal code to use. So we put them in this
-separate directory with the tab_contents includes allowed by DEPS from here only.
diff --git a/chrome/browser/renderer_host/test/web_cache_manager_browsertest.cc b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc index 4926d26..2244506 100644 --- a/chrome/browser/renderer_host/test/web_cache_manager_browsertest.cc +++ b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc @@ -6,13 +6,13 @@ #include "base/message_loop.h" #include "base/process_util.h" -#include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/web_cache_manager.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/result_codes.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/tab_contents/tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" class WebCacheManagerBrowserTest : public InProcessBrowserTest { diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 4ed2e25..9b9e7668 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -8,14 +8,14 @@ #include "base/scoped_ptr.h" #include "base/scoped_temp_dir.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/safe_browsing/client_side_detection_host.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock-spec-builders.h" @@ -29,7 +29,7 @@ namespace safe_browsing { class MockClientSideDetectionService : public ClientSideDetectionService { public: - MockClientSideDetectionService(const FilePath& model_path) + explicit MockClientSideDetectionService(const FilePath& model_path) : ClientSideDetectionService(model_path, NULL) {} virtual ~MockClientSideDetectionService() {}; diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc index 0e7cdbd..2c108f6 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc @@ -17,18 +17,18 @@ #include "base/scoped_temp_dir.h" #include "base/task.h" #include "base/time.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" #include "chrome/browser/safe_browsing/csd.pb.h" #include "chrome/common/render_messages.h" #include "chrome/common/net/test_url_fetcher_factory.h" #include "chrome/common/net/url_fetcher.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_test_sink.h" #include "net/url_request/url_request_status.h" +#include "testing/gtest/include/gtest/gtest.h" namespace safe_browsing { diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc index 2976383..38a92cf 100644 --- a/chrome/browser/safe_browsing/malware_details_unittest.cc +++ b/chrome/browser/safe_browsing/malware_details_unittest.cc @@ -3,15 +3,15 @@ // found in the LICENSE file. #include <algorithm> -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/safe_browsing/malware_details.h" #include "chrome/browser/safe_browsing/report.pb.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/test_tab_contents.h" static const char* kOriginalLandingURL = "http://www.originallandingpage.com/"; static const char* kLandingURL = "http://www.landingpage.com/"; diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc index 5b8163b..43deafc 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/malware_details.h" #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/test_tab_contents.h" static const char* kGoogleURL = "http://www.google.com/"; static const char* kGoodURL = "http://www.goodguys.com/"; diff --git a/chrome/browser/sessions/tab_restore_service_browsertest.cc b/chrome/browser/sessions/tab_restore_service_browsertest.cc index c66d97e..623a363 100644 --- a/chrome/browser/sessions/tab_restore_service_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_service_browsertest.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/tab_restore_service.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/test/render_view_test.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" diff --git a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc index ef639fd..ecc632a 100644 --- a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc +++ b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc @@ -6,13 +6,13 @@ #include "base/basictypes.h" #include "base/stringprintf.h" #include "chrome/browser/history/top_sites.h" -#include "chrome/browser/renderer_host/backing_store_manager.h" -#include "chrome/browser/renderer_host/mock_render_process_host.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/tab_contents/thumbnail_generator.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/backing_store_manager.h" +#include "content/browser/renderer_host/mock_render_process_host.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "skia/ext/platform_canvas.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkColorPriv.h" @@ -284,7 +284,7 @@ TEST(ThumbnailGeneratorSimpleTest, GetClippedBitmap_NonSquareOutput) { // A mock version of TopSites, used for testing ShouldUpdateThumbnail(). class MockTopSites : public history::TopSites { public: - MockTopSites(Profile* profile) + explicit MockTopSites(Profile* profile) : history::TopSites(profile), capacity_(1) { } diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc index 39f0d60..d5c47c0 100644 --- a/chrome/browser/tab_contents/web_contents_unittest.cc +++ b/chrome/browser/tab_contents/web_contents_unittest.cc @@ -9,14 +9,6 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_value_store.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/render_widget_host_view.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/interstitial_page.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" @@ -24,6 +16,14 @@ #include "chrome/common/url_constants.h" #include "chrome/test/testing_pref_service.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/render_widget_host_view.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/interstitial_page.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "ipc/ipc_channel.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/message_box_flags.h" diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index f2762a8..c16aede 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -16,10 +16,6 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/tabs/tab_strip_model_delegate.h" #include "chrome/browser/tabs/tab_strip_model_order_controller.h" @@ -34,6 +30,10 @@ #include "chrome/common/property_bag.h" #include "chrome/common/url_constants.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/system_monitor/system_monitor.h" diff --git a/chrome/browser/translate/translate_manager_unittest.cc b/chrome/browser/translate/translate_manager_unittest.cc index d093b38..594a45a 100644 --- a/chrome/browser/translate/translate_manager_unittest.cc +++ b/chrome/browser/translate/translate_manager_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include <set> @@ -10,10 +9,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_change_registrar.h" -#include "chrome/browser/renderer_host/mock_render_process_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/translate/translate_manager.h" #include "chrome/browser/translate/translate_prefs.h" @@ -26,6 +22,10 @@ #include "chrome/common/net/test_url_fetcher_factory.h" #include "chrome/test/testing_browser_process.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/mock_render_process_host.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "grit/generated_resources.h" #include "ipc/ipc_test_sink.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm b/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm index 9870639..a35acee9 100644 --- a/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bug_report_window_controller_unittest.mm @@ -7,11 +7,11 @@ #include "base/ref_counted.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #import "chrome/browser/ui/cocoa/bug_report_window_controller.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/test_tab_contents.h" #import "testing/gtest_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm index b28db89..fb7a330 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm @@ -6,10 +6,10 @@ #include "base/ref_counted.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "chrome/test/testing_profile.h" namespace { diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm index 3b168ef..33c24ce 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm @@ -7,11 +7,11 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/notification.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/notifications/balloon_controller.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" #import "third_party/ocmock/OCMock/OCMock.h" // Subclass balloon controller and mock out the initialization of the RVH. diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm index 84276a3..9c4c9b4 100644 --- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm @@ -7,9 +7,9 @@ #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h" #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" @interface SadTabView (ExposedForTesting) // Implementation is below. diff --git a/chrome/browser/ui/cocoa/tab_contents/web_drop_target_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/web_drop_target_unittest.mm index c10e22c..1bb6b250 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_drop_target_unittest.mm +++ b/chrome/browser/ui/cocoa/tab_contents/web_drop_target_unittest.mm @@ -5,10 +5,10 @@ #include "base/mac/scoped_nsautorelease_pool.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/tab_contents/web_drop_target.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" #import "third_party/mozilla/NSPasteboard+Utils.h" #include "webkit/glue/webdropdata.h" diff --git a/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h index 9c60c12..16ce414 100644 --- a/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h +++ b/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" +#include "content/browser/renderer_host/test_render_view_host.h" class TabContentsWrapper; diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc index 2e4b988..1d65fb3 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc @@ -8,12 +8,12 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/url_constants.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" class BackFwdMenuModelTest : public RenderViewHostTestHarness { diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc index f7e2f25..af957ce 100644 --- a/chrome/browser/visitedlink/visitedlink_unittest.cc +++ b/chrome/browser/visitedlink/visitedlink_unittest.cc @@ -13,13 +13,13 @@ #include "base/shared_memory.h" #include "base/string_util.h" #include "chrome/browser/browser_thread.h" +#include "chrome/browser/renderer_host/browser_render_process_host.h" #include "chrome/browser/visitedlink/visitedlink_master.h" #include "chrome/browser/visitedlink/visitedlink_event_listener.h" -#include "chrome/browser/renderer_host/browser_render_process_host.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/visitedlink_slave.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index a999f33..e245645 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -7,11 +7,11 @@ #include "base/file_path.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/render_messages.h" #include "chrome/test/testing_profile.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" class WebApplicationTest : public RenderViewHostTestHarness { diff --git a/chrome/browser/webui/sync_internals_ui_unittest.cc b/chrome/browser/webui/sync_internals_ui_unittest.cc index ffb0fb8..5298a5b 100644 --- a/chrome/browser/webui/sync_internals_ui_unittest.cc +++ b/chrome/browser/webui/sync_internals_ui_unittest.cc @@ -9,14 +9,14 @@ #include "base/message_loop.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/sync/js_arg_list.h" #include "chrome/browser/sync/js_test_util.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/render_messages_params.h" #include "chrome/test/profile_mock.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/webui/web_ui_unittest.cc b/chrome/browser/webui/web_ui_unittest.cc index 5c2aa31..4c5b48b 100644 --- a/chrome/browser/webui/web_ui_unittest.cc +++ b/chrome/browser/webui/web_ui_unittest.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 "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/browser/webui/new_tab_ui.h" #include "chrome/common/url_constants.h" #include "chrome/test/testing_profile.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" class WebUITest : public RenderViewHostTestHarness { diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index b2d9bbd..c57ec63 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -83,10 +83,6 @@ 'browser/prefs/pref_service_mock_builder.h', 'browser/prefs/testing_pref_store.cc', 'browser/prefs/testing_pref_store.h', - 'browser/renderer_host/test/test_backing_store.cc', - 'browser/renderer_host/test/test_backing_store.h', - 'browser/renderer_host/test/test_render_view_host.cc', - 'browser/renderer_host/test/test_render_view_host.h', 'browser/sessions/session_service_test_helper.cc', 'browser/sessions/session_service_test_helper.h', 'browser/sync/profile_sync_service_mock.cc', @@ -179,6 +175,10 @@ 'test/values_test_util.h', '../content/browser/renderer_host/mock_render_process_host.cc', '../content/browser/renderer_host/mock_render_process_host.h', + '../content/browser/renderer_host/test_backing_store.cc', + '../content/browser/renderer_host/test_backing_store.h', + '../content/browser/renderer_host/test_render_view_host.cc', + '../content/browser/renderer_host/test_render_view_host.h', '../content/browser/tab_contents/test_tab_contents.cc', '../content/browser/tab_contents/test_tab_contents.h', ], @@ -1450,8 +1450,6 @@ 'browser/renderer_host/gtk_im_context_wrapper_unittest.cc', 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', 'browser/renderer_host/render_widget_host_view_mac_unittest.mm', - 'browser/renderer_host/test/render_view_host_unittest.cc', - 'browser/renderer_host/test/site_instance_unittest.cc', 'browser/renderer_host/web_cache_manager_unittest.cc', 'browser/resources_util_unittest.cc', 'browser/rlz/rlz_unittest.cc', @@ -1853,9 +1851,11 @@ '../content/browser/host_zoom_map_unittest.cc', '../content/browser/plugin_service_unittest.cc', '../content/browser/renderer_host/audio_renderer_host_unittest.cc', + '../content/browser/renderer_host/render_view_host_unittest.cc', '../content/browser/renderer_host/render_widget_host_unittest.cc', '../content/browser/renderer_host/resource_dispatcher_host_unittest.cc', '../content/browser/renderer_host/resource_queue_unittest.cc', + '../content/browser/site_instance_unittest.cc', '../content/browser/tab_contents/navigation_controller_unittest.cc', '../content/browser/tab_contents/navigation_entry_unittest.cc', '../content/browser/tab_contents/render_view_host_manager_unittest.cc', @@ -2129,6 +2129,7 @@ 'app/chrome_dll.rc', 'app/chrome_dll_resource.h', 'app/chrome_dll_version.rc.version', + 'browser/accessibility/renderer_accessibility_browsertest.cc', 'browser/autocomplete/autocomplete_browsertest.cc', 'browser/autofill/form_structure_browsertest.cc', 'browser/browser_browsertest.cc', @@ -2269,11 +2270,7 @@ 'browser/popup_blocker_browsertest.cc', 'browser/prerender/prerender_browsertest.cc', 'browser/printing/print_dialog_cloud_uitest.cc', - 'browser/renderer_host/test/render_process_host_browsertest.cc', - 'browser/renderer_host/test/render_view_host_browsertest.cc', - 'browser/renderer_host/test/render_view_host_manager_browsertest.cc', - 'browser/renderer_host/test/renderer_accessibility_browsertest.cc', - 'browser/renderer_host/test/web_cache_manager_browsertest.cc', + 'browser/renderer_host/web_cache_manager_browsertest.cc', 'browser/safe_browsing/safe_browsing_blocking_page_test.cc', 'browser/safe_browsing/safe_browsing_service_browsertest.cc', 'browser/service/service_process_control_browsertest.cc', @@ -2326,6 +2323,9 @@ 'test/render_view_test.h', '../content/browser/child_process_security_policy_browsertest.cc', '../content/browser/plugin_service_browsertest.cc', + '../content/browser/renderer_host/render_process_host_browsertest.cc', + '../content/browser/renderer_host/render_view_host_browsertest.cc', + '../content/browser/renderer_host/render_view_host_manager_browsertest.cc', ], 'conditions': [ ['chromeos==0', { @@ -2399,11 +2399,10 @@ 'app/chrome_dll_resource.h', 'app/chrome_dll_version.rc.version', 'browser/extensions/extension_rlz_apitest.cc', - # TODO(jam): http://crbug.com/15101 These tests fail on Linux and - # Mac. + # http://crbug.com/15101 These tests fail on Linux and Mac. + 'browser/renderer_host/web_cache_manager_browsertest.cc', '../content/browser/child_process_security_policy_browsertest.cc', - 'browser/renderer_host/test/web_cache_manager_browsertest.cc', - 'browser/renderer_host/test/render_view_host_manager_browsertest.cc', + '../content/browser/renderer_host/render_view_host_manager_browsertest.cc', ], }], ['OS=="linux"', { diff --git a/chrome/test/browser_with_test_window_test.h b/chrome/test/browser_with_test_window_test.h index 69d5956..99a857b 100644 --- a/chrome/test/browser_with_test_window_test.h +++ b/chrome/test/browser_with_test_window_test.h @@ -7,9 +7,9 @@ #pragma once #include "base/message_loop.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/test/test_browser_window.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "testing/gtest/include/gtest/gtest.h" class Browser; diff --git a/chrome/browser/renderer_host/test/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc index 17eb30e..afe829c 100644 --- a/chrome/browser/renderer_host/test/render_process_host_browsertest.cc +++ b/content/browser/renderer_host/render_process_host_browsertest.cc @@ -4,17 +4,17 @@ #include "base/command_line.h" #include "chrome/browser/debugger/devtools_manager.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/render_widget_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/tab_contents.h" class RenderProcessHostTest : public InProcessBrowserTest { public: diff --git a/chrome/browser/renderer_host/test/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc index 3081786..6c4a771 100644 --- a/chrome/browser/renderer_host/test/render_view_host_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_browsertest.cc @@ -7,14 +7,14 @@ #include "base/values.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" #include "chrome/browser/tab_contents/tab_specific_content_settings.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/render_messages_params.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_observer.h" #include "net/base/host_port_pair.h" #include "net/test/test_server.h" diff --git a/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc index a5ea2f6..423ce64 100644 --- a/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc @@ -8,8 +8,6 @@ #include "chrome/browser/download/download_manager.h" #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/notification_details.h" @@ -18,6 +16,8 @@ #include "chrome/common/notification_type.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/site_instance.h" #include "net/base/net_util.h" #include "net/test/test_server.h" @@ -188,7 +188,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, #if defined(OS_WIN) #define MAYBE_ChromeURLAfterDownload DISABLED_ChromeURLAfterDownload #else -#defne MAYBE_ChromeURLAfterDownload ChromeURLAfterDownload +#define MAYBE_ChromeURLAfterDownload ChromeURLAfterDownload #endif // defined(OS_WIN) // Test for crbug.com/14505. This tests that chrome:// urls are still functional diff --git a/chrome/browser/renderer_host/test/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 48f0c50..83c52fd7 100644 --- a/chrome/browser/renderer_host/test/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/render_messages.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/test_tab_contents.h" class RenderViewHostTest : public RenderViewHostTestHarness { }; diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index 546854e..162dd96 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -7,13 +7,13 @@ #include "base/shared_memory.h" #include "base/timer.h" #include "build/build_config.h" -#include "chrome/browser/renderer_host/backing_store.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/backing_store.h" +#include "content/browser/renderer_host/test_render_view_host.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/canvas_skia.h" diff --git a/chrome/browser/renderer_host/test/test_backing_store.cc b/content/browser/renderer_host/test_backing_store.cc index cf7e7fa..e0c2694 100644 --- a/chrome/browser/renderer_host/test/test_backing_store.cc +++ b/content/browser/renderer_host/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 "chrome/browser/renderer_host/test/test_backing_store.h" +#include "content/browser/renderer_host/test_backing_store.h" TestBackingStore::TestBackingStore(RenderWidgetHost* widget, const gfx::Size& size) diff --git a/chrome/browser/renderer_host/test/test_backing_store.h b/content/browser/renderer_host/test_backing_store.h index d8f257b..83909dc 100644 --- a/chrome/browser/renderer_host/test/test_backing_store.h +++ b/content/browser/renderer_host/test_backing_store.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_RENDERER_HOST_TEST_TEST_BACKING_STORE_H_ -#define CHROME_BROWSER_RENDERER_HOST_TEST_TEST_BACKING_STORE_H_ +#ifndef CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_BACKING_STORE_H_ +#define CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_BACKING_STORE_H_ #pragma once #include "base/basictypes.h" -#include "chrome/browser/renderer_host/backing_store.h" +#include "content/browser/renderer_host/backing_store.h" class TestBackingStore : public BackingStore { public: @@ -28,4 +28,4 @@ class TestBackingStore : public BackingStore { DISALLOW_COPY_AND_ASSIGN(TestBackingStore); }; -#endif // CHROME_BROWSER_RENDERER_HOST_TEST_TEST_BACKING_STORE_H_ +#endif // CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_BACKING_STORE_H_ diff --git a/chrome/browser/renderer_host/test/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc index 2d959a8..918ddbd 100644 --- a/chrome/browser/renderer_host/test/test_render_view_host.cc +++ b/content/browser/renderer_host/test_render_view_host.cc @@ -2,17 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/renderer_host/test/test_render_view_host.h" - #include "chrome/browser/browser_url_handler.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/renderer_host/test/test_backing_store.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/dom_storage_common.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_backing_store.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "ui/gfx/rect.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/password_form.h" diff --git a/chrome/browser/renderer_host/test/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h index 463a89e..8110e6b 100644 --- a/chrome/browser/renderer_host/test/test_render_view_host.h +++ b/content/browser/renderer_host/test_render_view_host.h @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ -#define CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ +#ifndef CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ +#define CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ #pragma once #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/message_loop.h" #include "build/build_config.h" -#include "chrome/browser/renderer_host/mock_render_process_host.h" -#include "chrome/browser/renderer_host/render_widget_host_view.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/render_view_host_factory.h" #include "chrome/common/page_transition_types.h" +#include "content/browser/renderer_host/mock_render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/render_view_host_factory.h" +#include "content/browser/renderer_host/render_widget_host_view.h" #include "testing/gtest/include/gtest/gtest.h" namespace gfx { @@ -298,4 +298,4 @@ class RenderViewHostTestHarness : public testing::Test { DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); }; -#endif // CHROME_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ +#endif // CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ diff --git a/chrome/browser/renderer_host/test/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc index c887607..cc3651f 100644 --- a/chrome/browser/renderer_host/test/site_instance_unittest.cc +++ b/content/browser/site_instance_unittest.cc @@ -4,19 +4,19 @@ #include "base/stl_util-inl.h" #include "base/string16.h" -#include "chrome/browser/browsing_instance.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/renderer_host/browser_render_process_host.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/url_constants.h" #include "chrome/common/render_messages.h" #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" +#include "content/browser/browsing_instance.h" +#include "content/browser/child_process_security_policy.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" class SiteInstanceTest : public testing::Test { private: diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc index 2691305..0d3b0c1 100644 --- a/content/browser/tab_contents/navigation_controller_unittest.cc +++ b/content/browser/tab_contents/navigation_controller_unittest.cc @@ -10,20 +10,20 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/history/history.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_service_test_helper.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/test/test_notification_tracker.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "chrome/test/testing_profile.h" #include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc index a4b82d8..fc13f1b 100644 --- a/content/browser/tab_contents/render_view_host_manager_unittest.cc +++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc @@ -4,12 +4,6 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/browser_url_handler.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/render_view_host_manager.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/page_transition_types.h" @@ -18,6 +12,12 @@ #include "chrome/common/url_constants.h" #include "chrome/test/test_notification_tracker.h" #include "chrome/test/testing_profile.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/render_view_host_manager.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "ipc/ipc_message.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/tab_contents/test_tab_contents.cc b/content/browser/tab_contents/test_tab_contents.cc index 69fc0cf..983f5c8 100644 --- a/content/browser/tab_contents/test_tab_contents.cc +++ b/content/browser/tab_contents/test_tab_contents.cc @@ -7,14 +7,14 @@ #include <utility> #include "chrome/browser/browser_url_handler.h" -#include "chrome/browser/renderer_host/mock_render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/page_transition_types.h" +#include "content/browser/renderer_host/mock_render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/infobar_delegate.h" TestTabContents::TestTabContents(Profile* profile, SiteInstance* instance) : TabContents(profile, instance, MSG_ROUTING_NONE, NULL, NULL), |