Last sets of tests that can move to common_unittests

ash/wm/window_manager_unittest.cc

Index: ash/wm/window_manager_unittest.cc
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index 79b1a2be1c35e328f26bbd781f01012b63f88d93..a43812012685489951d50f4fd28f389a510fde90 100644
--- a/ash/wm/window_manager_unittest.cc
+++ b/ash/wm/window_manager_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ -461,6 +462,10 @@ TEST_F(WindowManagerTest, ActivateOnTouch) {
 }
 
 TEST_F(WindowManagerTest, MouseEventCursors) {
+  // TODO: investigate failure in mash. http://crbug.com/698895.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
 
   // Create a window.
@@ -696,6 +701,10 @@ TEST_F(WindowManagerTest, AdditionalFilters) {
 
 // Touch visually hides the cursor.
 TEST_F(WindowManagerTest, UpdateCursorVisibility) {
+  // TODO: mash doesn't support CursorManager. http://crbug.com/631103.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   ui::test::EventGenerator& generator = GetEventGenerator();
   ::wm::CursorManager* cursor_manager =
       ash::Shell::GetInstance()->cursor_manager();
@@ -716,6 +725,10 @@ TEST_F(WindowManagerTest, UpdateCursorVisibility) {
 
 // Cursor is hidden on keypress.
 TEST_F(WindowManagerTest, UpdateCursorVisibilityOnKeyEvent) {
+  // TODO: mash doesn't support CursorManager. http://crbug.com/631103.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   ui::test::EventGenerator& generator = GetEventGenerator();
   ::wm::CursorManager* cursor_manager =
       ash::Shell::GetInstance()->cursor_manager();
@@ -737,6 +750,10 @@ TEST_F(WindowManagerTest, UpdateCursorVisibilityOnKeyEvent) {
 
 // Test that pressing an accelerator does not hide the cursor.
 TEST_F(WindowManagerTest, UpdateCursorVisibilityAccelerator) {
+  // TODO: mash doesn't support CursorManager. http://crbug.com/631103.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   ui::test::EventGenerator& generator = GetEventGenerator();
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
 
@@ -758,6 +775,10 @@ TEST_F(WindowManagerTest, UpdateCursorVisibilityAccelerator) {
 }
 
 TEST_F(WindowManagerTest, TestCursorClientObserver) {
+  // TODO: mash doesn't support CursorManager. http://crbug.com/631103.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   ui::test::EventGenerator& generator = GetEventGenerator();
   ::wm::CursorManager* cursor_manager =
       ash::Shell::GetInstance()->cursor_manager();