chromeos: makes more tests run in both mash and ash

ash/sticky_keys/sticky_keys_overlay_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ash/test/ash_test_base.h"
 #include "ui/display/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/events/event.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 21 matching lines @@
             overlay.GetModifierKeyState(ui::EF_ALT_DOWN));
   EXPECT_EQ(STICKY_KEY_STATE_ENABLED,
             overlay.GetModifierKeyState(ui::EF_CONTROL_DOWN));
   EXPECT_EQ(STICKY_KEY_STATE_LOCKED,
             overlay.GetModifierKeyState(ui::EF_COMMAND_DOWN));
 }
 
 // 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 =
       display_manager()->GetCurrentDisplayIdList();
   int64_t primary_display_id = display_ids[0];
   int64_t secondary_display_id = display_ids[1];
   display_manager()->SetLayoutForCurrentDisplays(
       display::test::CreateDisplayLayout(display_manager(),
                                          display::DisplayPlacement::LEFT, 0));
 
@@ skipping 18 matching lines @@
             overlay.GetModifierKeyState(ui::EF_SHIFT_DOWN));
   overlay.SetModifierKeyState(ui::EF_SHIFT_DOWN, STICKY_KEY_STATE_DISABLED);
   EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
             overlay.GetModifierKeyState(ui::EF_SHIFT_DOWN));
 }
 
 // Additional sticky key overlay tests that depend on chromeos::EventRewriter
 // are now in chrome/browser/chromeos/events/event_rewriter_unittest.cc .
 
 }  // namespace ash