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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10823059: Revert revert of 146149 - Don't pass the connector check policy along. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Catch up with timeout method rename. Created 8 years, 4 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 2857 matching lines...) Expand 10 before | Expand all | Expand 10 after
2868 'browser/notifications/desktop_notifications_unittest.h', 2868 'browser/notifications/desktop_notifications_unittest.h',
2869 'browser/notifications/notification_browsertest.cc', 2869 'browser/notifications/notification_browsertest.cc',
2870 'browser/page_cycler/page_cycler_browsertest.cc', 2870 'browser/page_cycler/page_cycler_browsertest.cc',
2871 'browser/performance_monitor/performance_monitor_browsertest.cc', 2871 'browser/performance_monitor/performance_monitor_browsertest.cc',
2872 'browser/policy/device_management_service_browsertest.cc', 2872 'browser/policy/device_management_service_browsertest.cc',
2873 'browser/policy/policy_browsertest.cc', 2873 'browser/policy/policy_browsertest.cc',
2874 'browser/popup_blocker_browsertest.cc', 2874 'browser/popup_blocker_browsertest.cc',
2875 'browser/prefs/pref_service_browsertest.cc', 2875 'browser/prefs/pref_service_browsertest.cc',
2876 'browser/prerender/prefetch_browsertest.cc', 2876 'browser/prerender/prefetch_browsertest.cc',
2877 'browser/prerender/prerender_browsertest.cc', 2877 'browser/prerender/prerender_browsertest.cc',
2878 'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
2878 'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest .cc', 2879 'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest .cc',
2879 'browser/printing/printing_layout_browsertest.cc', 2880 'browser/printing/printing_layout_browsertest.cc',
2880 'browser/printing/print_preview_tab_controller_browsertest.cc', 2881 'browser/printing/print_preview_tab_controller_browsertest.cc',
2881 'browser/process_singleton_browsertest.cc', 2882 'browser/process_singleton_browsertest.cc',
2882 'browser/profiles/profile_browsertest.cc', 2883 'browser/profiles/profile_browsertest.cc',
2883 'browser/profiles/profile_manager_browsertest.cc', 2884 'browser/profiles/profile_manager_browsertest.cc',
2884 'browser/protector/default_search_provider_change_browsertest.cc', 2885 'browser/protector/default_search_provider_change_browsertest.cc',
2885 'browser/protector/protector_service_browsertest.cc', 2886 'browser/protector/protector_service_browsertest.cc',
2886 'browser/repost_form_warning_browsertest.cc', 2887 'browser/repost_form_warning_browsertest.cc',
2887 'browser/rlz/rlz_extension_apitest.cc', 2888 'browser/rlz/rlz_extension_apitest.cc',
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
3104 'test/data/webui/certificate_viewer_dialog_test.js', 3105 'test/data/webui/certificate_viewer_dialog_test.js',
3105 'test/data/webui/certificate_viewer_ui_test-inl.h', 3106 'test/data/webui/certificate_viewer_ui_test-inl.h',
3106 ], 3107 ],
3107 }, { #else: OS == "chromeos" 3108 }, { #else: OS == "chromeos"
3108 'sources/': [ 3109 'sources/': [
3109 # Protector is disabled on CrOS. 3110 # Protector is disabled on CrOS.
3110 ['exclude', '^browser/protector'], 3111 ['exclude', '^browser/protector'],
3111 ], 3112 ],
3112 'sources!': [ 3113 'sources!': [
3113 'browser/notifications/desktop_notifications_unittest.cc', 3114 'browser/notifications/desktop_notifications_unittest.cc',
3115 'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc ',
3114 'browser/printing/cloud_print/test/cloud_print_proxy_process_browser test.cc', 3116 'browser/printing/cloud_print/test/cloud_print_proxy_process_browser test.cc',
3115 'browser/service/service_process_control_browsertest.cc', 3117 'browser/service/service_process_control_browsertest.cc',
3116 # chromeos does not use cross-platform panels 3118 # chromeos does not use cross-platform panels
3117 'browser/ui/panels/panel_view_browsertest.cc', 3119 'browser/ui/panels/panel_view_browsertest.cc',
3118 ], 3120 ],
3119 'dependencies': [ 3121 'dependencies': [
3120 '../dbus/dbus.gyp:dbus_test_support', 3122 '../dbus/dbus.gyp:dbus_test_support',
3121 '../build/linux/system.gyp:dbus', 3123 '../build/linux/system.gyp:dbus',
3122 ], 3124 ],
3123 }], 3125 }],
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
3253 'sources': [ 3255 'sources': [
3254 'browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc', 3256 'browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc',
3255 '../content/renderer/external_popup_menu_browsertest.cc', 3257 '../content/renderer/external_popup_menu_browsertest.cc',
3256 ], 3258 ],
3257 'sources!': [ 3259 'sources!': [
3258 # TODO(hbono): This test depends on hunspell and we cannot run it on 3260 # TODO(hbono): This test depends on hunspell and we cannot run it on
3259 # Mac, which does not use hunspell by default. 3261 # Mac, which does not use hunspell by default.
3260 'browser/spellchecker/spellcheck_host_browsertest.cc', 3262 'browser/spellchecker/spellcheck_host_browsertest.cc',
3261 # ProcessSingletonMac doesn't do anything. 3263 # ProcessSingletonMac doesn't do anything.
3262 'browser/process_singleton_browsertest.cc', 3264 'browser/process_singleton_browsertest.cc',
3265 # This test depends on GetCommandLineForRelaunch, which is not
3266 # available on Mac.
3267 'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc ',
3263 ], 3268 ],
3264 }], 3269 }],
3265 ['os_posix == 0 or chromeos == 1', { 3270 ['os_posix == 0 or chromeos == 1', {
3266 'sources!': [ 3271 'sources!': [
3267 'common/time_format_browsertest.cc', 3272 'common/time_format_browsertest.cc',
3268 ], 3273 ],
3269 }], 3274 }],
3270 ['os_posix == 1 and OS != "mac" and OS != "android"', { 3275 ['os_posix == 1 and OS != "mac" and OS != "android"', {
3271 'conditions': [ 3276 'conditions': [
3272 ['linux_use_tcmalloc==1', { 3277 ['linux_use_tcmalloc==1', {
(...skipping 1353 matching lines...) Expand 10 before | Expand all | Expand 10 after
4626 'input_jars_paths': [ 4631 'input_jars_paths': [
4627 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 4632 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
4628 ], 4633 ],
4629 }, 4634 },
4630 'includes': [ '../build/apk_test.gypi' ], 4635 'includes': [ '../build/apk_test.gypi' ],
4631 }, 4636 },
4632 ], 4637 ],
4633 }], 4638 }],
4634 ], # 'conditions' 4639 ], # 'conditions'
4635 } 4640 }
OLDNEW
« no previous file with comments | « chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc ('k') | chrome/common/chrome_result_codes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698