| 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 4ee32b3b3a9b42b877c5321c3265df7fbcc0fb4d..e354cb90e37591186965a801d993d3711fc3677b 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
|
| @@ -46,24 +46,30 @@ class AppListServiceInteractiveTest : public InProcessBrowserTest {
|
|
|
| // ChromeOS does not support ShowForProfile(), or profile switching within the
|
| // app list. Profile switching on CrOS goes through a different code path.
|
| -// The tests are flaky on Mac, so disable there too. See http://crbug.com/415264
|
| -#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
|
| +#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_SwitchAppListProfilesDuringSearch \
|
| - SwitchAppListProfilesDuringSearch
|
| #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
|
| +#endif
|
| +
|
| // Show the app list, then dismiss it.
|
| IN_PROC_BROWSER_TEST_F(AppListServiceInteractiveTest, MAYBE_ShowAndDismiss) {
|
| AppListService* service = test::GetAppListService();
|
|
|