diff options
Diffstat (limited to 'chrome/browser/apps')
5 files changed, 13 insertions, 6 deletions
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index 5e5f320..1c837c2 100644 --- a/chrome/browser/apps/app_browsertest.cc +++ b/chrome/browser/apps/app_browsertest.cc @@ -44,6 +44,7 @@ #include "extensions/browser/notification_types.h" #include "extensions/browser/pref_names.h" #include "extensions/common/api/app_runtime.h" +#include "extensions/test/result_catcher.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" @@ -1089,7 +1090,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, #define MAYBE_Messaging Messaging #endif IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_Messaging) { - ExtensionApiTest::ResultCatcher result_catcher; + ResultCatcher result_catcher; LoadAndLaunchPlatformApp("messaging/app2", "Ready"); LoadAndLaunchPlatformApp("messaging/app1", "Launched"); EXPECT_TRUE(result_catcher.GetNextResult()); @@ -1309,7 +1310,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ReinstallDataCleanup) { ASSERT_TRUE(extension); extension_id = extension->id(); - ExtensionApiTest::ResultCatcher result_catcher; + ResultCatcher result_catcher; EXPECT_TRUE(result_catcher.GetNextResult()); } @@ -1322,7 +1323,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ReinstallDataCleanup) { ASSERT_TRUE(extension); ASSERT_EQ(extension_id, extension->id()); - ExtensionApiTest::ResultCatcher result_catcher; + ResultCatcher result_catcher; EXPECT_TRUE(result_catcher.GetNextResult()); } } diff --git a/chrome/browser/apps/app_pointer_lock_interactive_uitest.cc b/chrome/browser/apps/app_pointer_lock_interactive_uitest.cc index b514cc5..70ffefb 100644 --- a/chrome/browser/apps/app_pointer_lock_interactive_uitest.cc +++ b/chrome/browser/apps/app_pointer_lock_interactive_uitest.cc @@ -6,6 +6,7 @@ #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/result_catcher.h" class ExtensionPointerLockTest : public extensions::PlatformAppBrowserTest { public: @@ -13,7 +14,7 @@ class ExtensionPointerLockTest : public extensions::PlatformAppBrowserTest { ExtensionTestMessageListener launched_listener("Launched", true); LoadAndLaunchPlatformApp(app_path, &launched_listener); - ResultCatcher catcher; + extensions::ResultCatcher catcher; if (!ui_test_utils::ShowAndFocusNativeWindow( GetFirstAppWindow()->GetNativeWindow())) { diff --git a/chrome/browser/apps/app_window_browsertest.cc b/chrome/browser/apps/app_window_browsertest.cc index 5651e4d..51945f1 100644 --- a/chrome/browser/apps/app_window_browsertest.cc +++ b/chrome/browser/apps/app_window_browsertest.cc @@ -12,8 +12,10 @@ #include "extensions/browser/app_window/app_window_geometry_cache.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "extensions/test/result_catcher.h" using extensions::AppWindowGeometryCache; +using extensions::ResultCatcher; // This helper class can be used to wait for changes in the app window // geometry cache registry for a specific window in a specific extension. diff --git a/chrome/browser/apps/app_window_interactive_uitest.cc b/chrome/browser/apps/app_window_interactive_uitest.cc index 38bfa33..3fbb0a2 100644 --- a/chrome/browser/apps/app_window_interactive_uitest.cc +++ b/chrome/browser/apps/app_window_interactive_uitest.cc @@ -6,6 +6,7 @@ #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/result_catcher.h" #if defined(OS_MACOSX) && !defined(OS_IOS) #include "base/mac/mac_util.h" @@ -49,7 +50,7 @@ class AppWindowInteractiveTest : public extensions::PlatformAppBrowserTest { ExtensionTestMessageListener launched_listener("Launched", true); LoadAndLaunchPlatformApp("window_api_interactive", &launched_listener); - ResultCatcher catcher; + extensions::ResultCatcher catcher; launched_listener.Reply(testName); if (!catcher.GetNextResult()) { diff --git a/chrome/browser/apps/ephemeral_app_browsertest.cc b/chrome/browser/apps/ephemeral_app_browsertest.cc index 690f11b..41afd93 100644 --- a/chrome/browser/apps/ephemeral_app_browsertest.cc +++ b/chrome/browser/apps/ephemeral_app_browsertest.cc @@ -39,6 +39,7 @@ #include "extensions/browser/uninstall_reason.h" #include "extensions/common/extension.h" #include "extensions/common/switches.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" #include "sync/api/sync_error_factory_mock.h" @@ -54,6 +55,7 @@ using extensions::ExtensionRegistry; using extensions::ExtensionRegistryObserver; using extensions::ExtensionSystem; using extensions::Manifest; +using extensions::ResultCatcher; namespace { @@ -609,7 +611,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest, ASSERT_TRUE(receiver); // Verify that messages are received while the app is running. - ExtensionApiTest::ResultCatcher result_catcher; + ResultCatcher result_catcher; LoadAndLaunchPlatformApp("ephemeral_apps/messaging_sender_success", "Launched"); EXPECT_TRUE(result_catcher.GetNextResult()); |