| Index: ash/shelf/shelf_view_unittest.cc
|
| diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
|
| index 5b374ef2105805552390c501a22cd8cfc8559a0e..6aaaada3e767e412feff7472382a36e3a0903287 100644
|
| --- a/ash/shelf/shelf_view_unittest.cc
|
| +++ b/ash/shelf/shelf_view_unittest.cc
|
| @@ -2754,6 +2754,11 @@ TEST_F(OverflowButtonInkDropTest, TouchDragOutAndBack) {
|
| // Tests ink drop state transitions for the overflow button when the user long
|
| // presses on the button to show the context menu.
|
| TEST_F(OverflowButtonInkDropTest, 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;
|
|
|