diff options
| author | lfg <lfg@chromium.org> | 2014-09-18 22:31:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-19 05:31:34 +0000 |
| commit | 910f2f9803b96e22989b6ac2ea80a50c49b9d20f (patch) | |
| tree | b1338fb258969d1ce0514dc3bc1fea6816baaf8d | |
| parent | 4860e1362eb5541c160ef85ad1c75ce338752f6f (diff) | |
| download | chromium_src-910f2f9803b96e22989b6ac2ea80a50c49b9d20f.zip chromium_src-910f2f9803b96e22989b6ac2ea80a50c49b9d20f.tar.gz chromium_src-910f2f9803b96e22989b6ac2ea80a50c49b9d20f.tar.bz2 | |
Move extension_test_message_listener to extensions.
This CL is part of the refactoring of webview into extensions/, and the webview test infrastructure depends heavily on this. Webview tests will be added to extensions soon.
BUG=352290
Review URL: https://codereview.chromium.org/584513003
Cr-Commit-Position: refs/heads/master@{#295665}
86 files changed, 88 insertions, 88 deletions
diff --git a/apps/app_restore_service_browsertest.cc b/apps/app_restore_service_browsertest.cc index d1d8790..8e383f1 100644 --- a/apps/app_restore_service_browsertest.cc +++ b/apps/app_restore_service_browsertest.cc @@ -7,13 +7,13 @@ #include "apps/saved_files_service.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/notification_types.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" using extensions::Extension; using extensions::ExtensionPrefs; diff --git a/apps/app_shim/app_shim_interactive_uitest_mac.mm b/apps/app_shim/app_shim_interactive_uitest_mac.mm index 5806225..c065ea5 100644 --- a/apps/app_shim/app_shim_interactive_uitest_mac.mm +++ b/apps/app_shim/app_shim_interactive_uitest_mac.mm @@ -22,7 +22,6 @@ #include "base/test/test_timeouts.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/web_app_mac.h" #include "chrome/common/chrome_paths.h" @@ -31,6 +30,7 @@ #include "content/public/test/test_utils.h" #include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_registry.h" +#include "extensions/test/extension_test_message_listener.h" #import "ui/events/test/cocoa_test_event_utils.h" namespace { diff --git a/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm b/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm index 6978ccb..04fdbdb 100644 --- a/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm +++ b/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm @@ -13,12 +13,12 @@ #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_shutdown.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/interactive_test_utils.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_registry.h" +#include "extensions/test/extension_test_message_listener.h" #include "ui/events/test/cocoa_test_event_utils.h" using extensions::PlatformAppBrowserTest; diff --git a/apps/load_and_launch_browsertest.cc b/apps/load_and_launch_browsertest.cc index 0471415..d63772b 100644 --- a/apps/load_and_launch_browsertest.cc +++ b/apps/load_and_launch_browsertest.cc @@ -11,10 +11,10 @@ #include "base/test/test_timeouts.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_switches.h" #include "content/public/test/test_launcher.h" +#include "extensions/test/extension_test_message_listener.h" using extensions::PlatformAppBrowserTest; diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index c1de41e..9c91fad 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -892,8 +892,6 @@ source_set("test_support") { "extensions/api/messaging/native_messaging_test_util.h", "extensions/extension_notification_observer.cc", "extensions/extension_notification_observer.h", - "extensions/extension_test_message_listener.cc", - "extensions/extension_test_message_listener.h", "extensions/mock_extension_special_storage_policy.cc", "extensions/mock_extension_special_storage_policy.h", "extensions/test_blacklist.cc", diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm index 0d0aba4..ffe4b02 100644 --- a/chrome/browser/app_controller_mac_browsertest.mm +++ b/chrome/browser/app_controller_mac_browsertest.mm @@ -17,7 +17,6 @@ #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" @@ -35,6 +34,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/app_window/app_window_registry.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/test/embedded_test_server/embedded_test_server.h" namespace { diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index 1c837c2..4e6ba14 100644 --- a/chrome/browser/apps/app_browsertest.cc +++ b/chrome/browser/apps/app_browsertest.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/application_launch.h" @@ -44,6 +43,7 @@ #include "extensions/browser/notification_types.h" #include "extensions/browser/pref_names.h" #include "extensions/common/api/app_runtime.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" diff --git a/chrome/browser/apps/app_browsertest_util.cc b/chrome/browser/apps/app_browsertest_util.cc index 919a98f..fe95405 100644 --- a/chrome/browser/apps/app_browsertest_util.cc +++ b/chrome/browser/apps/app_browsertest_util.cc @@ -8,7 +8,6 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" #include "chrome/browser/extensions/extension_function_test_utils.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/apps/chrome_app_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/application_launch.h" @@ -20,6 +19,7 @@ #include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/process_manager.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" using content::WebContents; diff --git a/chrome/browser/apps/app_crash_browsertest.cc b/chrome/browser/apps/app_crash_browsertest.cc index d35e106..6767a4b 100644 --- a/chrome/browser/apps/app_crash_browsertest.cc +++ b/chrome/browser/apps/app_crash_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/apps/app_browsertest_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" +#include "extensions/test/extension_test_message_listener.h" // This class of BrowserTests is a helper to create tests related to crashes in // Chrome Apps. To be tested, the app will have to be placed as any other test diff --git a/chrome/browser/apps/app_pointer_lock_interactive_uitest.cc b/chrome/browser/apps/app_pointer_lock_interactive_uitest.cc index 70ffefb..5daf2fc 100644 --- a/chrome/browser/apps/app_pointer_lock_interactive_uitest.cc +++ b/chrome/browser/apps/app_pointer_lock_interactive_uitest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "chrome/browser/apps/app_browsertest_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/test/base/interactive_test_utils.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" class ExtensionPointerLockTest : public extensions::PlatformAppBrowserTest { diff --git a/chrome/browser/apps/app_url_redirector_browsertest.cc b/chrome/browser/apps/app_url_redirector_browsertest.cc index 865087c5..f94aae3 100644 --- a/chrome/browser/apps/app_url_redirector_browsertest.cc +++ b/chrome/browser/apps/app_url_redirector_browsertest.cc @@ -7,13 +7,13 @@ #include "base/win/windows_version.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_base.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/test/embedded_test_server/embedded_test_server.h" namespace extensions { diff --git a/chrome/browser/apps/app_view_browsertest.cc b/chrome/browser/apps/app_view_browsertest.cc index b2e2a1d..2641602 100644 --- a/chrome/browser/apps/app_view_browsertest.cc +++ b/chrome/browser/apps/app_view_browsertest.cc @@ -4,7 +4,6 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/apps/app_browsertest_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" @@ -13,6 +12,7 @@ #include "extensions/browser/guest_view/guest_view_manager.h" #include "extensions/browser/guest_view/guest_view_manager_factory.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/chrome/browser/apps/app_window_browsertest.cc b/chrome/browser/apps/app_window_browsertest.cc index 51945f1..ff549ce 100644 --- a/chrome/browser/apps/app_window_browsertest.cc +++ b/chrome/browser/apps/app_window_browsertest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "chrome/browser/apps/app_browsertest_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/application_launch.h" @@ -12,6 +11,7 @@ #include "extensions/browser/app_window/app_window_geometry_cache.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" using extensions::AppWindowGeometryCache; diff --git a/chrome/browser/apps/app_window_interactive_uitest.cc b/chrome/browser/apps/app_window_interactive_uitest.cc index 3fbb0a2..aedd24c 100644 --- a/chrome/browser/apps/app_window_interactive_uitest.cc +++ b/chrome/browser/apps/app_window_interactive_uitest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "chrome/browser/apps/app_browsertest_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/test/base/interactive_test_utils.h" #include "extensions/browser/app_window/native_app_window.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #if defined(OS_MACOSX) && !defined(OS_IOS) diff --git a/chrome/browser/apps/ephemeral_app_browsertest.cc b/chrome/browser/apps/ephemeral_app_browsertest.cc index 32c809a..49a07fd 100644 --- a/chrome/browser/apps/ephemeral_app_browsertest.cc +++ b/chrome/browser/apps/ephemeral_app_browsertest.cc @@ -17,7 +17,6 @@ #include "chrome/browser/extensions/app_sync_data.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" @@ -39,6 +38,7 @@ #include "extensions/browser/uninstall_reason.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "sync/api/fake_sync_change_processor.h" #include "sync/api/sync_change_processor_wrapper_for_test.h" diff --git a/chrome/browser/apps/ephemeral_app_launcher_browsertest.cc b/chrome/browser/apps/ephemeral_app_launcher_browsertest.cc index 1f83eaf6..0ecb803 100644 --- a/chrome/browser/apps/ephemeral_app_launcher_browsertest.cc +++ b/chrome/browser/apps/ephemeral_app_launcher_browsertest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/apps/ephemeral_app_service.h" #include "chrome/browser/extensions/extension_install_checker.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/test_blacklist.h" #include "chrome/browser/extensions/webstore_installer_test.h" @@ -23,6 +22,7 @@ #include "extensions/browser/management_policy.h" #include "extensions/browser/process_manager.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" using extensions::Extension; using extensions::ExtensionPrefs; diff --git a/chrome/browser/apps/event_page_browsertest.cc b/chrome/browser/apps/event_page_browsertest.cc index 2e7acac..e547bdc 100644 --- a/chrome/browser/apps/event_page_browsertest.cc +++ b/chrome/browser/apps/event_page_browsertest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "chrome/browser/apps/app_browsertest_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test.h" #include "content/public/test/test_utils.h" #include "extensions/browser/notification_types.h" +#include "extensions/test/extension_test_message_listener.h" using extensions::Extension; using extensions::PlatformAppBrowserTest; diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc index 314783f..caaf3ed 100644 --- a/chrome/browser/apps/web_view_browsertest.cc +++ b/chrome/browser/apps/web_view_browsertest.cc @@ -7,7 +7,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/chrome_content_browser_client.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/prerender/prerender_link_manager.h" #include "chrome/browser/prerender/prerender_link_manager_factory.h" #include "chrome/browser/profiles/profile.h" @@ -33,6 +32,7 @@ #include "extensions/browser/guest_view/guest_view_manager_factory.h" #include "extensions/common/extension.h" #include "extensions/common/extensions_client.h" +#include "extensions/test/extension_test_message_listener.h" #include "media/base/media_switches.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" diff --git a/chrome/browser/apps/web_view_interactive_browsertest.cc b/chrome/browser/apps/web_view_interactive_browsertest.cc index 281d32a3..fac77e9 100644 --- a/chrome/browser/apps/web_view_interactive_browsertest.cc +++ b/chrome/browser/apps/web_view_interactive_browsertest.cc @@ -7,7 +7,6 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/chrome_content_browser_client.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h" @@ -27,6 +26,7 @@ #include "extensions/browser/guest_view/guest_view_base.h" #include "extensions/browser/guest_view/guest_view_manager.h" #include "extensions/browser/guest_view/guest_view_manager_factory.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/text_input_client.h" diff --git a/chrome/browser/apps/window_controls_browsertest.cc b/chrome/browser/apps/window_controls_browsertest.cc index 7a6936e..ca2c5cb 100644 --- a/chrome/browser/apps/window_controls_browsertest.cc +++ b/chrome/browser/apps/window_controls_browsertest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "chrome/browser/apps/app_browsertest_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "content/public/test/browser_test_utils.h" #include "extensions/browser/process_manager.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" class WindowControlsTest : public extensions::PlatformAppBrowserTest { protected: diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc index e3a0ddb..9aea82c 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc @@ -23,7 +23,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" @@ -32,6 +31,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/test/test_utils.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" #include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index 1b5ba72..a212f73 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc @@ -31,7 +31,6 @@ #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" @@ -46,6 +45,7 @@ #include "extensions/browser/app_window/app_window_registry.h" #include "extensions/browser/notification_types.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc index 86ce9b5..d2ce436 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc @@ -8,7 +8,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chromeos/ime/component_extension_ime_manager.h" #include "chromeos/ime/composition_text.h" #include "chromeos/ime/input_method_descriptor.h" @@ -17,6 +16,7 @@ #include "content/public/test/test_utils.h" #include "extensions/browser/process_manager.h" #include "extensions/common/manifest_handlers/background_info.h" +#include "extensions/test/extension_test_message_listener.h" #include "ui/base/ime/chromeos/ime_bridge.h" #include "ui/base/ime/chromeos/mock_ime_candidate_window_handler.h" #include "ui/base/ime/chromeos/mock_ime_input_context_handler.h" diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index f6c3d8c..1da1d8c 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc @@ -36,7 +36,6 @@ #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile_impl.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profiles_state.h" @@ -58,6 +57,7 @@ #include "extensions/browser/app_window/app_window_registry.h" #include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_system.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_switches.h" diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc index ade4e56..c4133ae 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc +++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chromeos/login/signin_specifics.h" #include "chrome/browser/chromeos/login/test/oobe_base_test.h" #include "chrome/browser/chromeos/login/wizard_controller.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h" @@ -34,6 +33,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" #include "extensions/browser/process_manager.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_urls.h" diff --git a/chrome/browser/extensions/active_script_controller_browsertest.cc b/chrome/browser/extensions/active_script_controller_browsertest.cc index c5bd27b..5348d1d 100644 --- a/chrome/browser/extensions/active_script_controller_browsertest.cc +++ b/chrome/browser/extensions/active_script_controller_browsertest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/active_script_controller.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/extensions/test_extension_dir.h" #include "chrome/browser/ui/browser.h" @@ -17,6 +16,7 @@ #include "content/public/test/browser_test_utils.h" #include "extensions/common/feature_switch.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc b/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc index 9aa01af..1a84629 100644 --- a/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc +++ b/chrome/browser/extensions/activity_log/ad_injection_browsertest.cc @@ -11,9 +11,9 @@ #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/activity_log/ad_network_database.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/test/base/ui_test_utils.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_response.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc index b83a7f6..6c947f6 100644 --- a/chrome/browser/extensions/all_urls_apitest.cc +++ b/chrome/browser/extensions/all_urls_apitest.cc @@ -5,7 +5,6 @@ #include "base/command_line.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/test_switches.h" @@ -14,6 +13,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extensions_client.h" +#include "extensions/test/extension_test_message_listener.h" const std::string kAllUrlsTarget = "files/extensions/api_test/all_urls/index.html"; diff --git a/chrome/browser/extensions/api/audio/audio_apitest.cc b/chrome/browser/extensions/api/audio/audio_apitest.cc index f00a686..4b72507 100644 --- a/chrome/browser/extensions/api/audio/audio_apitest.cc +++ b/chrome/browser/extensions/api/audio/audio_apitest.cc @@ -6,8 +6,8 @@ #include "base/message_loop/message_loop.h" #include "chrome/browser/extensions/api/audio/audio_api.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/common/chrome_switches.h" +#include "extensions/test/extension_test_message_listener.h" namespace extensions { diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc index af628cd0..f965577 100644 --- a/chrome/browser/extensions/api/automation/automation_apitest.cc +++ b/chrome/browser/extensions/api/automation/automation_apitest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/api/automation_internal/automation_util.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -18,6 +17,7 @@ #include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/cast_streaming/performance_test.cc b/chrome/browser/extensions/api/cast_streaming/performance_test.cc index 4881e3d..07b3f5d 100644 --- a/chrome/browser/extensions/api/cast_streaming/performance_test.cc +++ b/chrome/browser/extensions/api/cast_streaming/performance_test.cc @@ -16,7 +16,6 @@ #include "base/win/windows_version.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" @@ -34,6 +33,7 @@ #include "extensions/common/features/feature.h" #include "extensions/common/features/simple_feature.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "media/base/audio_bus.h" #include "media/base/video_frame.h" #include "media/cast/cast_config.h" diff --git a/chrome/browser/extensions/api/declarative/declarative_apitest.cc b/chrome/browser/extensions/api/declarative/declarative_apitest.cc index b8b459c..7b464d7 100644 --- a/chrome/browser/extensions/api/declarative/declarative_apitest.cc +++ b/chrome/browser/extensions/api/declarative/declarative_apitest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/extensions/api/declarative/rules_registry_service.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/test_extension_dir.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -21,6 +20,7 @@ #include "extensions/browser/api/declarative_webrequest/webrequest_constants.h" #include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" using content::BrowserThread; using extensions::Extension; diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc index 65eb40a..31e7b70 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc @@ -7,13 +7,13 @@ #include "chrome/browser/extensions/extension_action_test_util.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_tab_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/test_extension_dir.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/features/feature_channel.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/test/extension_test_message_listener.h" #include "testing/gmock/include/gmock/gmock.h" namespace extensions { diff --git a/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc b/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc index 0c9b717..33e412e 100644 --- a/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc +++ b/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc @@ -6,12 +6,12 @@ #include "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/test_extension_dir.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc b/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc index b626a72..525c386 100644 --- a/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc +++ b/chrome/browser/extensions/api/declarative_content/set_icon_apitest.cc @@ -5,10 +5,10 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_tab_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/test_extension_dir.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/features/feature_channel.h" +#include "extensions/test/extension_test_message_listener.h" #include "ui/gfx/image/image_skia.h" namespace extensions { diff --git a/chrome/browser/extensions/api/dial/dial_apitest.cc b/chrome/browser/extensions/api/dial/dial_apitest.cc index 872b3ca..62ab634 100644 --- a/chrome/browser/extensions/api/dial/dial_apitest.cc +++ b/chrome/browser/extensions/api/dial/dial_apitest.cc @@ -8,8 +8,8 @@ #include "chrome/browser/extensions/api/dial/dial_registry.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "testing/gmock/include/gmock/gmock.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/extension_action/browser_action_browsertest.cc b/chrome/browser/extensions/api/extension_action/browser_action_browsertest.cc index cf7bd79..099f869 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_browsertest.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_browsertest.cc @@ -7,12 +7,12 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/state_store.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" #include "third_party/skia/include/core/SkColor.h" namespace extensions { diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc index 1912380..40f349a2 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -24,6 +23,7 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "extensions/common/permissions/permissions_data.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #if defined(OS_WIN) diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc index 0cf395a..cf01934 100644 --- a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc +++ b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/hotword_client.h" #include "chrome/browser/search/hotword_service.h" @@ -15,6 +14,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" namespace { diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc index 6a57a4b..3b31c6e 100644 --- a/chrome/browser/extensions/api/management/management_api_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "content/public/browser/notification_service.h" @@ -23,6 +22,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/browser/notification_types.h" #include "extensions/common/test_util.h" +#include "extensions/test/extension_test_message_listener.h" namespace keys = extension_management_api_constants; namespace util = extension_function_test_utils; diff --git a/chrome/browser/extensions/api/management/management_apitest.cc b/chrome/browser/extensions/api/management/management_apitest.cc index 25ef84e..4be0a3e 100644 --- a/chrome/browser/extensions/api/management/management_apitest.cc +++ b/chrome/browser/extensions/api/management/management_apitest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/api/management/management_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/launch_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -22,6 +21,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/browser/test_management_policy.h" #include "extensions/common/manifest.h" +#include "extensions/test/extension_test_message_listener.h" using extensions::Extension; using extensions::Manifest; diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index 4075f13..7ba688f 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_management.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/updater/extension_downloader.h" #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/profiles/profile.h" @@ -32,6 +31,7 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/notification_types.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/url_request/test_url_request_interceptor.h" #include "net/url_request/url_fetcher.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc index 35e02ce..20f164b 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc @@ -14,7 +14,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" @@ -24,6 +23,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" namespace { diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc index bfd478f..3257802 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc @@ -14,7 +14,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" @@ -24,6 +23,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" namespace { diff --git a/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc b/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc index 9d4c4fd..e729c65 100644 --- a/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc +++ b/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/apps/app_browsertest_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" +#include "extensions/test/extension_test_message_listener.h" // Supported on all platforms, but on Windows only if RLZ is enabled. #if !defined(OS_WIN) || defined(ENABLE_RLZ) diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc index e90539a..77a926d 100644 --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" @@ -17,6 +16,7 @@ #include "content/public/browser/notification_service.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/test_extension_registry_observer.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" namespace { diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc index 30704a4..3b8315d 100644 --- a/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc +++ b/chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/extensions/api/preferences_private/preferences_private_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -30,6 +29,7 @@ #include "components/bookmarks/common/bookmark_constants.h" #include "components/sync_driver/sync_prefs.h" #include "content/public/browser/browser_context.h" +#include "extensions/test/extension_test_message_listener.h" #if defined(OS_CHROMEOS) #include "chromeos/chromeos_switches.h" diff --git a/chrome/browser/extensions/api/processes/processes_apitest.cc b/chrome/browser/extensions/api/processes/processes_apitest.cc index 2ff5e57..34f8afb 100644 --- a/chrome/browser/extensions/api/processes/processes_apitest.cc +++ b/chrome/browser/extensions/api/processes/processes_apitest.cc @@ -4,13 +4,13 @@ #include "base/command_line.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/task_manager/task_manager_browsertest_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_window.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" // Test is flaky: http://crbug.com/346990 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) { diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc index 4cef006..70cb356 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h" #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/invalidation/fake_invalidation_service.h" #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" #include "chrome/browser/profiles/profile.h" @@ -21,6 +20,7 @@ #include "components/invalidation/invalidation_service.h" #include "components/invalidation/profile_invalidation_provider.h" #include "components/keyed_service/core/keyed_service.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "google/cacheinvalidation/types.pb.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc index 03ba0b4..32e6267 100644 --- a/chrome/browser/extensions/api/socket/socket_apitest.cc +++ b/chrome/browser/extensions/api/socket/socket_apitest.cc @@ -6,7 +6,6 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/in_process_browser_test.h" @@ -14,6 +13,7 @@ #include "extensions/browser/api/dns/host_resolver_wrapper.h" #include "extensions/browser/api/dns/mock_host_resolver_creator.h" #include "extensions/browser/api/socket/socket_api.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/dns/mock_host_resolver.h" #include "net/test/spawned_test_server/spawned_test_server.h" diff --git a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc index d1e34c7..b38f175 100644 --- a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc +++ b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc @@ -7,7 +7,6 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/common/chrome_paths.h" @@ -16,6 +15,7 @@ #include "extensions/browser/api/dns/host_resolver_wrapper.h" #include "extensions/browser/api/dns/mock_host_resolver_creator.h" #include "extensions/browser/api/sockets_tcp/sockets_tcp_api.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/dns/mock_host_resolver.h" #include "net/test/spawned_test_server/spawned_test_server.h" diff --git a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc index 99148b3..a5eef79 100644 --- a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc +++ b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/common/chrome_paths.h" @@ -18,6 +17,7 @@ #include "extensions/browser/api/dns/mock_host_resolver_creator.h" #include "extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.h" #include "extensions/common/test_util.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/dns/mock_host_resolver.h" #include "net/test/spawned_test_server/spawned_test_server.h" diff --git a/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc b/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc index 1ddeb13..9518da6 100644 --- a/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc +++ b/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc @@ -7,7 +7,6 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/common/chrome_paths.h" @@ -17,6 +16,7 @@ #include "extensions/browser/api/dns/host_resolver_wrapper.h" #include "extensions/browser/api/dns/mock_host_resolver_creator.h" #include "extensions/browser/api/sockets_udp/sockets_udp_api.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/dns/mock_host_resolver.h" #include "net/test/spawned_test_server/spawned_test_server.h" diff --git a/chrome/browser/extensions/api/storage/settings_apitest.cc b/chrome/browser/extensions/api/storage/settings_apitest.cc index a0a886b..1a14f39 100644 --- a/chrome/browser/extensions/api/storage/settings_apitest.cc +++ b/chrome/browser/extensions/api/storage/settings_apitest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/api/storage/settings_sync_util.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_system_factory.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/ui_test_utils.h" @@ -18,6 +17,7 @@ #include "extensions/browser/api/storage/storage_frontend.h" #include "extensions/browser/extension_system.h" #include "extensions/common/value_builder.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "sync/api/fake_sync_change_processor.h" #include "sync/api/sync_change.h" diff --git a/chrome/browser/extensions/api/system_network/system_network_apitest.cc b/chrome/browser/extensions/api/system_network/system_network_apitest.cc index c0bd42f..3ce9d58 100644 --- a/chrome/browser/extensions/api/system_network/system_network_apitest.cc +++ b/chrome/browser/extensions/api/system_network/system_network_apitest.cc @@ -8,13 +8,13 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "extensions/browser/api/system_network/system_network_api.h" #include "extensions/common/test_util.h" +#include "extensions/test/extension_test_message_listener.h" using extensions::Extension; using extensions::core_api::SystemNetworkGetNetworkInterfacesFunction; diff --git a/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc index c29e1c1..1a98c1c 100644 --- a/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc +++ b/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc @@ -8,10 +8,10 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/system_storage/storage_api_test_util.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "components/storage_monitor/storage_monitor.h" #include "components/storage_monitor/test_storage_monitor.h" #include "extensions/browser/api/system_storage/storage_info_provider.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" namespace { diff --git a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc index 93445a9..6ef8bc6 100644 --- a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc +++ b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc @@ -9,7 +9,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/system_storage/storage_api_test_util.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "components/storage_monitor/storage_info.h" #include "components/storage_monitor/storage_monitor.h" #include "components/storage_monitor/test_storage_monitor.h" @@ -20,6 +19,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" namespace { diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc index 975a40b..8bc8145 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" @@ -15,6 +14,7 @@ #include "content/public/browser/render_process_host.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #if defined(OS_WIN) diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc index c76694c..5e8c8fd 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc @@ -12,7 +12,6 @@ #include "base/win/windows_version.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" @@ -28,6 +27,7 @@ #include "extensions/common/features/feature.h" #include "extensions/common/features/simple_feature.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/perf/perf_test.h" #include "ui/compositor/compositor_switches.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc index 36694b5..917b026 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/api/web_request/web_request_api.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/login/login_prompt.h" @@ -20,6 +19,7 @@ #include "content/public/test/browser_test_utils.h" #include "extensions/browser/extension_system.h" #include "extensions/common/features/feature.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc index 81f04c4..0f2b490 100644 --- a/chrome/browser/extensions/app_background_page_apitest.cc +++ b/chrome/browser/extensions/app_background_page_apitest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" @@ -26,6 +25,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/extension_bindings_apitest.cc b/chrome/browser/extensions/extension_bindings_apitest.cc index ed12130..5f1bb82 100644 --- a/chrome/browser/extensions/extension_bindings_apitest.cc +++ b/chrome/browser/extensions/extension_bindings_apitest.cc @@ -6,13 +6,13 @@ #include "chrome/browser/extensions/api/permissions/permissions_api.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" #include "extensions/browser/extension_host.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index dd3f8a9..fef404d 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc @@ -4,7 +4,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/lazy_background_page_test_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" @@ -17,6 +16,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/browser/test_management_policy.h" #include "extensions/common/extension_set.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/dns/mock_host_resolver.h" #include "ui/base/models/menu_model.h" diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc index bd6df72..f65a8ea 100644 --- a/chrome/browser/extensions/extension_incognito_apitest.cc +++ b/chrome/browser/extensions/extension_incognito_apitest.cc @@ -5,7 +5,6 @@ #include "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" @@ -14,6 +13,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc index c71fa4f..3f39a81 100644 --- a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc +++ b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc @@ -9,13 +9,13 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_storage_monitor.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/test_extension_registry_observer.h" +#include "extensions/test/extension_test_message_listener.h" #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_observer.h" diff --git a/chrome/browser/extensions/extension_test_message_listener_unittest.cc b/chrome/browser/extensions/extension_test_message_listener_unittest.cc index a020aac..d4c00a5 100644 --- a/chrome/browser/extensions/extension_test_message_listener_unittest.cc +++ b/chrome/browser/extensions/extension_test_message_listener_unittest.cc @@ -5,8 +5,8 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_api_unittest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "extensions/browser/api/test/test_api.h" +#include "extensions/test/extension_test_message_listener.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_webui_apitest.cc b/chrome/browser/extensions/extension_webui_apitest.cc index d3f7777..9177f24 100644 --- a/chrome/browser/extensions/extension_webui_apitest.cc +++ b/chrome/browser/extensions/extension_webui_apitest.cc @@ -7,7 +7,6 @@ #include "base/path_service.h" #include "base/values.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" @@ -20,6 +19,7 @@ #include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index 95de5d1..945fbb7 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/lazy_background_page_test_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" @@ -30,6 +29,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/shared_module_apitest.cc b/chrome/browser/extensions/shared_module_apitest.cc index dc33302..71fcfbf 100644 --- a/chrome/browser/extensions/shared_module_apitest.cc +++ b/chrome/browser/extensions/shared_module_apitest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" +#include "extensions/test/extension_test_message_listener.h" using extensions::Extension; diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index b841b74..313923a 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -7,7 +7,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" @@ -29,6 +28,7 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc index df600d8..3848c31 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc @@ -14,7 +14,6 @@ #include "base/strings/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/policy/profile_policy_connector_factory.h" #include "chrome/browser/policy/test/local_policy_test_server.h" @@ -28,6 +27,7 @@ #include "components/policy/core/common/policy_switches.h" #include "components/policy/core/common/policy_test_utils.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" #include "net/url_request/url_request_context_getter.h" #include "policy/proto/chrome_extension_policy.pb.h" #include "policy/proto/cloud_policy.pb.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index 88a4755..9960694 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -27,7 +27,6 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_service.h" #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h" @@ -55,6 +54,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "extensions/common/switches.h" +#include "extensions/test/extension_test_message_listener.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/app_list/views/apps_grid_view.h" #include "ui/aura/client/aura_constants.h" diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm index 2e660de..0736b44 100644 --- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm @@ -11,7 +11,6 @@ #include "base/strings/sys_string_conversions.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_iterator.h" #include "chrome/browser/ui/browser_window.h" @@ -20,6 +19,7 @@ #include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/uninstall_reason.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" namespace { diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc index 74a952b..348dec0 100644 --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_browser_application_mac.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/notifications/message_center_notification_manager.h" #include "chrome/browser/notifications/notification_ui_manager.h" @@ -23,6 +22,7 @@ #include "extensions/browser/app_window/app_window_registry.h" #include "extensions/browser/app_window/native_app_window.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" #include "ui/message_center/message_center.h" using extensions::AppWindowRegistry; diff --git a/chrome/browser/ui/location_bar/location_bar_browsertest.cc b/chrome/browser/ui/location_bar/location_bar_browsertest.cc index 1849f89..feb3321 100644 --- a/chrome/browser/ui/location_bar/location_bar_browsertest.cc +++ b/chrome/browser/ui/location_bar/location_bar_browsertest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/test_extension_dir.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser.h" @@ -21,6 +20,7 @@ #include "extensions/common/extension_builder.h" #include "extensions/common/feature_switch.h" #include "extensions/common/value_builder.h" +#include "extensions/test/extension_test_message_listener.h" namespace { diff --git a/chrome/browser/ui/panels/panel_extension_browsertest.cc b/chrome/browser/ui/panels/panel_extension_browsertest.cc index 5d6e9c5..73c1ff1 100644 --- a/chrome/browser/ui/panels/panel_extension_browsertest.cc +++ b/chrome/browser/ui/panels/panel_extension_browsertest.cc @@ -8,7 +8,6 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" #include "chrome/browser/ui/browser.h" @@ -23,6 +22,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/test_utils.h" #include "extensions/common/extension.h" +#include "extensions/test/extension_test_message_listener.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc index b54859e..9919fdb 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc @@ -16,7 +16,6 @@ #include "chrome/browser/chromeos/file_manager/volume_manager.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" @@ -28,6 +27,7 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/test/test_utils.h" +#include "extensions/test/extension_test_message_listener.h" #include "ui/shell_dialogs/select_file_dialog.h" #include "ui/shell_dialogs/selected_file_info.h" diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index c86173b..e2d2a09 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1798,8 +1798,6 @@ 'browser/extensions/api/messaging/native_messaging_test_util.h', 'browser/extensions/extension_notification_observer.cc', 'browser/extensions/extension_notification_observer.h', - 'browser/extensions/extension_test_message_listener.cc', - 'browser/extensions/extension_test_message_listener.h', 'browser/extensions/mock_extension_special_storage_policy.cc', 'browser/extensions/mock_extension_special_storage_policy.h', 'browser/extensions/test_blacklist.cc', diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 007328d..38b25e5 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -83,6 +83,8 @@ source_set("test_support") { "common/value_builder.h", "renderer/test_extensions_renderer_client.cc", "renderer/test_extensions_renderer_client.h", + "test/extension_test_message_listener.cc", + "test/extension_test_message_listener.h", "test/test_extensions_client.cc", "test/test_extensions_client.h", "test/test_permission_message_provider.cc", diff --git a/extensions/browser/api/app_window/app_window_apitest.cc b/extensions/browser/api/app_window/app_window_apitest.cc index a63def1..fcc86a2 100644 --- a/extensions/browser/api/app_window/app_window_apitest.cc +++ b/extensions/browser/api/app_window/app_window_apitest.cc @@ -5,13 +5,13 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/apps/app_browsertest_util.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/test/base/testing_profile.h" #include "extensions/browser/app_window/app_window.h" #include "extensions/browser/app_window/app_window_registry.h" #include "extensions/browser/app_window/native_app_window.h" +#include "extensions/test/extension_test_message_listener.h" #include "ui/base/base_window.h" #include "ui/gfx/rect.h" diff --git a/extensions/browser/api/bluetooth/bluetooth_apitest.cc b/extensions/browser/api/bluetooth/bluetooth_apitest.cc index 3dd30a0..a808027 100644 --- a/extensions/browser/api/bluetooth/bluetooth_apitest.cc +++ b/extensions/browser/api/bluetooth/bluetooth_apitest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/ui_test_utils.h" #include "device/bluetooth/bluetooth_adapter.h" @@ -20,6 +19,7 @@ #include "extensions/browser/api/bluetooth/bluetooth_api.h" #include "extensions/browser/api/bluetooth/bluetooth_event_router.h" #include "extensions/common/test_util.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc index 252eb5c..e9997e9 100644 --- a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc +++ b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc @@ -4,7 +4,6 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "device/bluetooth/test/mock_bluetooth_adapter.h" #include "device/bluetooth/test/mock_bluetooth_device.h" #include "device/bluetooth/test/mock_bluetooth_gatt_characteristic.h" @@ -15,6 +14,7 @@ #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h" #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h" #include "extensions/common/test_util.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc b/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc index 6cc42cc..d746870 100644 --- a/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc +++ b/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/ui_test_utils.h" #include "device/bluetooth/bluetooth_adapter_factory.h" @@ -18,6 +17,7 @@ #include "device/bluetooth/test/mock_bluetooth_socket.h" #include "extensions/browser/api/bluetooth_socket/bluetooth_socket_api.h" #include "extensions/common/test_util.h" +#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index e530396..130f75d 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -941,6 +941,8 @@ 'common/value_builder.h', 'renderer/test_extensions_renderer_client.cc', 'renderer/test_extensions_renderer_client.h', + 'test/extension_test_message_listener.cc', + 'test/extension_test_message_listener.h', 'test/result_catcher.cc', 'test/result_catcher.h', 'test/test_extensions_client.cc', diff --git a/chrome/browser/extensions/extension_test_message_listener.cc b/extensions/test/extension_test_message_listener.cc index 083594b..a1970be 100644 --- a/chrome/browser/extensions/extension_test_message_listener.cc +++ b/extensions/test/extension_test_message_listener.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/extensions/extension_test_message_listener.h" +#include "extensions/test/extension_test_message_listener.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/chrome/browser/extensions/extension_test_message_listener.h b/extensions/test/extension_test_message_listener.h index d0d5bbb..b2d6132 100644 --- a/chrome/browser/extensions/extension_test_message_listener.h +++ b/extensions/test/extension_test_message_listener.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 CHROME_BROWSER_EXTENSIONS_EXTENSION_TEST_MESSAGE_LISTENER_H_ -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_TEST_MESSAGE_LISTENER_H_ +#ifndef EXTENSIONS_TEST_EXTENSION_TEST_MESSAGE_LISTENER_H_ +#define EXTENSIONS_TEST_EXTENSION_TEST_MESSAGE_LISTENER_H_ #include <string> @@ -171,4 +171,4 @@ class ExtensionTestMessageListener : public content::NotificationObserver { scoped_refptr<extensions::TestSendMessageFunction> function_; }; -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_TEST_MESSAGE_LISTENER_H_ +#endif // EXTENSIONS_TEST_EXTENSION_TEST_MESSAGE_LISTENER_H_ |