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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10638010: Undo the startup_helper_win.h change in r143501 because that breaks the sandbox in component builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ash/ash.gyp ('k') | chrome/test/gpu/test_support_gpu.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 (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 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 'browser/ui/views/find_bar_host_interactive_uitest.cc', 506 'browser/ui/views/find_bar_host_interactive_uitest.cc',
507 'browser/ui/views/menu_item_view_test.cc', 507 'browser/ui/views/menu_item_view_test.cc',
508 'browser/ui/views/menu_model_adapter_test.cc', 508 'browser/ui/views/menu_model_adapter_test.cc',
509 'browser/ui/views/ssl_client_certificate_selector_browsertest.cc', 509 'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
510 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc', 510 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
511 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h', 511 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
512 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc', 512 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
513 'test/base/chrome_test_launcher.cc', 513 'test/base/chrome_test_launcher.cc',
514 'test/base/view_event_test_base.cc', 514 'test/base/view_event_test_base.cc',
515 'test/base/view_event_test_base.h', 515 'test/base/view_event_test_base.h',
516 '../content/app/startup_helper_win.cc',
516 '../content/browser/mouseleave_browsertest.cc', 517 '../content/browser/mouseleave_browsertest.cc',
517 ], 518 ],
518 'conditions': [ 519 'conditions': [
519 ['toolkit_uses_gtk == 1', { 520 ['toolkit_uses_gtk == 1', {
520 'dependencies': [ 521 'dependencies': [
521 '../build/linux/system.gyp:gtk', 522 '../build/linux/system.gyp:gtk',
522 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 523 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
523 ], 524 ],
524 'sources!': [ 525 'sources!': [
525 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc', 526 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
(...skipping 2467 matching lines...) Expand 10 before | Expand all | Expand 10 after
2993 'test/data/webui/print_preview.cc', 2994 'test/data/webui/print_preview.cc',
2994 'test/data/webui/print_preview.h', 2995 'test/data/webui/print_preview.h',
2995 'test/data/webui/print_preview.js', 2996 'test/data/webui/print_preview.js',
2996 'test/data/webui/suidsandbox_browsertest.js', 2997 'test/data/webui/suidsandbox_browsertest.js',
2997 'test/gpu/gpu_feature_browsertest.cc', 2998 'test/gpu/gpu_feature_browsertest.cc',
2998 'test/security_tests/sandbox_browsertest.cc', 2999 'test/security_tests/sandbox_browsertest.cc',
2999 'test/ui/ppapi_uitest.cc', 3000 'test/ui/ppapi_uitest.cc',
3000 # TODO(craig): Rename this and run from base_unittests when the test 3001 # TODO(craig): Rename this and run from base_unittests when the test
3001 # is safe to run there. See http://crbug.com/78722 for details. 3002 # is safe to run there. See http://crbug.com/78722 for details.
3002 '../base/files/file_path_watcher_browsertest.cc', 3003 '../base/files/file_path_watcher_browsertest.cc',
3004 '../content/app/startup_helper_win.cc',
3003 '../content/browser/accessibility/cross_platform_accessibility_browserte st.cc', 3005 '../content/browser/accessibility/cross_platform_accessibility_browserte st.cc',
3004 '../content/browser/accessibility/dump_accessibility_tree_browsertest.cc ', 3006 '../content/browser/accessibility/dump_accessibility_tree_browsertest.cc ',
3005 '../content/browser/accessibility/dump_accessibility_tree_helper.cc', 3007 '../content/browser/accessibility/dump_accessibility_tree_helper.cc',
3006 '../content/browser/accessibility/dump_accessibility_tree_helper.h', 3008 '../content/browser/accessibility/dump_accessibility_tree_helper.h',
3007 '../content/browser/accessibility/dump_accessibility_tree_helper_mac.mm' , 3009 '../content/browser/accessibility/dump_accessibility_tree_helper_mac.mm' ,
3008 '../content/browser/accessibility/dump_accessibility_tree_helper_win.cc' , 3010 '../content/browser/accessibility/dump_accessibility_tree_helper_win.cc' ,
3009 '../content/browser/appcache/appcache_browsertest.cc', 3011 '../content/browser/appcache/appcache_browsertest.cc',
3010 '../content/browser/audio_browsertest.cc', 3012 '../content/browser/audio_browsertest.cc',
3011 '../content/browser/child_process_security_policy_browsertest.cc', 3013 '../content/browser/child_process_security_policy_browsertest.cc',
3012 '../content/browser/device_orientation/device_orientation_browsertest.cc ', 3014 '../content/browser/device_orientation/device_orientation_browsertest.cc ',
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
3411 'app/chrome_dll.rc', 3413 'app/chrome_dll.rc',
3412 'app/chrome_dll_resource.h', 3414 'app/chrome_dll_resource.h',
3413 'app/chrome_version.rc.version', 3415 'app/chrome_version.rc.version',
3414 'test/base/chrome_render_view_test.cc', 3416 'test/base/chrome_render_view_test.cc',
3415 'test/base/chrome_render_view_test.h', 3417 'test/base/chrome_render_view_test.h',
3416 'test/base/chrome_test_launcher.cc', 3418 'test/base/chrome_test_launcher.cc',
3417 'test/perf/browser_perf_test.cc', 3419 'test/perf/browser_perf_test.cc',
3418 'test/perf/browser_perf_test.h', 3420 'test/perf/browser_perf_test.h',
3419 'test/perf/rendering/latency_tests.cc', 3421 'test/perf/rendering/latency_tests.cc',
3420 'test/perf/rendering/throughput_tests.cc', 3422 'test/perf/rendering/throughput_tests.cc',
3423 '../content/app/startup_helper_win.cc',
3421 ], 3424 ],
3422 'rules': [ 3425 'rules': [
3423 { 3426 {
3424 'rule_name': 'js2webui', 3427 'rule_name': 'js2webui',
3425 'extension': 'js', 3428 'extension': 'js',
3426 'msvs_external_rule': 1, 3429 'msvs_external_rule': 1,
3427 'inputs': [ 3430 'inputs': [
3428 '<(gypv8sh)', 3431 '<(gypv8sh)',
3429 '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)', 3432 '<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
3430 '<(mock_js)', 3433 '<(mock_js)',
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
3556 '..', 3559 '..',
3557 ], 3560 ],
3558 'defines': [ 3561 'defines': [
3559 'HAS_OUT_OF_PROC_TEST_RUNNER', 3562 'HAS_OUT_OF_PROC_TEST_RUNNER',
3560 'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test .h"', 3563 'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test .h"',
3561 ], 3564 ],
3562 'sources': [ 3565 'sources': [
3563 'app/chrome_dll.rc', 3566 'app/chrome_dll.rc',
3564 'browser/safe_browsing/safe_browsing_test.cc', 3567 'browser/safe_browsing/safe_browsing_test.cc',
3565 'test/base/chrome_test_launcher.cc', 3568 'test/base/chrome_test_launcher.cc',
3569 '../content/app/startup_helper_win.cc',
3566 ], 3570 ],
3567 'conditions': [ 3571 'conditions': [
3568 ['safe_browsing==0', { 3572 ['safe_browsing==0', {
3569 'sources!': [ 3573 'sources!': [
3570 'browser/safe_browsing/safe_browsing_test.cc', 3574 'browser/safe_browsing/safe_browsing_test.cc',
3571 ], 3575 ],
3572 }], 3576 }],
3573 ['OS=="win"', { 3577 ['OS=="win"', {
3574 'dependencies': [ 3578 'dependencies': [
3575 'chrome_version_resources', 3579 'chrome_version_resources',
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
3919 'browser/sync/test/integration/two_client_extension_settings_and_app_set tings_sync_test.cc', 3923 'browser/sync/test/integration/two_client_extension_settings_and_app_set tings_sync_test.cc',
3920 'browser/sync/test/integration/two_client_extensions_sync_test.cc', 3924 'browser/sync/test/integration/two_client_extensions_sync_test.cc',
3921 'browser/sync/test/integration/two_client_passwords_sync_test.cc', 3925 'browser/sync/test/integration/two_client_passwords_sync_test.cc',
3922 'browser/sync/test/integration/two_client_preferences_sync_test.cc', 3926 'browser/sync/test/integration/two_client_preferences_sync_test.cc',
3923 'browser/sync/test/integration/two_client_search_engines_sync_test.cc', 3927 'browser/sync/test/integration/two_client_search_engines_sync_test.cc',
3924 'browser/sync/test/integration/two_client_sessions_sync_test.cc', 3928 'browser/sync/test/integration/two_client_sessions_sync_test.cc',
3925 'browser/sync/test/integration/two_client_themes_sync_test.cc', 3929 'browser/sync/test/integration/two_client_themes_sync_test.cc',
3926 'browser/sync/test/integration/two_client_typed_urls_sync_test.cc', 3930 'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
3927 'browser/sync/test/integration/typed_urls_helper.cc', 3931 'browser/sync/test/integration/typed_urls_helper.cc',
3928 'browser/sync/test/integration/typed_urls_helper.h', 3932 'browser/sync/test/integration/typed_urls_helper.h',
3933 '../content/app/startup_helper_win.cc',
3929 ], 3934 ],
3930 'conditions': [ 3935 'conditions': [
3931 ['toolkit_uses_gtk == 1', { 3936 ['toolkit_uses_gtk == 1', {
3932 'dependencies': [ 3937 'dependencies': [
3933 '../build/linux/system.gyp:gtk', 3938 '../build/linux/system.gyp:gtk',
3934 ], 3939 ],
3935 }], 3940 }],
3936 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , { 3941 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , {
3937 'dependencies': [ 3942 'dependencies': [
3938 '../build/linux/system.gyp:ssl', 3943 '../build/linux/system.gyp:ssl',
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
4041 'browser/sync/test/integration/sync_datatype_helper.cc', 4046 'browser/sync/test/integration/sync_datatype_helper.cc',
4042 'browser/sync/test/integration/sync_datatype_helper.h', 4047 'browser/sync/test/integration/sync_datatype_helper.h',
4043 'browser/sync/test/integration/sync_extension_helper.cc', 4048 'browser/sync/test/integration/sync_extension_helper.cc',
4044 'browser/sync/test/integration/sync_extension_helper.h', 4049 'browser/sync/test/integration/sync_extension_helper.h',
4045 'browser/sync/test/integration/sync_test.cc', 4050 'browser/sync/test/integration/sync_test.cc',
4046 'browser/sync/test/integration/sync_test.h', 4051 'browser/sync/test/integration/sync_test.h',
4047 'browser/sync/test/integration/typed_urls_helper.cc', 4052 'browser/sync/test/integration/typed_urls_helper.cc',
4048 'browser/sync/test/integration/typed_urls_helper.h', 4053 'browser/sync/test/integration/typed_urls_helper.h',
4049 'test/base/chrome_test_launcher.cc', 4054 'test/base/chrome_test_launcher.cc',
4050 'test/data/resource.rc', 4055 'test/data/resource.rc',
4056 '../content/app/startup_helper_win.cc',
4051 ], 4057 ],
4052 'conditions': [ 4058 'conditions': [
4053 ['toolkit_uses_gtk == 1', { 4059 ['toolkit_uses_gtk == 1', {
4054 'dependencies': [ 4060 'dependencies': [
4055 '../build/linux/system.gyp:gtk', 4061 '../build/linux/system.gyp:gtk',
4056 ], 4062 ],
4057 }], 4063 }],
4058 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , { 4064 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , {
4059 'dependencies': [ 4065 'dependencies': [
4060 '../build/linux/system.gyp:ssl', 4066 '../build/linux/system.gyp:ssl',
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
4647 # Use outputs of this action as inputs for the main target build. 4653 # Use outputs of this action as inputs for the main target build.
4648 # Seems as a misnomer but makes this happy on Linux (scons). 4654 # Seems as a misnomer but makes this happy on Linux (scons).
4649 'process_outputs_as_sources': 1, 4655 'process_outputs_as_sources': 1,
4650 }, 4656 },
4651 ], # 'actions' 4657 ], # 'actions'
4652 }, 4658 },
4653 ] 4659 ]
4654 }], # 'coverage!=0' 4660 }], # 'coverage!=0'
4655 ], # 'conditions' 4661 ], # 'conditions'
4656 } 4662 }
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | chrome/test/gpu/test_support_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698