| Index: chrome/browser/ui/app_list/app_list_controller_browsertest.cc
|
| diff --git a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
|
| index 6279157a3219b27d9a28b0848ab40d5d30ea5860..92068035f9752609c0a6689726a2302d9f722ba8 100644
|
| --- a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
|
| +++ b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
|
| @@ -191,7 +191,14 @@ class ShowAppListBrowserTest : public InProcessBrowserTest {
|
| DISALLOW_COPY_AND_ASSIGN(ShowAppListBrowserTest);
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(ShowAppListBrowserTest, ShowAppListFlag) {
|
| +// See http://crbug.com/315677
|
| +#if defined(OS_WIN)
|
| +#define MAYBE_ShowAppListFlag DISABLED_ShowAppListFlag
|
| +#else
|
| +#define MAYBE_ShowAppListFlag ShowAppListFlag
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ShowAppListBrowserTest, MAYBE_ShowAppListFlag) {
|
| AppListService* service = GetAppListService();
|
| // The app list should already be shown because we passed
|
| // switches::kShowAppList.
|
|
|