Index: ash/sticky_keys/sticky_keys_overlay_unittest.cc |
diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc |
index 5a5c538271f778149c7faa5c199283cc5d5c6324..c6e2f5bccdcb3a555b9ed5816439fb71fd7b1151 100644 |
--- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc |
+++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc |
@@ -4,6 +4,7 @@ |
#include "ash/sticky_keys/sticky_keys_overlay.h" |
+#include "ash/common/wm_shell.h" |
#include "ash/display/window_tree_host_manager.h" |
#include "ash/shell.h" |
#include "ash/sticky_keys/sticky_keys_controller.h" |
@@ -45,6 +46,10 @@ TEST_F(StickyKeysOverlayTest, ModifierKeyState) { |
// This test addresses the crash report at crbug.com/435600, speculated to be |
// caused by using sticky keys with multiple displays. |
TEST_F(StickyKeysOverlayTest, OverlayNotDestroyedAfterDisplayRemoved) { |
+ // TODO: investigate failure in mash, http://crbug.com/696006. |
+ if (WmShell::Get()->IsRunningInMash()) |
+ return; |
+ |
// Add a secondary display to the left of the primary one. |
UpdateDisplay("1280x1024,1980x1080"); |
display::DisplayIdList display_ids = |