Move WindowModalityController to CoreWm.

ash/ash.gyp

Index: ash/ash.gyp
===================================================================
--- ash/ash.gyp	(revision 170620)
+++ ash/ash.gyp	(working copy)
@@ -373,8 +373,6 @@
         'wm/window_cycle_controller.h',
         'wm/window_cycle_list.cc',
         'wm/window_cycle_list.h',
-        'wm/window_modality_controller.cc',
-        'wm/window_modality_controller.h',
         'wm/window_properties.cc',
         'wm/window_properties.h',
         'wm/window_resizer.cc',
@@ -459,10 +457,6 @@
       'sources': [
         'test/ash_test_base.cc',
         'test/ash_test_base.h',
-        'test/capture_tracking_view.cc',
-        'test/capture_tracking_view.h',
-        'test/child_modal_window.cc',
-        'test/child_modal_window.h',
         'test/cursor_manager_test_api.cc',
         'test/cursor_manager_test_api.h',
         'test/launcher_view_test_api.cc',
@@ -506,6 +500,7 @@
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_test_support',
         '../ui/views/views.gyp:views',
+        '../ui/views/views.gyp:views_test_support',
         '../ui/views/views.gyp:views_examples_with_content_lib',
         '../ui/views/views.gyp:views_with_content_test_support',
         'ash',
@@ -642,7 +637,6 @@
         '../ui/views/views.gyp:views_test_support',
         'ash',
         'ash_resources',
-        'test_support_ash',
       ],
       'sources': [
         'shell/app_list.cc',