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

Unified Diff: chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc

Issue 599803002: Mac: Deflake AppListServiceInteractiveTest.SwitchAppListProfilesDuringSearch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20140923-AppList-OnShutdown
Patch Set: rebase to master 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 | « no previous file | ui/app_list/cocoa/apps_search_results_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
diff --git a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
index e354cb90e37591186965a801d993d3711fc3677b..85039dd5e120f381c3303231ed7f994253805981 100644
--- a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
@@ -49,25 +49,18 @@ class AppListServiceInteractiveTest : public InProcessBrowserTest {
#if defined(OS_CHROMEOS)
#define MAYBE_ShowAndDismiss DISABLED_ShowAndDismiss
#define MAYBE_SwitchAppListProfiles DISABLED_SwitchAppListProfiles
+#define MAYBE_SwitchAppListProfilesDuringSearch \
+ DISABLED_SwitchAppListProfilesDuringSearch
#define MAYBE_ShowAppListNonDefaultProfile \
DISABLED_ShowAppListNonDefaultProfile
#define MAYBE_DeleteShowingAppList DISABLED_DeleteShowingAppList
#else
#define MAYBE_ShowAndDismiss ShowAndDismiss
#define MAYBE_SwitchAppListProfiles SwitchAppListProfiles
-#define MAYBE_ShowAppListNonDefaultProfile ShowAppListNonDefaultProfile
-#define MAYBE_DeleteShowingAppList DeleteShowingAppList
-#endif
-
-// SwitchAppListProfilesDuringSearch disabled on ChromeOS for reasons above.
-// Disabled on Mac due to an AppKit bug which makes it flaky in rare cases.
-// http://crbug.com/417148.
-#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
-#define MAYBE_SwitchAppListProfilesDuringSearch \
- DISABLED_SwitchAppListProfilesDuringSearch
-#else
#define MAYBE_SwitchAppListProfilesDuringSearch \
SwitchAppListProfilesDuringSearch
+#define MAYBE_ShowAppListNonDefaultProfile ShowAppListNonDefaultProfile
+#define MAYBE_DeleteShowingAppList DeleteShowingAppList
#endif
// Show the app list, then dismiss it.
« no previous file with comments | « no previous file | ui/app_list/cocoa/apps_search_results_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698