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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 2058203002: MD User Manager: Supervised user logic should be inside ENABLE_SUPERVISED_USERS flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md-user-manager-policy-prefs
Patch Set: Created 4 years, 6 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_browser_ui.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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_unit_tests_sources': [ 6 'chrome_unit_tests_sources': [
7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
8 # dependency is needed to make commit bots run unit_tests on 8 # dependency is needed to make commit bots run unit_tests on
9 # histograms.xml changes. 9 # histograms.xml changes.
10 '../tools/metrics/histograms/histograms.xml', 10 '../tools/metrics/histograms/histograms.xml',
(...skipping 1584 matching lines...) Expand 10 before | Expand all | Expand 10 after
1595 'utility/importer/firefox_importer_unittest_utils_mac.cc', 1595 'utility/importer/firefox_importer_unittest_utils_mac.cc',
1596 'utility/importer/safari_importer_unittest.mm', 1596 'utility/importer/safari_importer_unittest.mm',
1597 ], 1597 ],
1598 # Everything but Android, ChromeOS and iOS (iOS is handled separately). 1598 # Everything but Android, ChromeOS and iOS (iOS is handled separately).
1599 'chrome_unit_tests_non_android_or_chromeos_sources': [ 1599 'chrome_unit_tests_non_android_or_chromeos_sources': [
1600 'browser/media/native_desktop_media_list_unittest.cc', 1600 'browser/media/native_desktop_media_list_unittest.cc',
1601 'browser/signin/cross_device_promo_unittest.cc', 1601 'browser/signin/cross_device_promo_unittest.cc',
1602 'browser/signin/signin_global_error_unittest.cc', 1602 'browser/signin/signin_global_error_unittest.cc',
1603 'browser/sync/sync_global_error_unittest.cc', 1603 'browser/sync/sync_global_error_unittest.cc',
1604 'browser/ui/webui/signin/signin_create_profile_handler_unittest.cc', 1604 'browser/ui/webui/signin/signin_create_profile_handler_unittest.cc',
1605 'browser/ui/webui/signin/signin_supervised_user_import_handler_unittest.cc ',
1606 'browser/ui/webui/signin/sync_confirmation_handler_unittest.cc', 1605 'browser/ui/webui/signin/sync_confirmation_handler_unittest.cc',
1607 'browser/upgrade_detector_impl_unittest.cc', 1606 'browser/upgrade_detector_impl_unittest.cc',
1608 ], 1607 ],
1609 'chrome_unit_tests_app_list_sources': [ 1608 'chrome_unit_tests_app_list_sources': [
1610 'browser/apps/drive/drive_app_mapping_unittest.cc', 1609 'browser/apps/drive/drive_app_mapping_unittest.cc',
1611 'browser/ui/app_list/app_context_menu_unittest.cc', 1610 'browser/ui/app_list/app_context_menu_unittest.cc',
1612 'browser/ui/app_list/app_list_positioner_unittest.cc', 1611 'browser/ui/app_list/app_list_positioner_unittest.cc',
1613 'browser/ui/app_list/app_list_service_mac_unittest.mm', 1612 'browser/ui/app_list/app_list_service_mac_unittest.mm',
1614 'browser/ui/app_list/app_list_service_unittest.cc', 1613 'browser/ui/app_list/app_list_service_unittest.cc',
1615 'browser/ui/app_list/app_list_test_util.cc', 1614 'browser/ui/app_list/app_list_test_util.cc',
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
2735 'sources': [ 2734 'sources': [
2736 'common/net/x509_certificate_model_unittest.cc', 2735 'common/net/x509_certificate_model_unittest.cc',
2737 ], 2736 ],
2738 }], 2737 }],
2739 ['enable_supervised_users == 1', { 2738 ['enable_supervised_users == 1', {
2740 'sources': [ '<@(chrome_unit_tests_supervised_user_sources)' ], 2739 'sources': [ '<@(chrome_unit_tests_supervised_user_sources)' ],
2741 }], 2740 }],
2742 ['enable_supervised_users == 1 and OS != "android" and OS != "ios"', { 2741 ['enable_supervised_users == 1 and OS != "android" and OS != "ios"', {
2743 'sources': [ '<@(chrome_unit_tests_supervised_user_legacy_sources)' ], 2742 'sources': [ '<@(chrome_unit_tests_supervised_user_legacy_sources)' ],
2744 }], 2743 }],
2744 ['enable_supervised_users == 1 and OS != "android" and chromeos == 0', {
2745 'sources': [
2746 'browser/ui/webui/signin/signin_supervised_user_import_handler_unitt est.cc',
2747 ],
2748 }],
2745 ['safe_browsing==1 and enable_extensions==1', { 2749 ['safe_browsing==1 and enable_extensions==1', {
2746 'sources': [ 2750 'sources': [
2747 'browser/extensions/blacklist_unittest.cc', 2751 'browser/extensions/blacklist_unittest.cc',
2748 ], 2752 ],
2749 }], 2753 }],
2750 ['enable_app_list==1', { 2754 ['enable_app_list==1', {
2751 'sources': [ '<@(chrome_unit_tests_app_list_sources)' ], 2755 'sources': [ '<@(chrome_unit_tests_app_list_sources)' ],
2752 'dependencies': [ 2756 'dependencies': [
2753 '../ui/app_list/app_list.gyp:app_list_test_support', 2757 '../ui/app_list/app_list.gyp:app_list_test_support',
2754 ], 2758 ],
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
3008 'dependencies': [ 3012 'dependencies': [
3009 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3013 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3010 ], 3014 ],
3011 }], 3015 }],
3012 ], 3016 ],
3013 }, 3017 },
3014 ], 3018 ],
3015 }], 3019 }],
3016 ], # 'conditions' 3020 ], # 'conditions'
3017 } 3021 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698