diff options
80 files changed, 135 insertions, 132 deletions
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index e67754b..744ada4 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -8,7 +8,7 @@ #include "ash/shell.h" #include "ash/test/test_shell_delegate.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "ui/aura/env.h" #include "ui/aura/monitor_manager.h" #include "ui/aura/root_window.h" diff --git a/chrome/browser/accessibility/accessibility_win_browsertest.cc b/chrome/browser/accessibility/accessibility_win_browsertest.cc index ac09d34d..e9a560c 100644 --- a/chrome/browser/accessibility/accessibility_win_browsertest.cc +++ b/chrome/browser/accessibility/accessibility_win_browsertest.cc @@ -20,7 +20,7 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/test/accessibility_test_utils_win.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #include "third_party/iaccessible2/ia2_api_all.h" #include "third_party/isimpledom/ISimpleDOMNode.h" #include "ui/ui_controls/ui_controls.h" diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index f169fa5..0e090b9 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -19,7 +19,7 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 944302c..0443d6c 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -30,8 +30,8 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "content/test/test_renderer_host.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_renderer_host.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc index e6bee4c..062254b 100644 --- a/chrome/browser/autofill/autofill_download_unittest.cc +++ b/chrome/browser/autofill/autofill_download_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/captive_portal/captive_portal_service_unittest.cc b/chrome/browser/captive_portal/captive_portal_service_unittest.cc index 9cd5eb8..b6a270c 100644 --- a/chrome/browser/captive_portal/captive_portal_service_unittest.cc +++ b/chrome/browser/captive_portal/captive_portal_service_unittest.cc @@ -18,7 +18,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc index cbdc8e3..dd02515 100644 --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc @@ -36,7 +36,7 @@ #include "chromeos/dbus/mock_session_manager_client.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.h b/chrome/browser/chromeos/login/mock_url_fetchers.h index cb01aba..7247aed 100644 --- a/chrome/browser/chromeos/login/mock_url_fetchers.h +++ b/chrome/browser/chromeos/login/mock_url_fetchers.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc index 1788f59..e86d158 100644 --- a/chrome/browser/chromeos/offline/offline_load_page_unittest.cc +++ b/chrome/browser/chromeos/offline/offline_load_page_unittest.cc @@ -9,7 +9,7 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" using content::BrowserThread; using content::InterstitialPage; diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index ee3744f5..83161e6 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -18,7 +18,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #include "net/url_request/url_request.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/identity/web_auth_flow_unittest.cc b/chrome/browser/extensions/api/identity/web_auth_flow_unittest.cc index 2e89219..8b1d2f7 100644 --- a/chrome/browser/extensions/api/identity/web_auth_flow_unittest.cc +++ b/chrome/browser/extensions/api/identity/web_auth_flow_unittest.cc @@ -9,7 +9,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc index 2152204..5097365 100644 --- a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc +++ b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc @@ -18,7 +18,7 @@ #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index 4c62835..edd80c3 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -41,7 +41,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "libxml/globals.h" #include "net/base/escape.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc index bb8cfc1..c04ef99 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc @@ -26,8 +26,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_renderer_host.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/test_renderer_host.h" +#include "content/public/test/web_contents_tester.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc index 399155f..8612028 100644 --- a/chrome/browser/google/google_url_tracker_unittest.cc +++ b/chrome/browser/google/google_url_tracker_unittest.cc @@ -17,7 +17,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/common/url_fetcher.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "testing/gtest/include/gtest/gtest.h" class TabContentsWrapper; diff --git a/chrome/browser/intents/cws_intents_registry_unittest.cc b/chrome/browser/intents/cws_intents_registry_unittest.cc index 2f149fc..d41f5a7 100644 --- a/chrome/browser/intents/cws_intents_registry_unittest.cc +++ b/chrome/browser/intents/cws_intents_registry_unittest.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc index e1ea520..2095d22 100644 --- a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc +++ b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc @@ -19,7 +19,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/http/http_status_code.h" diff --git a/chrome/browser/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc index 44d2a39..5503d7a 100644 --- a/chrome/browser/policy/device_management_service_unittest.cc +++ b/chrome/browser/policy/device_management_service_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/policy/device_management_service.h" #include "chrome/test/base/testing_browser_process.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/policy/testing_policy_url_fetcher_factory.h b/chrome/browser/policy/testing_policy_url_fetcher_factory.h index d731ace..288dd1e 100644 --- a/chrome/browser/policy/testing_policy_url_fetcher_factory.h +++ b/chrome/browser/policy/testing_policy_url_fetcher_factory.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_delegate.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc index 6c1e0ea..aee3668 100644 --- a/chrome/browser/prefs/pref_service_unittest.cc +++ b/chrome/browser/prefs/pref_service_unittest.cc @@ -29,7 +29,7 @@ #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/test/data/resource.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc index 9c32492..06e9c98 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc @@ -25,7 +25,7 @@ #include "content/public/common/referrer.h" #include "content/public/browser/navigation_controller.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" 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 2d0f1f2..fa8731f 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -19,7 +19,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_test_sink.h" #include "testing/gmock/include/gmock/gmock.h" 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 365c1e5..84d74e5 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/common/safe_browsing/client_model.pb.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "crypto/sha2.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc index fa2aadd..6c0aace 100644 --- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc @@ -25,7 +25,7 @@ #include "chrome/common/zip.h" #include "content/public/browser/download_item.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/base/x509_certificate.h" #include "net/url_request/url_fetcher_delegate.h" 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 3418f75..678559e 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -14,7 +14,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" using content::BrowserThread; using content::InterstitialPage; diff --git a/chrome/browser/sessions/tab_restore_service_browsertest.cc b/chrome/browser/sessions/tab_restore_service_browsertest.cc index 33c3ca3..d62c5243 100644 --- a/chrome/browser/sessions/tab_restore_service_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_service_browsertest.cc @@ -22,7 +22,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/test/render_view_test.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc index 80014a3..4efd1c7 100644 --- a/chrome/browser/signin/signin_manager_unittest.cc +++ b/chrome/browser/signin/signin_manager_unittest.cc @@ -18,7 +18,7 @@ #include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/signin/token_service_unittest.cc b/chrome/browser/signin/token_service_unittest.cc index 763233f..1e169e8 100644 --- a/chrome/browser/signin/token_service_unittest.cc +++ b/chrome/browser/signin/token_service_unittest.cc @@ -18,7 +18,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/mock_url_fetcher_factory.h" #include "chrome/common/net/gaia/gaia_constants.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" using content::BrowserThread; diff --git a/chrome/browser/signin/ubertoken_fetcher_unittest.cc b/chrome/browser/signin/ubertoken_fetcher_unittest.cc index 27de717..e37737f 100644 --- a/chrome/browser/signin/ubertoken_fetcher_unittest.cc +++ b/chrome/browser/signin/ubertoken_fetcher_unittest.cc @@ -8,7 +8,7 @@ #include "chrome/browser/signin/token_service_unittest.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/net/gaia/gaia_constants.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; diff --git a/chrome/browser/spellchecker/spelling_service_client_unittest.cc b/chrome/browser/spellchecker/spelling_service_client_unittest.cc index 11a9453..7bb1b8a 100644 --- a/chrome/browser/spellchecker/spelling_service_client_unittest.cc +++ b/chrome/browser/spellchecker/spelling_service_client_unittest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/spellchecker/spelling_service_client.h" #include "chrome/common/spellcheck_result.h" #include "chrome/test/base/testing_profile.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/base/load_flags.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 2f65022..0298cb4 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -28,7 +28,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/common/security_style.h" #include "content/public/common/ssl_status.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #include "net/base/cert_status_flags.h" #include "net/test/test_server.h" diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc index 0785957..b2bfef0 100644 --- a/chrome/browser/sync/glue/http_bridge_unittest.cc +++ b/chrome/browser/sync/glue/http_bridge_unittest.cc @@ -7,7 +7,7 @@ #include "base/threading/thread.h" #include "chrome/browser/sync/glue/http_bridge.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/test/test_server.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_test_util.h" diff --git a/chrome/browser/sync/glue/sync_backend_host_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_unittest.cc index 64c4e43..0fee166 100644 --- a/chrome/browser/sync/glue/sync_backend_host_unittest.cc +++ b/chrome/browser/sync/glue/sync_backend_host_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/sync/sync_prefs.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "sync/engine/model_safe_worker.h" #include "sync/protocol/encryption.pb.h" diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 3d38ffd..bfdd799 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -38,7 +38,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_fetcher.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc index 066da34..90d73dd 100644 --- a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc +++ b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc @@ -11,7 +11,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/test/mock_render_process_host.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #include "skia/ext/platform_canvas.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkColorPriv.h" diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index c25372f..28ef130 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -38,9 +38,8 @@ #include "content/public/test/mock_render_process_host.h" #include "content/public/test/render_view_test.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_renderer_host.h" -#include "content/test/test_renderer_host.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_renderer_host.h" +#include "content/public/test/test_url_fetcher_factory.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/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index c59cd87..c85972f 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc @@ -14,7 +14,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc index b6ec68c..40ebf4c 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #include "net/cookies/cookie_options.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/find_bar/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc index 044e447..15f78d1 100644 --- a/chrome/browser/ui/find_bar/find_backend_unittest.cc +++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc @@ -14,7 +14,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" using content::BrowserThread; using content::WebContents; diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc index 5a53b57..85afa2a 100644 --- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc +++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc @@ -28,7 +28,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_intents_dispatcher.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/base/escape.h" #include "net/base/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc index 9db1e075..52180e7 100644 --- a/chrome/browser/ui/panels/base_panel_browser_test.cc +++ b/chrome/browser/ui/panels/base_panel_browser_test.cc @@ -28,7 +28,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/common/url_constants.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #if defined(OS_LINUX) #include "ui/base/x/x11_util.h" diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc index 3c38e8d..3acccff 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc @@ -16,7 +16,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "testing/gmock/include/gmock/gmock-actions.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc index e49a7dd..db800f1 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc @@ -18,7 +18,7 @@ #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile_manager.h" #include "content/public/browser/web_contents.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" typedef BrowserWithTestWindowTest BrowserListTest; 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 37b6568..fd5b44a 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc @@ -18,7 +18,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc index 53787d3..52357ed 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "printing/print_job_constants.h" using content::WebContents; diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc index 45d13f4..8b98a88 100644 --- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc +++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/web_contents.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/webui/web_ui_unittest.cc b/chrome/browser/ui/webui/web_ui_unittest.cc index 4eb6762..918a765 100644 --- a/chrome/browser/ui/webui/web_ui_unittest.cc +++ b/chrome/browser/ui/webui/web_ui_unittest.cc @@ -14,8 +14,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/referrer.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_renderer_host.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/test_renderer_host.h" +#include "content/public/test/web_contents_tester.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc index 1da16a3..40c97b9 100644 --- a/chrome/browser/visitedlink/visitedlink_unittest.cc +++ b/chrome/browser/visitedlink/visitedlink_unittest.cc @@ -22,7 +22,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_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 0fc2477..a3a41b3 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/common/extensions/extension_messages.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc index 666cc17..de09d06 100644 --- a/chrome/browser/web_resource/promo_resource_service_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc @@ -21,7 +21,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "testing/gtest/include/gtest/gtest.h" class PromoResourceServiceTest : public testing::Test { diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc index a60d74e..157541f 100644 --- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc +++ b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc @@ -17,7 +17,7 @@ #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/net/gaia/mock_url_fetcher_factory.h" #include "chrome/test/base/testing_profile.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" diff --git a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc index e5cebf0..fff67bf 100644 --- a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc +++ b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc @@ -11,7 +11,7 @@ #include "base/string_util.h" #include "chrome/common/net/gaia/gaia_oauth_client.h" #include "chrome/test/base/testing_profile.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/http/http_status_code.h" diff --git a/chrome/common/net/gaia/mock_url_fetcher_factory.h b/chrome/common/net/gaia/mock_url_fetcher_factory.h index 351a72a..e4ecf73 100644 --- a/chrome/common/net/gaia/mock_url_fetcher_factory.h +++ b/chrome/common/net/gaia/mock_url_fetcher_factory.h @@ -12,7 +12,7 @@ #include <string> #include "chrome/common/net/gaia/gaia_auth_fetcher.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" // Responds as though ClientLogin returned from the server. diff --git a/chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc b/chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc index 90155f0..3059a35 100644 --- a/chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc +++ b/chrome/common/net/gaia/oauth2_access_token_fetcher_unittest.cc @@ -15,7 +15,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/common/url_fetcher.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/http/http_status_code.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc b/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc index c501aa1..34f60ca 100644 --- a/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc +++ b/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc @@ -15,7 +15,7 @@ #include "chrome/common/net/gaia/oauth2_api_call_flow.h" #include "chrome/test/base/testing_profile.h" #include "content/public/common/url_fetcher.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/http/http_request_headers.h" #include "net/http/http_status_code.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc b/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc index 66a22d8..ed5a76a 100644 --- a/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc +++ b/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/common/url_fetcher.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/http/http_status_code.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/common/net/gaia/oauth2_mint_token_flow_unittest.cc b/chrome/common/net/gaia/oauth2_mint_token_flow_unittest.cc index e113399..1c897e8 100644 --- a/chrome/common/net/gaia/oauth2_mint_token_flow_unittest.cc +++ b/chrome/common/net/gaia/oauth2_mint_token_flow_unittest.cc @@ -12,7 +12,7 @@ #include "base/values.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/net/gaia/oauth2_mint_token_flow.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/net/gaia/oauth2_revocation_fetcher_unittest.cc b/chrome/common/net/gaia/oauth2_revocation_fetcher_unittest.cc index e536910b..02ca937 100644 --- a/chrome/common/net/gaia/oauth2_revocation_fetcher_unittest.cc +++ b/chrome/common/net/gaia/oauth2_revocation_fetcher_unittest.cc @@ -15,7 +15,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/common/url_fetcher.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/http/http_status_code.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc index 7f05efb..1c17c5b 100644 --- a/chrome/test/base/browser_with_test_window_test.cc +++ b/chrome/test/base/browser_with_test_window_test.cc @@ -15,7 +15,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" #include "content/public/common/page_transition_types.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #if defined(USE_AURA) #include "ui/aura/test/aura_test_helper.h" diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h index 9800375..889d463 100644 --- a/chrome/test/base/browser_with_test_window_test.h +++ b/chrome/test/base/browser_with_test_window_test.h @@ -11,7 +11,7 @@ #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN) diff --git a/chrome/test/base/chrome_render_view_host_test_harness.h b/chrome/test/base/chrome_render_view_host_test_harness.h index e39f85f..be57729 100644 --- a/chrome/test/base/chrome_render_view_host_test_harness.h +++ b/chrome/test/base/chrome_render_view_host_test_harness.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" class TestingProfile; diff --git a/chrome/test/base/run_all_unittests.cc b/chrome/test/base/run_all_unittests.cc index 42d284a..0cd1fa5 100644 --- a/chrome/test/base/run_all_unittests.cc +++ b/chrome/test/base/run_all_unittests.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/test/base/chrome_test_suite.h" -#include "content/test/unittest_test_suite.h" +#include "content/public/test/unittest_test_suite.h" int main(int argc, char **argv) { - return UnitTestTestSuite(new ChromeTestSuite(argc, argv)).Run(); + return content::UnitTestTestSuite(new ChromeTestSuite(argc, argv)).Run(); } diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc index f2adee3..3dfd473 100644 --- a/content/browser/geolocation/network_location_provider_unittest.cc +++ b/content/browser/geolocation/network_location_provider_unittest.cc @@ -11,7 +11,7 @@ #include "base/values.h" #include "content/browser/geolocation/fake_access_token_store.h" #include "content/browser/geolocation/network_location_provider.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/intents/intent_injector_unittest.cc b/content/browser/intents/intent_injector_unittest.cc index 07b21ba..ddcecc8 100644 --- a/content/browser/intents/intent_injector_unittest.cc +++ b/content/browser/intents/intent_injector_unittest.cc @@ -12,7 +12,7 @@ #include "content/common/intents_messages.h" #include "content/common/view_messages.h" #include "content/public/test/mock_render_process_host.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "webkit/glue/web_intent_data.h" #include "webkit/glue/web_intent_reply_data.h" diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h index bb8bcc2..aa12d36 100644 --- a/content/browser/renderer_host/test_render_view_host.h +++ b/content/browser/renderer_host/test_render_view_host.h @@ -12,7 +12,7 @@ #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/renderer_host/render_widget_host_view_base.h" #include "content/public/common/page_transition_types.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" // This file provides a testing framework for mocking out the RenderProcessHost // layer. It allows you to test RenderViewHost, WebContentsImpl, diff --git a/content/browser/speech/google_one_shot_remote_engine_unittest.cc b/content/browser/speech/google_one_shot_remote_engine_unittest.cc index fe31487..a393302 100644 --- a/content/browser/speech/google_one_shot_remote_engine_unittest.cc +++ b/content/browser/speech/google_one_shot_remote_engine_unittest.cc @@ -8,7 +8,7 @@ #include "content/browser/speech/google_one_shot_remote_engine.h" #include "content/public/common/speech_recognition_error.h" #include "content/public/common/speech_recognition_result.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_status.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/speech/speech_recognizer_impl_unittest.cc b/content/browser/speech/speech_recognizer_impl_unittest.cc index 24786ca..542a562 100644 --- a/content/browser/speech/speech_recognizer_impl_unittest.cc +++ b/content/browser/speech/speech_recognizer_impl_unittest.cc @@ -8,7 +8,7 @@ #include "content/browser/speech/google_one_shot_remote_engine.h" #include "content/browser/speech/speech_recognizer_impl.h" #include "content/public/browser/speech_recognition_event_listener.h" -#include "content/test/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include "media/audio/audio_manager.h" #include "media/audio/fake_audio_input_stream.h" #include "media/audio/fake_audio_output_stream.h" diff --git a/content/browser/web_contents/test_web_contents.h b/content/browser/web_contents/test_web_contents.h index b3c5aa6..2db1829 100644 --- a/content/browser/web_contents/test_web_contents.h +++ b/content/browser/web_contents/test_web_contents.h @@ -8,7 +8,7 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/page_transition_types.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "webkit/glue/webpreferences.h" class SiteInstanceImpl; diff --git a/content/browser/web_contents/web_drag_source_mac_unittest.mm b/content/browser/web_contents/web_drag_source_mac_unittest.mm index 100451e..a0f9b55 100644 --- a/content/browser/web_contents/web_drag_source_mac_unittest.mm +++ b/content/browser/web_contents/web_drag_source_mac_unittest.mm @@ -5,7 +5,7 @@ #import "content/browser/web_contents/web_drag_source_mac.h" #include "content/browser/web_contents/web_contents_impl.h" -#include "content/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/webdropdata.h" diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 18bc770..c1d4154 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -43,6 +43,10 @@ 'public/test/test_file_error_injector.h', 'public/test/test_navigation_observer.h', 'public/test/test_notification_tracker.h', + 'public/test/test_renderer_host.h', + 'public/test/test_url_fetcher_factory.h', + 'public/test/unittest_test_suite.h', + 'public/test/web_contents_tester.h', # TODO(phajdan.jr): All of those files should live in content/test (if # they're only used by content) or content/public/test (if they're used # by other embedders). @@ -105,17 +109,13 @@ 'test/test_navigation_observer.cc', 'test/test_notification_tracker.cc', 'test/test_renderer_host.cc', - 'test/test_renderer_host.h', 'test/test_render_view_host_factory.cc', 'test/test_render_view_host_factory.h', 'test/test_url_fetcher_factory.cc', - 'test/test_url_fetcher_factory.h', 'test/test_web_contents_view.cc', 'test/test_web_contents_view.h', 'test/unittest_test_suite.cc', - 'test/unittest_test_suite.h', 'test/web_contents_tester.cc', - 'test/web_contents_tester.h', # TODO(phajdan.jr): Those files should be moved to webkit # test support target. diff --git a/content/test/test_renderer_host.h b/content/public/test/test_renderer_host.h index 4ecca64..3203544 100644 --- a/content/test/test_renderer_host.h +++ b/content/public/test/test_renderer_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_TEST_TEST_RENDERER_HOST_H_ -#define CONTENT_TEST_TEST_RENDERER_HOST_H_ +#ifndef CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ +#define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ #pragma once #include "base/memory/scoped_ptr.h" @@ -184,4 +184,4 @@ class RenderViewHostTestHarness : public testing::Test { } // namespace content -#endif // CONTENT_TEST_TEST_RENDERER_HOST_H_ +#endif // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ diff --git a/content/test/test_url_fetcher_factory.h b/content/public/test/test_url_fetcher_factory.h index e508a35..62c0735 100644 --- a/content/test/test_url_fetcher_factory.h +++ b/content/public/test/test_url_fetcher_factory.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_TEST_URL_FETCHER_FACTORY_H_ -#define CONTENT_TEST_TEST_URL_FETCHER_FACTORY_H_ +#ifndef CONTENT_PUBLIC_TEST_TEST_URL_FETCHER_FACTORY_H_ +#define CONTENT_PUBLIC_TEST_TEST_URL_FETCHER_FACTORY_H_ #pragma once #include <list> @@ -290,4 +290,4 @@ class URLFetcherImplFactory : public net::URLFetcherFactory { }; -#endif // CONTENT_TEST_TEST_URL_FETCHER_FACTORY_H_ +#endif // CONTENT_PUBLIC_TEST_TEST_URL_FETCHER_FACTORY_H_ diff --git a/content/test/unittest_test_suite.h b/content/public/test/unittest_test_suite.h index 64c4ea7..5e113fa 100644 --- a/content/test/unittest_test_suite.h +++ b/content/public/test/unittest_test_suite.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_UNITTEST_TEST_SUITE_H_ -#define CONTENT_TEST_UNITTEST_TEST_SUITE_H_ +#ifndef CONTENT_PUBLIC_TEST_UNITTEST_TEST_SUITE_H_ +#define CONTENT_PUBLIC_TEST_UNITTEST_TEST_SUITE_H_ #pragma once #include "base/basictypes.h" @@ -13,6 +13,8 @@ namespace base { class TestSuite; } +namespace content { + // A special test suite that also initializes WebKit once for all unittests. // This is useful for two reasons: // 1. It allows the use of some primitive WebKit data types like WebString. @@ -35,4 +37,6 @@ class UnitTestTestSuite { DISALLOW_COPY_AND_ASSIGN(UnitTestTestSuite); }; -#endif // CONTENT_TEST_UNITTEST_TEST_SUITE_H_ +} // namespace content + +#endif // CONTENT_PUBLIC_TEST_UNITTEST_TEST_SUITE_H_ diff --git a/content/test/web_contents_tester.h b/content/public/test/web_contents_tester.h index 5fdf288..1a3bcbe 100644 --- a/content/test/web_contents_tester.h +++ b/content/public/test/web_contents_tester.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_WEB_CONTENTS_TESTER_H_ -#define CONTENT_TEST_WEB_CONTENTS_TESTER_H_ +#ifndef CONTENT_PUBLIC_TEST_WEB_CONTENTS_TESTER_H_ +#define CONTENT_PUBLIC_TEST_WEB_CONTENTS_TESTER_H_ #pragma once #include "content/public/common/page_transition_types.h" @@ -22,41 +22,36 @@ class RenderViewHost; class SiteInstance; class WebContents; -// This interface allows embedders of content/ to write tests that -// depend on a test version of WebContents. This interface can be -// retrieved from any content::WebContents that was retrieved via a -// call to RenderViewHostTestHarness::GetWebContents() (directly or -// indirectly) or constructed explicitly via one of the -// WebContentsTester::Create... methods. +// This interface allows embedders of content/ to write tests that depend on a +// test version of WebContents. This interface can be retrieved from any +// WebContents that was retrieved via a call to +// RenderViewHostTestHarness::GetWebContents() (directly or indirectly) or +// constructed explicitly via one of the WebContentsTester::Create... methods. // -// Tests within content/ can directly static_cast WebContents objects -// retrieved or created as described above to -// content::TestWebContents. +// Tests within content/ can directly static_cast WebContents objects retrieved +// or created as described above to TestWebContents. // -// Design note: We considered two alternatives to this separate test -// interface approach: +// Design note: We considered two alternatives to this separate test interface +// approach: // -// a) Define a TestWebContents interface that inherits fromn -// WebContents, and have the concrete TestWebContents inherit from it -// as well as from content::WebContentsImpl. This approach was -// discarded as it introduces a diamond inheritance pattern, which -// means we wouldn't be e.g. able to downcast from WebContents to -// WebContentsImpl using static_cast. +// a) Define a TestWebContents interface that inherits from WebContents, and +// have the concrete TestWebContents inherit from it as well as from +// WebContentsImpl. This approach was discarded as it introduces a diamond +// inheritance pattern, which means we wouldn't be e.g. able to downcast from +// WebContents to WebContentsImpl using static_cast. // -// b) Define a TestWebContents interface that inherits from -// WebContents, and have the concrete TestWebContents implement it, -// using composition of a content::WebContentsImpl to implement most -// methods. This approach was discarded as there is a fundamental -// assumption in content/ that a WebContents* can be downcast to a -// WebContentsImpl*, and this wouldn't be true for TestWebContents +// b) Define a TestWebContents interface that inherits from WebContents, and +// have the concrete TestWebContents implement it, using composition of a +// WebContentsImpl to implement most methods. This approach was discarded as +// there is a fundamental assumption in content/ that a WebContents* can be +// downcast to a WebContentsImpl*, and this wouldn't be true for TestWebContents // objects. class WebContentsTester { public: - // Retrieves a WebContentsTester to drive tests of the specified - // WebContents. As noted above you need to be sure the 'contents' - // object supports testing, i.e. is either created using one of the - // Create... functions below, or is retrieved via - // RenderViewHostTestHarness::GetWebContents(). + // Retrieves a WebContentsTester to drive tests of the specified WebContents. + // As noted above you need to be sure the 'contents' object supports testing, + // i.e. is either created using one of the Create... functions below, or is + // retrieved via RenderViewHostTestHarness::GetWebContents(). static WebContentsTester* For(WebContents* contents); // Creates a WebContents enabled for testing. @@ -87,7 +82,7 @@ class WebContentsTester { // in question have been made. virtual int GetNumberOfFocusCalls() = 0; - virtual content::RenderViewHost* GetPendingRenderViewHost() const = 0; + virtual RenderViewHost* GetPendingRenderViewHost() const = 0; // Creates a pending navigation to the given URL with the default parameters // and then commits the load with a page ID one larger than any seen. This @@ -102,17 +97,17 @@ class WebContentsTester { // Does nothing if no cross-navigation is pending. virtual void ProceedWithCrossSiteNavigation() = 0; - virtual void TestDidNavigate(content::RenderViewHost* render_view_host, + virtual void TestDidNavigate(RenderViewHost* render_view_host, int page_id, const GURL& url, - content::PageTransition transition) = 0; + PageTransition transition) = 0; virtual void TestDidNavigateWithReferrer( - content::RenderViewHost* render_view_host, + RenderViewHost* render_view_host, int page_id, const GURL& url, - const content::Referrer& referrer, - content::PageTransition transition) = 0; + const Referrer& referrer, + PageTransition transition) = 0; // Promote GetWebkitPrefs to public. virtual webkit_glue::WebPreferences TestGetWebkitPrefs() = 0; @@ -120,4 +115,4 @@ class WebContentsTester { } // namespace content -#endif // CONTENT_TEST_WEB_CONTENTS_TESTER_H_ +#endif // CONTENT_PUBLIC_TEST_WEB_CONTENTS_TESTER_H_ diff --git a/content/test/run_all_unittests.cc b/content/test/run_all_unittests.cc index 1c3c576..695cebe 100644 --- a/content/test/run_all_unittests.cc +++ b/content/test/run_all_unittests.cc @@ -3,8 +3,9 @@ // found in the LICENSE file. #include "content/test/content_test_suite.h" -#include "content/test/unittest_test_suite.h" +#include "content/public/test/unittest_test_suite.h" int main(int argc, char** argv) { - return UnitTestTestSuite(new content::ContentTestSuite(argc, argv)).Run(); + return content::UnitTestTestSuite( + new content::ContentTestSuite(argc, argv)).Run(); } diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc index 0638eee..ee1adf2 100644 --- a/content/test/test_renderer_host.cc +++ b/content/test/test_renderer_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/test/test_renderer_host.h" +#include "content/public/test/test_renderer_host.h" #include "content/browser/renderer_host/render_view_host_factory.h" #include "content/browser/renderer_host/test_render_view_host.h" diff --git a/content/test/test_url_fetcher_factory.cc b/content/test/test_url_fetcher_factory.cc index 00f9eda..5f174e5 100644 --- a/content/test/test_url_fetcher_factory.cc +++ b/content/test/test_url_fetcher_factory.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/test_url_fetcher_factory.h" +#include "content/public/test/test_url_fetcher_factory.h" #include <string> diff --git a/content/test/unittest_test_suite.cc b/content/test/unittest_test_suite.cc index 790e2b8..85597d5 100644 --- a/content/test/unittest_test_suite.cc +++ b/content/test/unittest_test_suite.cc @@ -2,13 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/test/unittest_test_suite.h" +#include "content/public/test/unittest_test_suite.h" #include "base/logging.h" #include "base/test/test_suite.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h" +namespace content { + // A stubbed out WebKit platform support impl. class UnitTestTestSuite::UnitTestWebKitPlatformSupport : public WebKit::WebKitPlatformSupport { @@ -41,3 +43,5 @@ UnitTestTestSuite::~UnitTestTestSuite() { int UnitTestTestSuite::Run() { return test_suite_->Run(); } + +} // namespace content diff --git a/content/test/web_contents_tester.cc b/content/test/web_contents_tester.cc index e6c9a2a..c640311 100644 --- a/content/test/web_contents_tester.cc +++ b/content/test/web_contents_tester.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/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "content/browser/web_contents/test_web_contents.h" diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc index 0cf97fc..2ae2aa4 100644 --- a/ui/views/test/test_views_delegate.cc +++ b/ui/views/test/test_views_delegate.cc @@ -5,7 +5,7 @@ #include "ui/views/test/test_views_delegate.h" #include "base/logging.h" -#include "content/test/web_contents_tester.h" +#include "content/public/test/web_contents_tester.h" #include "ui/base/clipboard/clipboard.h" namespace views { |