| Index: chrome/chrome_tests.gypi
|
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
|
| index a3b0e193c5b2ac5abc6c4f31158cdd794b061318..f38c5168a94c464607ff8b5c8f042e9757a861a4 100644
|
| --- a/chrome/chrome_tests.gypi
|
| +++ b/chrome/chrome_tests.gypi
|
| @@ -447,17 +447,6 @@
|
| 'browser/translate/standalone_cld_data_harness.h',
|
| 'browser/translate/translate_browsertest.cc',
|
| 'browser/translate/translate_manager_browsertest.cc',
|
| - 'browser/ui/ash/accelerator_commands_browsertest.cc',
|
| - 'browser/ui/ash/accelerator_controller_browsertest.cc',
|
| - 'browser/ui/ash/keyboard_controller_browsertest.cc',
|
| - 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
|
| - 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
|
| - 'browser/ui/ash/multi_user/multi_user_window_manager_test.cc',
|
| - 'browser/ui/ash/multi_user/multi_user_window_manager_test.h',
|
| - 'browser/ui/ash/shelf_browsertest.cc',
|
| - 'browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc',
|
| - 'browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc',
|
| - 'browser/ui/ash/volume_controller_browsertest_chromeos.cc',
|
| 'browser/ui/autofill/autofill_dialog_controller_browsertest.cc',
|
| 'browser/ui/autofill/autofill_dialog_view_tester.h',
|
| 'browser/ui/autofill/card_unmask_prompt_view_browsertest.cc',
|
| @@ -622,11 +611,24 @@
|
| 'test/gpu/webgl_infobar_browsertest.cc',
|
| 'test/ppapi/ppapi_browsertest.cc',
|
| ],
|
| + 'chrome_browser_tests_ash_sources': [
|
| + 'browser/ui/ash/accelerator_commands_browsertest.cc',
|
| + 'browser/ui/ash/accelerator_controller_browsertest.cc',
|
| + 'browser/ui/ash/keyboard_controller_browsertest.cc',
|
| + 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
|
| + 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
|
| + 'browser/ui/ash/multi_user/multi_user_window_manager_test.cc',
|
| + 'browser/ui/ash/multi_user/multi_user_window_manager_test.h',
|
| + 'browser/ui/ash/shelf_browsertest.cc',
|
| + 'browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc',
|
| + 'browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc',
|
| + 'browser/ui/ash/volume_controller_browsertest_chromeos.cc',
|
| + 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
|
| + ],
|
| # Cross-platform views browser tests ready for toolkit-views on Mac.
|
| 'chrome_browser_tests_views_sources': [
|
| 'browser/ui/global_error/global_error_service_browsertest.cc',
|
| 'browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc',
|
| - 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
|
| 'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc',
|
| 'browser/ui/views/select_file_dialog_extension_browsertest.cc',
|
| ],
|
| @@ -1065,7 +1067,6 @@
|
| 'test/base/interactive_test_utils_win.cc',
|
| 'test/base/interactive_ui_tests_main.cc',
|
| 'test/base/view_event_test_platform_part.h',
|
| - 'test/base/view_event_test_platform_part_ash.cc',
|
| 'test/base/view_event_test_platform_part_chromeos.cc',
|
| 'test/base/view_event_test_platform_part_mac.mm',
|
| 'test/ppapi/ppapi_interactive_browsertest.cc',
|
| @@ -1086,7 +1087,6 @@
|
| '../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc',
|
| '../ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc',
|
| '../ui/views/widget/widget_interactive_uitest.cc',
|
| - 'browser/ui/views/ash/tab_scrubber_browsertest.cc',
|
| 'browser/ui/views/menu_controller_interactive_uitest.cc',
|
| 'browser/ui/views/menu_item_view_interactive_uitest.cc',
|
| 'browser/ui/views/menu_model_adapter_test.cc',
|
| @@ -1192,7 +1192,9 @@
|
| 'chrome_interactive_ui_test_ash_sources': [
|
| '../ash/drag_drop/drag_drop_interactive_uitest.cc',
|
| '../ash/wm/ash_native_cursor_manager_interactive_uitest.cc',
|
| + 'browser/ui/views/ash/tab_scrubber_browsertest.cc',
|
| 'browser/ui/window_sizer/window_sizer_ash_uitest.cc',
|
| + 'test/base/view_event_test_platform_part_ash.cc',
|
| ],
|
| 'chrome_interactive_ui_test_non_desktop_linux_sources': [
|
| # TODO(port): Everything here times out. Attempts have been made to fix
|
| @@ -2317,6 +2319,7 @@
|
| ],
|
| }],
|
| ['use_ash==1', {
|
| + 'sources': [ '<@(chrome_browser_tests_ash_sources)' ],
|
| 'dependencies': [
|
| '../ash/ash.gyp:ash_test_support',
|
| ],
|
|
|