Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(530)

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1861233003: Prepare for building with enable_app_list=0 on Desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to master (dependent CL landed) Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'build_angle_deqp_tests%': 0, 6 'build_angle_deqp_tests%': 0,
7 'chrome_browser_extensions_test_support_sources': [ 7 'chrome_browser_extensions_test_support_sources': [
8 # A list of sources which is shared between different browser tests. 8 # A list of sources which is shared between different browser tests.
9 'browser/apps/app_browsertest_util.cc', 9 'browser/apps/app_browsertest_util.cc',
10 'browser/apps/app_browsertest_util.h', 10 'browser/apps/app_browsertest_util.h',
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 ], 659 ],
660 # Cross-platform views browser tests ready for toolkit-views on Mac. 660 # Cross-platform views browser tests ready for toolkit-views on Mac.
661 'chrome_browser_tests_views_sources': [ 661 'chrome_browser_tests_views_sources': [
662 'browser/ui/global_error/global_error_service_browsertest.cc', 662 'browser/ui/global_error/global_error_service_browsertest.cc',
663 'browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.c c', 663 'browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.c c',
664 'browser/ui/views/frame/browser_non_client_frame_view_browsertest_win.cc', 664 'browser/ui/views/frame/browser_non_client_frame_view_browsertest_win.cc',
665 'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc ', 665 'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc ',
666 'browser/ui/views/select_file_dialog_extension_browsertest.cc', 666 'browser/ui/views/select_file_dialog_extension_browsertest.cc',
667 ], 667 ],
668 # Cross-platform (except Mac/Cocoa) views browser tests. Excluded on Mac 668 # Cross-platform (except Mac/Cocoa) views browser tests. Excluded on Mac
669 # unless building with mac_views_browser=1. Assumes app list is enabled (as 669 # unless building with mac_views_browser=1.
670 # for chrome_browser_ui_views_non_mac_sources).
671 'chrome_browser_tests_views_non_mac_sources': [ 670 'chrome_browser_tests_views_non_mac_sources': [
672 # This assumes the AppListService is views-based.
673 'browser/ui/app_list/app_list_service_views_browsertest.cc',
674
675 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the 671 # TODO(tapted): Move these to chrome_browser_tests_views_sources when the
676 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. out of 672 # the corresponding files are moved in chrome_browser_ui.gypi (i.e. out of
677 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979. 673 # chrome_browser_ui_views_non_mac_sources). http://crbug.com/404979.
678 'browser/ui/views/autofill/autofill_dialog_view_tester_views.cc', 674 'browser/ui/views/autofill/autofill_dialog_view_tester_views.cc',
679 'browser/ui/views/autofill/autofill_dialog_view_tester_views.h', 675 'browser/ui/views/autofill/autofill_dialog_view_tester_views.h',
680 'browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc', 676 'browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc',
681 'browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc', 677 'browser/ui/views/autofill/card_unmask_prompt_view_tester_views.cc',
682 'browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h', 678 'browser/ui/views/autofill/card_unmask_prompt_view_tester_views.h',
683 'browser/ui/views/autofill/password_generation_popup_view_tester_views.cc' , 679 'browser/ui/views/autofill/password_generation_popup_view_tester_views.cc' ,
684 'browser/ui/views/autofill/password_generation_popup_view_tester_views.h', 680 'browser/ui/views/autofill/password_generation_popup_view_tester_views.h',
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 'chrome_browser_tests_supervised_user_sources': [ 914 'chrome_browser_tests_supervised_user_sources': [
919 'browser/supervised_user/supervised_user_browsertest.cc', 915 'browser/supervised_user/supervised_user_browsertest.cc',
920 'browser/supervised_user/supervised_user_resource_throttle_browsertest.cc' , 916 'browser/supervised_user/supervised_user_resource_throttle_browsertest.cc' ,
921 'browser/supervised_user/supervised_user_service_browsertest.cc', 917 'browser/supervised_user/supervised_user_service_browsertest.cc',
922 ], 918 ],
923 'chrome_browser_tests_app_list_sources': [ 919 'chrome_browser_tests_app_list_sources': [
924 'browser/apps/drive/drive_app_converter_browsertest.cc', 920 'browser/apps/drive/drive_app_converter_browsertest.cc',
925 'browser/apps/drive/drive_app_provider_browsertest.cc', 921 'browser/apps/drive/drive_app_provider_browsertest.cc',
926 'browser/ui/app_list/app_list_controller_browsertest.cc', 922 'browser/ui/app_list/app_list_controller_browsertest.cc',
927 'browser/ui/app_list/app_list_service_impl_browsertest.cc', 923 'browser/ui/app_list/app_list_service_impl_browsertest.cc',
924 'browser/ui/app_list/app_list_service_views_browsertest.cc',
928 'browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc', 925 'browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc',
929 'browser/ui/app_list/speech_recognizer_browsertest.cc', 926 'browser/ui/app_list/speech_recognizer_browsertest.cc',
930 ], 927 ],
931 'chrome_browser_tests_service_discovery_sources': [ 928 'chrome_browser_tests_service_discovery_sources': [
932 'browser/extensions/api/mdns/mdns_apitest.cc', 929 'browser/extensions/api/mdns/mdns_apitest.cc',
933 ], 930 ],
934 'chrome_browser_tests_media_router_sources': [ 931 'chrome_browser_tests_media_router_sources': [
935 'browser/ui/webui/media_router/media_router_dialog_controller_impl_browser test.cc', 932 'browser/ui/webui/media_router/media_router_dialog_controller_impl_browser test.cc',
936 'test/data/webui/media_router/media_router_elements_browsertest.js', 933 'test/data/webui/media_router/media_router_elements_browsertest.js',
937 'test/media_router/media_router_base_browsertest.cc', 934 'test/media_router/media_router_base_browsertest.cc',
(...skipping 1707 matching lines...) Expand 10 before | Expand all | Expand 10 after
2645 'browser/copresence/chrome_whispernet_client_browsertest.cc', 2642 'browser/copresence/chrome_whispernet_client_browsertest.cc',
2646 ], 2643 ],
2647 'dependencies': [ 2644 'dependencies': [
2648 '../components/components.gyp:copresence', 2645 '../components/components.gyp:copresence',
2649 # build time dependency. 2646 # build time dependency.
2650 '../v8/src/d8.gyp:d8#host', 2647 '../v8/src/d8.gyp:d8#host',
2651 ], 2648 ],
2652 }], 2649 }],
2653 ['enable_app_list==1', { 2650 ['enable_app_list==1', {
2654 'sources': [ '<@(chrome_browser_tests_app_list_sources)' ], 2651 'sources': [ '<@(chrome_browser_tests_app_list_sources)' ],
2652 'conditions': [
2653 ['OS=="mac"', {
2654 'sources!': [
2655 # This assumes the AppList is views-based.
Devlin 2016/05/05 16:01:36 I'm confused - shouldn't this be in a toolkit view
tapted 2016/05/06 02:36:56 Clarified the comment: # This as
2656 'browser/ui/app_list/app_list_service_views_browsertest.cc',
Devlin 2016/05/05 16:01:36 Also, if this browsertest depends on views, should
tapted 2016/05/06 02:36:56 now enable_app_list \implies{} toolkit_views==1. E
2657 ],
2658 }],
2659 ],
2655 }, { 2660 }, {
2656 'sources!': [ 'browser/ui/webui/app_list/start_page_browsertest.js' ], 2661 'sources!': [ 'browser/ui/webui/app_list/start_page_browsertest.js' ],
2657 }], 2662 }],
2658 ['enable_service_discovery==1', { 2663 ['enable_service_discovery==1', {
2659 'sources': [ '<@(chrome_browser_tests_service_discovery_sources)' ], 2664 'sources': [ '<@(chrome_browser_tests_service_discovery_sources)' ],
2660 }], 2665 }],
2661 ['enable_supervised_users==1', { 2666 ['enable_supervised_users==1', {
2662 'sources': [ '<@(chrome_browser_tests_supervised_user_sources)' ], 2667 'sources': [ '<@(chrome_browser_tests_supervised_user_sources)' ],
2663 }], 2668 }],
2664 ['enable_pepper_cdms==1', { 2669 ['enable_pepper_cdms==1', {
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
2881 'test_support_common', 2886 'test_support_common',
2882 '../base/base.gyp:base', 2887 '../base/base.gyp:base',
2883 '../components/components.gyp:invalidation_impl', 2888 '../components/components.gyp:invalidation_impl',
2884 '../components/components.gyp:invalidation_test_support', 2889 '../components/components.gyp:invalidation_test_support',
2885 '../content/content_shell_and_tests.gyp:content_browser_test_base', 2890 '../content/content_shell_and_tests.gyp:content_browser_test_base',
2886 '../net/net.gyp:net', 2891 '../net/net.gyp:net',
2887 '../skia/skia.gyp:skia', 2892 '../skia/skia.gyp:skia',
2888 '../sync/sync.gyp:sync', 2893 '../sync/sync.gyp:sync',
2889 '../sync/sync.gyp:test_support_sync_fake_server', 2894 '../sync/sync.gyp:test_support_sync_fake_server',
2890 '../sync/sync.gyp:test_support_sync_testserver', 2895 '../sync/sync.gyp:test_support_sync_testserver',
2891 '../ui/app_list/app_list.gyp:app_list_test_support',
2892 ], 2896 ],
2893 'include_dirs': [ 2897 'include_dirs': [
2894 '..', 2898 '..',
2895 '<(INTERMEDIATE_DIR)', 2899 '<(INTERMEDIATE_DIR)',
2896 '<(protoc_out_dir)', 2900 '<(protoc_out_dir)',
2897 ], 2901 ],
2898 'direct_dependent_settings': { 2902 'direct_dependent_settings': {
2899 'include_dirs': [ 2903 'include_dirs': [
2900 '..', 2904 '..',
2901 '<(INTERMEDIATE_DIR)', 2905 '<(INTERMEDIATE_DIR)',
(...skipping 19 matching lines...) Expand all
2921 }], 2925 }],
2922 ['chromeos==0', { 2926 ['chromeos==0', {
2923 # Note: this list is duplicated in the GN build. 2927 # Note: this list is duplicated in the GN build.
2924 'sources!': [ 2928 'sources!': [
2925 'browser/sync/test/integration/wifi_credentials_helper.cc', 2929 'browser/sync/test/integration/wifi_credentials_helper.cc',
2926 'browser/sync/test/integration/wifi_credentials_helper.h', 2930 'browser/sync/test/integration/wifi_credentials_helper.h',
2927 # 'browser/sync/test/integration/wifi_credentials_helper_chromeos.cc ', 2931 # 'browser/sync/test/integration/wifi_credentials_helper_chromeos.cc ',
2928 # 'browser/sync/test/integration/wifi_credentials_helper_chromeos.h' , 2932 # 'browser/sync/test/integration/wifi_credentials_helper_chromeos.h' ,
2929 ], 2933 ],
2930 }], 2934 }],
2931 ['enable_app_list==0', { 2935 ['enable_app_list==1', {
2936 'dependencies' : [
2937 '../ui/app_list/app_list.gyp:app_list_test_support',
2938 ],
2939 }, {
2932 # Note: this list is duplicated in the GN build. 2940 # Note: this list is duplicated in the GN build.
2933 'sources!': [ 2941 'sources!': [
2934 'browser/sync/test/integration/sync_app_list_helper.cc', 2942 'browser/sync/test/integration/sync_app_list_helper.cc',
2935 'browser/sync/test/integration/sync_app_list_helper.h', 2943 'browser/sync/test/integration/sync_app_list_helper.h',
2936 ], 2944 ],
2937 }], 2945 }],
2938 ] 2946 ]
2939 }, 2947 },
2940 { 2948 {
2941 # GN version: //chrome/test:sync_integration_tests 2949 # GN version: //chrome/test:sync_integration_tests
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
3593 'browser', 3601 'browser',
3594 ], 3602 ],
3595 'sources': [ 3603 'sources': [
3596 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3604 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3597 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3605 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3598 ], 3606 ],
3599 }] 3607 }]
3600 }], 3608 }],
3601 ], # 'conditions' 3609 ], # 'conditions'
3602 } 3610 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698