Last sets of tests that can move to common_unittests

ash/BUILD.gn

Index: ash/BUILD.gn
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index df0b83bceed61b0b60f9c7ace3ae4ff6eca290db..5cb28c1a511b250bc1a1d035569f88c8feafce41 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -1243,6 +1243,30 @@ source_set("common_unittests") {
     "wm/lock_state_controller_unittest.cc",
     "wm/maximize_mode/accelerometer_test_data_literals.cc",
     "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
+    "wm/overlay_event_filter_unittest.cc",
+    "wm/overview/window_selector_unittest.cc",
+    "wm/panels/panel_layout_manager_unittest.cc",
+    "wm/panels/panel_window_resizer_unittest.cc",
+    "wm/root_window_layout_manager_unittest.cc",
+    "wm/screen_dimmer_unittest.cc",
+    "wm/session_state_animator_impl_unittest.cc",
+    "wm/stacking_controller_unittest.cc",
+    "wm/system_modal_container_layout_manager_unittest.cc",
+    "wm/toplevel_window_event_handler_unittest.cc",
+    "wm/video_detector_unittest.cc",
+    "wm/window_animations_unittest.cc",
+    "wm/window_cycle_controller_unittest.cc",
+    "wm/window_manager_unittest.cc",
+    "wm/window_modality_controller_unittest.cc",
+    "wm/window_positioner_unittest.cc",
+    "wm/window_state_unittest.cc",
+    "wm/window_util_unittest.cc",
+    "wm/workspace/magnetism_matcher_unittest.cc",
+    "wm/workspace/workspace_event_handler_unittest.cc",
+    "wm/workspace/workspace_window_resizer_unittest.cc",
+    "wm/workspace_controller_test_helper.cc",
+    "wm/workspace_controller_test_helper.h",
+    "wm/workspace_controller_unittest.cc",
   ]
   deps = [
     "//ash",
@@ -1273,6 +1297,7 @@ source_set("common_unittests") {
     "//ui/views",
     "//ui/views:test_support",
     "//ui/wm",
+    "//ui/wm:test_support",
   ]
   public_deps = [
     "//ash/test:test_support_without_content",
@@ -1368,35 +1393,24 @@ test("ash_unittests") {
 
     # TODO: investigate failures in mash. http://crbug.com/698092.
     "wm/maximize_mode/maximize_mode_controller_unittest.cc",
-    "wm/overlay_event_filter_unittest.cc",
-    "wm/overview/window_selector_unittest.cc",
-    "wm/panels/panel_layout_manager_unittest.cc",
-    "wm/panels/panel_window_resizer_unittest.cc",
+
+    # TODO: mash doesn't support CursorManager. http://crbug.com/631103.
     "wm/resize_shadow_and_cursor_unittest.cc",
-    "wm/root_window_layout_manager_unittest.cc",
-    "wm/screen_dimmer_unittest.cc",
+
+    # TODO: mash doesn't support pinning. http://crbug.com/622486
     "wm/screen_pinning_controller_unittest.cc",
-    "wm/session_state_animator_impl_unittest.cc",
-    "wm/stacking_controller_unittest.cc",
+
+    # TODO: mash doesn't support SetFirstDisplayAsInternalDisplay(), which all
+    # the tests in this file use. http://crbug.com/698091.
     "wm/system_gesture_event_filter_unittest.cc",
-    "wm/system_modal_container_layout_manager_unittest.cc",
-    "wm/toplevel_window_event_handler_unittest.cc",
-    "wm/video_detector_unittest.cc",
-    "wm/window_animations_unittest.cc",
-    "wm/window_cycle_controller_unittest.cc",
-    "wm/window_manager_unittest.cc",
-    "wm/window_modality_controller_unittest.cc",
-    "wm/window_positioner_unittest.cc",
-    "wm/window_state_unittest.cc",
-    "wm/window_util_unittest.cc",
-    "wm/workspace/magnetism_matcher_unittest.cc",
+
+    # TODO: MultiWindowResizeControllerTests fail in mash.
+    # http://crbug.com/699172.
     "wm/workspace/multi_window_resize_controller_unittest.cc",
-    "wm/workspace/workspace_event_handler_unittest.cc",
+
+    # TODO: fails because the virtual keyboard is not enabled in mash.
+    # http://crbug.com/648733.
     "wm/workspace/workspace_layout_manager_keyboard_unittest.cc",
-    "wm/workspace/workspace_window_resizer_unittest.cc",
-    "wm/workspace_controller_test_helper.cc",
-    "wm/workspace_controller_test_helper.h",
-    "wm/workspace_controller_unittest.cc",
   ]
   configs += [
     "//build/config:precompiled_headers",
@@ -1458,7 +1472,6 @@ test("ash_unittests") {
     "//ui/views",
     "//ui/views:test_support",
     "//ui/wm",
-    "//ui/wm:test_support",
     "//url",
   ]