Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

chrome/chrome_tests.gypi

 # Copyright (c) 2012 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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 2214 matching lines @@
         'test/base/chrome_render_view_test.cc',
         'test/base/chrome_render_view_test.h',
         'test/base/menu_model_test.cc',
         'test/base/menu_model_test.h',
         'test/base/v8_unit_test.cc',
         'test/base/v8_unit_test.h',
         'test/data/resource.rc',
         '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.
         '../base/prefs/public/pref_change_registrar_unittest.cc',
         '../base/prefs/overlay_user_pref_store_unittest.cc',
         '../base/prefs/pref_value_map_unittest.cc',
         '../base/prefs/json_pref_store_unittest.cc',
 
         # TODO(joi): Move the google_apis tests to a separate
         # google_apis_unittests executable.
@@ skipping 76 matching lines @@
             ['exclude', '^browser/extensions/api/'],
             ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc'],
           ],
         }],
         ['use_ash==1', {
           'sources': [
             'browser/ui/app_list/apps_model_builder_unittest.cc',
           ],
           '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.
           'conditions': [
             ['OS=="win"', {
               'sources!': [
                 'browser/ui/window_sizer/window_sizer_ash_unittest.cc',
               ],
             }, { # else: OS!=win
               'sources!': [
                 'browser/ui/window_sizer/window_sizer_unittest.cc',
               ],
             }],
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:test_support_aura',
           ],
           'sources/': [
             ['exclude', '^browser/automation/automation_provider_unittest.cc'],
             ['exclude', '^browser/ui/views/extensions/browser_action_drag_data_unittest.cc'],
             ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc'],
             ['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/': [
             ['exclude', '^browser/task_manager/'],
             ['exclude', '^browser/ui/webui/task_manager/'],
           ],
         }],
         ['file_manager_extension==0', {
           'sources!': [
             'browser/ui/views/select_file_dialog_extension_unittest.cc',
@@ skipping 2642 matching lines @@
             'sync_integration_tests.isolate',
           ],
           'sources': [
             'sync_integration_tests.isolate',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }