Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 23e31337327a7d6ac3bb34c9be652e9c244ad6fa..3c699bc70f738b8096a7cbe913172595979cf01d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2232,9 +2232,6 @@
         'test/data/unit/framework_unittest.gtestjs',
         'test/logging/win/mof_data_parser_unittest.cc',
         'tools/convert_dict/convert_dict_unittest.cc',
-        '../ash/test/test_launcher_delegate.cc',
-        '../ash/test/test_launcher_delegate.h',
-        '../ash/test/test_shell_delegate.cc',
 
         # TODO(joi): Move to 'base_prefs' target in base/base.gyp once
         # Prefs move is complete and dependencies have been broken.
@@ -2331,6 +2328,7 @@
           ],
           'dependencies': [
             '../ash/ash.gyp:ash_resources',
+            '../ash/ash.gyp:test_support_ash',
           ],
           # We eventually want to compile both in Win Aura builds, see
           # http://crbug.com/155545.
@@ -2357,12 +2355,6 @@
             ['exclude', '^browser/ui/panels/display_settings_provider_win_unittest.cc'],
             ['exclude', '^browser/bookmarks/bookmark_node_data_unittest.cc'],
           ],
-          'sources': [
-            '../ash/test/multi_display_manager_test_api.cc',
-            '../ash/test/multi_display_manager_test_api.h',
-            '../ash/test/ash_test_base.cc',
-            '../ash/test/ash_test_base.h',
-          ],
         }],
         ['enable_task_manager==0', {
           'sources/': [