| 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 7be8bf22db57fc838129feaf7b566a27c70956f6..a7ec4610b908870451ae0826a512b49ef05a10c8 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
|
| @@ -169,7 +169,13 @@ class ShowAppListInteractiveTest : public InProcessBrowserTest {
|
| };
|
|
|
| // Test showing the app list using the command line switch.
|
| -IN_PROC_BROWSER_TEST_F(ShowAppListInteractiveTest, ShowAppListFlag) {
|
| +#if defined(OS_CHROMEOS)
|
| +// http://crbug.com/396499
|
| +#define MAYBE_ShowAppListFlag DISABLED_ShowAppListFlag
|
| +#else
|
| +#define MAYBE_ShowAppListFlag ShowAppListFlag
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(ShowAppListInteractiveTest, MAYBE_ShowAppListFlag) {
|
| AppListService* service = test::GetAppListService();
|
| // The app list should already be shown because we passed
|
| // switches::kShowAppList.
|
|
|