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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10827282: Move the injection test API to content/public. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | chrome/test/DEPS » ('j') | chrome/test/security_tests/security_tests.gyp » ('J')
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 4078 matching lines...) Expand 10 before | Expand all | Expand 10 after
4089 # run in the context of a renderer without shipping the code to end 4089 # run in the context of a renderer without shipping the code to end
4090 # users. 4090 # users.
4091 'target_name': 'renderer_sandbox_tests', 4091 'target_name': 'renderer_sandbox_tests',
4092 'type': 'shared_library', 4092 'type': 'shared_library',
4093 'product_name': 'Renderer Sandbox Tests', 4093 'product_name': 'Renderer Sandbox Tests',
4094 'mac_bundle': 1, 4094 'mac_bundle': 1,
4095 'xcode_settings': { 4095 'xcode_settings': {
4096 'INFOPLIST_FILE': 'test/security_tests/sandbox_tests_mac-Info.plist' , 4096 'INFOPLIST_FILE': 'test/security_tests/sandbox_tests_mac-Info.plist' ,
4097 }, 4097 },
4098 'sources': [ 4098 'sources': [
4099 'test/security_tests/renderer_sandbox_tests_mac.h', 4099 '../content/public/common/injection_test_mac.h',
jam 2012/08/10 17:04:57 no need for this, it's enough in content_common's
Avi (use Gerrit) 2012/08/10 17:10:22 Done.
4100 'test/security_tests/renderer_sandbox_tests_mac.mm', 4100 'test/security_tests/renderer_sandbox_tests_mac.mm',
4101 ], 4101 ],
4102 'include_dirs': [ 4102 'include_dirs': [
4103 '..', 4103 '..',
4104 ], 4104 ],
4105 'link_settings': { 4105 'link_settings': {
4106 'libraries': [ 4106 'libraries': [
4107 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', 4107 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
4108 ], 4108 ],
4109 }, 4109 },
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
4251 { 4251 {
4252 'target_name': 'security_tests', 4252 'target_name': 'security_tests',
4253 'type': 'shared_library', 4253 'type': 'shared_library',
4254 'include_dirs': [ 4254 'include_dirs': [
4255 '..', 4255 '..',
4256 ], 4256 ],
4257 'sources': [ 4257 'sources': [
4258 'test/security_tests/ipc_security_tests.cc', 4258 'test/security_tests/ipc_security_tests.cc',
4259 'test/security_tests/ipc_security_tests.h', 4259 'test/security_tests/ipc_security_tests.h',
4260 'test/security_tests/security_tests.cc', 4260 'test/security_tests/security_tests.cc',
4261 '../content/common/injection_test_dll.h', 4261 '../content/public/common/injection_test_win.h',
4262 '../sandbox/win/tests/validation_tests/commands.cc', 4262 '../sandbox/win/tests/validation_tests/commands.cc',
4263 '../sandbox/win/tests/validation_tests/commands.h', 4263 '../sandbox/win/tests/validation_tests/commands.h',
4264 ], 4264 ],
4265 }, 4265 },
4266 ]}, # 'targets' 4266 ]}, # 'targets'
4267 ], # OS=="win" 4267 ], # OS=="win"
4268 # If you change this condition, make sure you also change it in all.gyp 4268 # If you change this condition, make sure you also change it in all.gyp
4269 # for the chromium_builder_qa target. 4269 # for the chromium_builder_qa target.
4270 ['enable_automation==1 and (OS=="mac" or OS=="win" or (os_posix==1 and targe t_arch==python_arch))', { 4270 ['enable_automation==1 and (OS=="mac" or OS=="win" or (os_posix==1 and targe t_arch==python_arch))', {
4271 'targets': [ 4271 'targets': [
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
4671 '--result', '<@(_outputs)', 4671 '--result', '<@(_outputs)',
4672 '--isolate', 'browser_tests.isolate', 4672 '--isolate', 'browser_tests.isolate',
4673 ], 4673 ],
4674 }, 4674 },
4675 ], 4675 ],
4676 }, 4676 },
4677 ], 4677 ],
4678 }], 4678 }],
4679 ], # 'conditions' 4679 ], # 'conditions'
4680 } 4680 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/DEPS » ('j') | chrome/test/security_tests/security_tests.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698