| Index: ash/accelerators/accelerator_controller_unittest.cc
|
| diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
|
| index 2f8b034f678200b6423b969b1abce9f1c46d4f79..e6934a26dab4fdc62ed1f5eeaea419506239b185 100644
|
| --- a/ash/accelerators/accelerator_controller_unittest.cc
|
| +++ b/ash/accelerators/accelerator_controller_unittest.cc
|
| @@ -966,7 +966,15 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
|
| #endif
|
| }
|
|
|
| -TEST_F(AcceleratorControllerTest, GlobalAcceleratorsToggleAppList) {
|
| +#if defined(OS_WIN) && defined(USE_AURA)
|
| +// Bug 316012.
|
| +#define MAYBE_GlobalAcceleratorsToggleAppList \
|
| + DISABLED_GlobalAcceleratorsToggleAppList
|
| +#else
|
| +#define MAYBE_GlobalAcceleratorsToggleAppList GlobalAcceleratorsToggleAppList
|
| +#endif
|
| +
|
| +TEST_F(AcceleratorControllerTest, MAYBE_GlobalAcceleratorsToggleAppList) {
|
| AccessibilityDelegate* delegate =
|
| ash::Shell::GetInstance()->accessibility_delegate();
|
| EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
|
|
|