| Index: ash/shelf/shelf_view_unittest.cc
|
| diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
|
| index 01d7681d012c8ebcb058f28205bbaa2f9369b901..896586f92d2d97613cb77dfa5a6eb6de313cdd5f 100644
|
| --- a/ash/shelf/shelf_view_unittest.cc
|
| +++ b/ash/shelf/shelf_view_unittest.cc
|
| @@ -2985,6 +2985,11 @@ TEST_F(OverflowButtonActiveInkDropTest, TouchDragOutAndBack) {
|
| // Tests ink drop state transitions for the overflow button when it is active
|
| // and the user long presses on the button to show the context menu.
|
| TEST_F(OverflowButtonActiveInkDropTest, TouchContextMenu) {
|
| + // TODO: investigate failure in mash, http://crbug.com/695751. Note, that this
|
| + // one is a bit flaky. Some times it passes with mash, other times not.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| ui::test::EventGenerator& generator = GetEventGenerator();
|
| generator.set_current_location(GetScreenPointInsideOverflowButton());
|
| base::ScopedMockTimeMessageLoopTaskRunner mock_task_runner;
|
|
|