chromeos: makes more tests run in both mash and ash

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 1200 matching lines @@
     "common/wm/overview/cleanup_animation_observer_unittest.cc",
     "common/wm/workspace/workspace_layout_manager_unittest.cc",
     "common/wm_window_unittest.cc",
     "common/wm_window_user_data_unittest.cc",
     "first_run/first_run_helper_unittest.cc",
     "focus_cycler_unittest.cc",
     "frame/caption_buttons/frame_size_button_unittest.cc",
     "laser/laser_pointer_controller_unittest.cc",
     "laser/laser_pointer_points_unittest.cc",
     "laser/laser_segment_utils_unittest.cc",
+    "metrics/desktop_task_switch_metric_recorder_unittest.cc",
+    "metrics/task_switch_metrics_recorder_unittest.cc",
+    "metrics/task_switch_time_tracker_unittest.cc",
+    "metrics/user_metrics_recorder_unittest.cc",
+    "root_window_controller_unittest.cc",
+    "rotator/screen_rotation_animation_unittest.cc",
+    "screen_util_unittest.cc",
+    "shelf/shelf_layout_manager_unittest.cc",
+    "shelf/shelf_unittest.cc",
+    "shelf/shelf_view_unittest.cc",
+    "shelf/shelf_widget_unittest.cc",
+    "shell_unittest.cc",
+    "sticky_keys/sticky_keys_overlay_unittest.cc",
+    "sticky_keys/sticky_keys_unittest.cc",
+    "system/chromeos/power/power_event_observer_unittest.cc",
+    "system/chromeos/power/tablet_power_button_controller_unittest.cc",
+    "system/chromeos/power/video_activity_notifier_unittest.cc",
   ]
   deps = [
     "//ash",
     "//ash/common/test:test_support",
     "//ash/public/cpp:ash_public_cpp",
     "//ash/public/interfaces",
     "//ash/resources/vector_icons",
     "//ash/test:test_support_without_content",
     "//base",
     "//base/test:test_support",
@@ skipping 64 matching lines @@
 
     # These exercise classic-ash specific functionality.
     "drag_drop/drag_drop_controller_unittest.cc",
     "drag_drop/drag_drop_tracker_unittest.cc",
 
     # TODO: port to mash. http://crbug.com/695570.
     "extended_desktop_unittest.cc",
 
     # Specific to X11.
     "host/ash_window_tree_host_x11_unittest.cc",
+
+    # TODO: magnifier not supported in mash. http://crbug.com/647438.
     "magnifier/magnification_controller_unittest.cc",
     "magnifier/partial_magnification_controller_unittest.cc",
-    "metrics/desktop_task_switch_metric_recorder_unittest.cc",
-    "metrics/task_switch_metrics_recorder_unittest.cc",
-    "metrics/task_switch_time_tracker_unittest.cc",
-    "metrics/user_metrics_recorder_unittest.cc",
-    "root_window_controller_unittest.cc",
-    "rotator/screen_rotation_animation_unittest.cc",
-    "screen_util_unittest.cc",
-    "shelf/shelf_layout_manager_unittest.cc",
-    "shelf/shelf_unittest.cc",
-    "shelf/shelf_view_unittest.cc",
-    "shelf/shelf_widget_unittest.cc",
-    "shell_unittest.cc",
-    "sticky_keys/sticky_keys_overlay_unittest.cc",
-    "sticky_keys/sticky_keys_unittest.cc",
-    "system/chromeos/power/power_event_observer_unittest.cc",
-    "system/chromeos/power/tablet_power_button_controller_unittest.cc",
-    "system/chromeos/power/video_activity_notifier_unittest.cc",
+
+    # TODO: investigate failure in mash, http://crbug.com/695887.
     "system/chromeos/rotation/tray_rotation_lock_unittest.cc",
     "system/chromeos/screen_layout_observer_unittest.cc",
     "system/overview/overview_button_tray_unittest.cc",
     "system/toast/toast_manager_unittest.cc",
     "system/web_notification/ash_popup_alignment_delegate_unittest.cc",
     "system/web_notification/web_notification_tray_unittest.cc",
     "test/ash_test_helper_unittest.cc",
     "test/ash_test_suite.cc",
     "test/ash_test_suite.h",
     "test/ash_unittests.cc",
@@ skipping 143 matching lines @@
     "//content/public/app:both",
     "//device/bluetooth",
   ]
 
   data_deps = [
     "//ash/common/strings:ash_test_strings",
     "//ash/resources:ash_test_resources_with_content_100_percent",
     "//ash/resources:ash_test_resources_200_percent",
   ]
 }