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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1554563002: Put more files under the enable_service_discovery build flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fix merge Created 4 years, 11 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
« no previous file with comments | « chrome/chrome_debugger.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'chrome_browser_extensions_test_support_sources': [ 6 'chrome_browser_extensions_test_support_sources': [
7 # A list of sources which is shared between different browser tests. 7 # A list of sources which is shared between different browser tests.
8 'browser/apps/app_browsertest_util.cc', 8 'browser/apps/app_browsertest_util.cc',
9 'browser/apps/app_browsertest_util.h', 9 'browser/apps/app_browsertest_util.h',
10 'browser/extensions/browsertest_util.cc', 10 'browser/extensions/browsertest_util.cc',
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 'browser/extensions/api/idltest/idltest_apitest.cc', 163 'browser/extensions/api/idltest/idltest_apitest.cc',
164 'browser/extensions/api/image_writer_private/image_writer_private_apitest. cc', 164 'browser/extensions/api/image_writer_private/image_writer_private_apitest. cc',
165 'browser/extensions/api/image_writer_private/test_utils.cc', 165 'browser/extensions/api/image_writer_private/test_utils.cc',
166 'browser/extensions/api/inline_install_private/inline_install_private_apit est.cc', 166 'browser/extensions/api/inline_install_private/inline_install_private_apit est.cc',
167 'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc', 167 'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
168 'browser/extensions/api/instance_id/instance_id_apitest.cc', 168 'browser/extensions/api/instance_id/instance_id_apitest.cc',
169 'browser/extensions/api/log_private/log_private_apitest_chromeos.cc', 169 'browser/extensions/api/log_private/log_private_apitest_chromeos.cc',
170 'browser/extensions/api/management/management_api_browsertest.cc', 170 'browser/extensions/api/management/management_api_browsertest.cc',
171 'browser/extensions/api/management/management_apitest.cc', 171 'browser/extensions/api/management/management_apitest.cc',
172 'browser/extensions/api/management/management_browsertest.cc', 172 'browser/extensions/api/management/management_browsertest.cc',
173 'browser/extensions/api/mdns/mdns_apitest.cc',
174 'browser/extensions/api/media_galleries/media_galleries_apitest.cc', 173 'browser/extensions/api/media_galleries/media_galleries_apitest.cc',
175 'browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc', 174 'browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc',
176 'browser/extensions/api/messaging/native_messaging_apitest.cc', 175 'browser/extensions/api/messaging/native_messaging_apitest.cc',
177 'browser/extensions/api/metrics_private/metrics_apitest.cc', 176 'browser/extensions/api/metrics_private/metrics_apitest.cc',
178 'browser/extensions/api/module/module_apitest.cc', 177 'browser/extensions/api/module/module_apitest.cc',
179 'browser/extensions/api/music_manager_private/music_manager_private_browse rtest.cc', 178 'browser/extensions/api/music_manager_private/music_manager_private_browse rtest.cc',
180 'browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc', 179 'browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc',
181 'browser/extensions/api/notification_provider/notification_provider_apites t.cc', 180 'browser/extensions/api/notification_provider/notification_provider_apites t.cc',
182 'browser/extensions/api/omnibox/omnibox_api_browsertest.cc', 181 'browser/extensions/api/omnibox/omnibox_api_browsertest.cc',
183 'browser/extensions/api/page_capture/page_capture_apitest.cc', 182 'browser/extensions/api/page_capture/page_capture_apitest.cc',
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 ], 893 ],
895 'chrome_browser_tests_app_list_sources': [ 894 'chrome_browser_tests_app_list_sources': [
896 'browser/apps/drive/drive_app_converter_browsertest.cc', 895 'browser/apps/drive/drive_app_converter_browsertest.cc',
897 'browser/apps/drive/drive_app_provider_browsertest.cc', 896 'browser/apps/drive/drive_app_provider_browsertest.cc',
898 'browser/ui/app_list/app_list_controller_browsertest.cc', 897 'browser/ui/app_list/app_list_controller_browsertest.cc',
899 'browser/ui/app_list/app_list_service_impl_browsertest.cc', 898 'browser/ui/app_list/app_list_service_impl_browsertest.cc',
900 'browser/ui/app_list/search/people/people_provider_browsertest.cc', 899 'browser/ui/app_list/search/people/people_provider_browsertest.cc',
901 'browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc', 900 'browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc',
902 'browser/ui/app_list/speech_recognizer_browsertest.cc', 901 'browser/ui/app_list/speech_recognizer_browsertest.cc',
903 ], 902 ],
903 'chrome_browser_tests_service_discovery_sources': [
904 'browser/extensions/api/mdns/mdns_apitest.cc',
905 ],
904 'chrome_browser_tests_media_router_sources': [ 906 'chrome_browser_tests_media_router_sources': [
905 'browser/ui/webui/media_router/media_router_dialog_controller_impl_browser test.cc', 907 'browser/ui/webui/media_router/media_router_dialog_controller_impl_browser test.cc',
906 'test/data/webui/media_router/media_router_elements_browsertest.js', 908 'test/data/webui/media_router/media_router_elements_browsertest.js',
907 'test/media_router/media_router_base_browsertest.cc', 909 'test/media_router/media_router_base_browsertest.cc',
908 'test/media_router/media_router_base_browsertest.h', 910 'test/media_router/media_router_base_browsertest.h',
909 'test/media_router/media_router_e2e_browsertest.cc', 911 'test/media_router/media_router_e2e_browsertest.cc',
910 'test/media_router/media_router_e2e_browsertest.h', 912 'test/media_router/media_router_e2e_browsertest.h',
911 'test/media_router/media_router_e2e_ui_browsertest.cc', 913 'test/media_router/media_router_e2e_ui_browsertest.cc',
912 'test/media_router/media_router_integration_browsertest.cc', 914 'test/media_router/media_router_integration_browsertest.cc',
913 'test/media_router/media_router_integration_browsertest.h', 915 'test/media_router/media_router_integration_browsertest.h',
(...skipping 1645 matching lines...) Expand 10 before | Expand all | Expand 10 after
2559 '../components/components.gyp:copresence', 2561 '../components/components.gyp:copresence',
2560 # build time dependency. 2562 # build time dependency.
2561 '../v8/src/d8.gyp:d8#host', 2563 '../v8/src/d8.gyp:d8#host',
2562 ], 2564 ],
2563 }], 2565 }],
2564 ['enable_app_list==1', { 2566 ['enable_app_list==1', {
2565 'sources': [ '<@(chrome_browser_tests_app_list_sources)' ], 2567 'sources': [ '<@(chrome_browser_tests_app_list_sources)' ],
2566 }, { 2568 }, {
2567 'sources!': [ 'browser/ui/webui/app_list/start_page_browsertest.js' ], 2569 'sources!': [ 'browser/ui/webui/app_list/start_page_browsertest.js' ],
2568 }], 2570 }],
2571 ['enable_service_discovery==1', {
2572 'sources': [ '<@(chrome_browser_tests_service_discovery_sources)' ],
2573 }],
2569 ['enable_supervised_users==1', { 2574 ['enable_supervised_users==1', {
2570 'sources': [ '<@(chrome_browser_tests_supervised_user_sources)' ], 2575 'sources': [ '<@(chrome_browser_tests_supervised_user_sources)' ],
2571 }, { 2576 }, {
2572 'sources!': [ 2577 'sources!': [
2573 'browser/ui/webui/downloads_ui_supervised_browsertest.js', 2578 'browser/ui/webui/downloads_ui_supervised_browsertest.js',
2574 ], 2579 ],
2575 }], 2580 }],
2576 ['enable_pepper_cdms==1', { 2581 ['enable_pepper_cdms==1', {
2577 'dependencies': [ 2582 'dependencies': [
2578 # Runtime dependencies. 2583 # Runtime dependencies.
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after
3532 'utility', 3537 'utility',
3533 ], 3538 ],
3534 'sources': [ 3539 'sources': [
3535 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3540 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3536 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3541 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3537 ], 3542 ],
3538 }] 3543 }]
3539 }], 3544 }],
3540 ], # 'conditions' 3545 ], # 'conditions'
3541 } 3546 }
OLDNEW
« no previous file with comments | « chrome/chrome_debugger.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698