Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Unified Diff: chrome/browser/apps/app_browsertest.cc

Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/apps/app_pointer_lock_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/app_browsertest.cc
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index 578c1549e23fd9bf2feeae0ce4d6bebb9ab06346..e0ba814e621f71233446ac29908ec2628a4a3391 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"
@@ -1086,7 +1087,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());
@@ -1302,7 +1303,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());
}
@@ -1315,7 +1316,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());
}
}
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/apps/app_pointer_lock_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698