Enables ScreenPinningController for mash/mus

ash/BUILD.gn

 # 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//ui/base/ui_features.gni")
 
 # Historical note: Ash shipped on Windows for a couple years to support
@@ skipping 1124 matching lines @@
     "//ash/resources:ash_test_resources_with_content_100_percent",
     "//ash/resources:ash_test_resources_200_percent",
   ]
 }
 
 # This target includes the tests that are run by both ash and mash. Eventually
 # the majority of tests in |ash_unittests| should move here.
 source_set("common_unittests") {
   testonly = true
   sources = [
+    "accelerators/accelerator_commands_unittest.cc",
     "accelerators/accelerator_controller_unittest.cc",
     "accelerators/accelerator_filter_unittest.cc",
     "accelerators/spoken_feedback_toggler_unittest.cc",
     "ash_touch_exploration_manager_chromeos_unittest.cc",
     "autoclick/autoclick_unittest.cc",
     "common/accelerators/accelerator_table_unittest.cc",
     "common/devtools/ash_devtools_unittest.cc",
     "common/drag_drop/drag_image_view_unittest.cc",
     "common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc",
     "common/frame/custom_frame_view_ash_unittest.cc",
@@ skipping 80 matching lines @@
     "wm/immersive_fullscreen_controller_unittest.cc",
     "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/screen_pinning_controller_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",
@@ skipping 39 matching lines @@
     "//ui/wm",
     "//ui/wm:test_support",
   ]
   public_deps = [
     "//ash/test:test_support_without_content",
   ]
 }
 
 test("ash_unittests") {
   sources = [
-    # TODO: move to common_unittests. Fails because of http://crbug.com/622486.
-    "accelerators/accelerator_commands_unittest.cc",
-
     # TODO: move to common_unittests. Fails because of http://crbug.com/557401.
     "accelerators/magnifier_key_scroller_unittest.cc",
 
     # Specific to classic-ash.
     "app_list/app_list_presenter_delegate_unittest.cc",
 
     # TODO: move to common_unittests when http://crbug.com/693790 is fixed.
     "aura/pointer_watcher_adapter_unittest.cc",
 
     # TODO: decide if this needs to be ported. http://crbug.com/695566.
@@ skipping 67 matching lines @@
     # TODO: fails because keyboard is not enabled in mash.
     # http://crbug.com/648733.
     "wm/lock_layout_manager_unittest.cc",
 
     # TODO: investigate failures in mash. http://crbug.com/698092.
     "wm/maximize_mode/maximize_mode_controller_unittest.cc",
 
     # TODO: mash doesn't support CursorManager. http://crbug.com/631103.
     "wm/resize_shadow_and_cursor_unittest.cc",
 
-    # TODO: mash doesn't support pinning. http://crbug.com/622486
-    "wm/screen_pinning_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",
 
     # TODO: MultiWindowResizeControllerTests fail in mash.
     # http://crbug.com/699172.
     "wm/workspace/multi_window_resize_controller_unittest.cc",
 
     # TODO: fails because the virtual keyboard is not enabled in mash.
     # http://crbug.com/648733.
@@ skipping 95 matching lines @@
     "//content/public/app:both",
     "//device/bluetooth",
   ]
 
   data_deps = [
     "//ash/strings:ash_test_strings",
     "//ash/resources:ash_test_resources_with_content_100_percent",
     "//ash/resources:ash_test_resources_200_percent",
   ]
 }