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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10806056: Move plugin_browsertests.cc from browser_tests to content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to mac+win fixes Created 8 years, 5 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 2618 matching lines...) Expand 10 before | Expand all | Expand 10 after
2629 '../testing/gtest.gyp:gtest', 2629 '../testing/gtest.gyp:gtest',
2630 '../third_party/cld/cld.gyp:cld', 2630 '../third_party/cld/cld.gyp:cld',
2631 '../third_party/icu/icu.gyp:icui18n', 2631 '../third_party/icu/icu.gyp:icui18n',
2632 '../third_party/icu/icu.gyp:icuuc', 2632 '../third_party/icu/icu.gyp:icuuc',
2633 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 2633 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
2634 '../v8/tools/gyp/v8.gyp:v8', 2634 '../v8/tools/gyp/v8.gyp:v8',
2635 '../webkit/webkit.gyp:test_shell_test_support', 2635 '../webkit/webkit.gyp:test_shell_test_support',
2636 # Runtime dependencies 2636 # Runtime dependencies
2637 '../ppapi/ppapi_internal.gyp:ppapi_tests', 2637 '../ppapi/ppapi_internal.gyp:ppapi_tests',
2638 '../third_party/mesa/mesa.gyp:osmesa', 2638 '../third_party/mesa/mesa.gyp:osmesa',
2639 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
2640 ], 2639 ],
2641 'include_dirs': [ 2640 'include_dirs': [
2642 '..', 2641 '..',
2643 ], 2642 ],
2644 'defines': [ 2643 'defines': [
2645 'HAS_OUT_OF_PROC_TEST_RUNNER', 2644 'HAS_OUT_OF_PROC_TEST_RUNNER',
2646 ], 2645 ],
2647 'sources': [ 2646 'sources': [
2648 'app/breakpad_mac_stubs.mm', 2647 'app/breakpad_mac_stubs.mm',
2649 'app/chrome_command_ids.h', 2648 'app/chrome_command_ids.h',
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
3058 '../content/browser/audio_browsertest.cc', 3057 '../content/browser/audio_browsertest.cc',
3059 '../content/browser/child_process_security_policy_browsertest.cc', 3058 '../content/browser/child_process_security_policy_browsertest.cc',
3060 '../content/browser/device_orientation/device_orientation_browsertest.cc ', 3059 '../content/browser/device_orientation/device_orientation_browsertest.cc ',
3061 '../content/browser/dom_storage/dom_storage_browsertest.cc', 3060 '../content/browser/dom_storage/dom_storage_browsertest.cc',
3062 '../content/browser/download/mhtml_generation_browsertest.cc', 3061 '../content/browser/download/mhtml_generation_browsertest.cc',
3063 '../content/browser/fileapi/file_system_browsertest.cc', 3062 '../content/browser/fileapi/file_system_browsertest.cc',
3064 '../content/browser/in_process_webkit/indexed_db_browsertest.cc', 3063 '../content/browser/in_process_webkit/indexed_db_browsertest.cc',
3065 '../content/browser/in_process_webkit/indexed_db_layout_browsertest.cc', 3064 '../content/browser/in_process_webkit/indexed_db_layout_browsertest.cc',
3066 '../content/browser/indexed_db/idbbindingutilities_browsertest.cc', 3065 '../content/browser/indexed_db/idbbindingutilities_browsertest.cc',
3067 '../content/browser/media_browsertest.cc', 3066 '../content/browser/media_browsertest.cc',
3068 '../content/browser/plugin_browsertest.cc',
3069 '../content/browser/plugin_data_remover_impl_browsertest.cc', 3067 '../content/browser/plugin_data_remover_impl_browsertest.cc',
3070 '../content/browser/plugin_service_impl_browsertest.cc', 3068 '../content/browser/plugin_service_impl_browsertest.cc',
3071 '../content/browser/renderer_host/render_process_host_browsertest.cc', 3069 '../content/browser/renderer_host/render_process_host_browsertest.cc',
3072 '../content/browser/renderer_host/render_view_host_browsertest.cc', 3070 '../content/browser/renderer_host/render_view_host_browsertest.cc',
3073 '../content/browser/renderer_host/render_view_host_manager_browsertest.c c', 3071 '../content/browser/renderer_host/render_view_host_manager_browsertest.c c',
3074 '../content/browser/renderer_host/resource_dispatcher_host_browsertest.c c', 3072 '../content/browser/renderer_host/resource_dispatcher_host_browsertest.c c',
3075 '../content/browser/session_history_browsertest.cc', 3073 '../content/browser/session_history_browsertest.cc',
3076 '../content/browser/speech/speech_recognition_browsertest.cc', 3074 '../content/browser/speech/speech_recognition_browsertest.cc',
3077 '../content/browser/webkit_browsertest.cc', 3075 '../content/browser/webkit_browsertest.cc',
3078 '../content/browser/worker_host/test/worker_browsertest.cc', 3076 '../content/browser/worker_host/test/worker_browsertest.cc',
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
3342 ['exclude', '^browser/ui/views/'], 3340 ['exclude', '^browser/ui/views/'],
3343 ['exclude', '^../ui/views/'], 3341 ['exclude', '^../ui/views/'],
3344 ['exclude', '^browser/extensions/extension_input_apitest.cc'], 3342 ['exclude', '^browser/extensions/extension_input_apitest.cc'],
3345 ['exclude', '^browser/ui/panels/panel_view_browsertest.cc'], 3343 ['exclude', '^browser/ui/panels/panel_view_browsertest.cc'],
3346 ], 3344 ],
3347 }], 3345 }],
3348 ['target_arch!="arm"', { 3346 ['target_arch!="arm"', {
3349 'dependencies': [ 3347 'dependencies': [
3350 # build time dependency. 3348 # build time dependency.
3351 '../v8/tools/gyp/v8.gyp:v8_shell#host', 3349 '../v8/tools/gyp/v8.gyp:v8_shell#host',
3352 # run time dependency
3353 '../webkit/webkit.gyp:copy_npapi_test_plugin',
3354 ], 3350 ],
3355 }], 3351 }],
3356 ['component=="shared_library" and incremental_chrome_dll!=1', { 3352 ['component=="shared_library" and incremental_chrome_dll!=1', {
3357 # This is needed for tests that subclass 3353 # This is needed for tests that subclass
3358 # RendererWebKitPlatformSupportImpl, which subclasses stuff in 3354 # RendererWebKitPlatformSupportImpl, which subclasses stuff in
3359 # glue, which refers to symbols defined in these files. 3355 # glue, which refers to symbols defined in these files.
3360 # Hopefully this can be resolved with http://crbug.com/98755. 3356 # Hopefully this can be resolved with http://crbug.com/98755.
3361 'sources': [ 3357 'sources': [
3362 '../content/common/socket_stream_dispatcher.cc', 3358 '../content/common/socket_stream_dispatcher.cc',
3363 ]}, 3359 ]},
3364 ], 3360 ],
3365 ['use_aura==1', { 3361 ['use_aura==1', {
3366 'sources!': [ 3362 'sources!': [
3367 '../content/browser/plugin_browsertest.cc',
3368 '../content/browser/accessibility/dump_accessibility_tree_browsertes t.cc', 3363 '../content/browser/accessibility/dump_accessibility_tree_browsertes t.cc',
3369 '../content/browser/accessibility/dump_accessibility_tree_helper_win .cc', 3364 '../content/browser/accessibility/dump_accessibility_tree_helper_win .cc',
3370 '../content/browser/accessibility/dump_accessibility_tree_helper.cc' , 3365 '../content/browser/accessibility/dump_accessibility_tree_helper.cc' ,
3371 ] 3366 ]
3372 }, { # else: use_aura == 0 3367 }, { # else: use_aura == 0
3373 'sources!': [ 3368 'sources!': [
3374 'browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.c c', 3369 'browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.c c',
3375 ], 3370 ],
3376 }], 3371 }],
3377 ], # conditions 3372 ], # conditions
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
3431 '../testing/gmock.gyp:gmock', 3426 '../testing/gmock.gyp:gmock',
3432 '../testing/gtest.gyp:gtest', 3427 '../testing/gtest.gyp:gtest',
3433 '../third_party/cld/cld.gyp:cld', 3428 '../third_party/cld/cld.gyp:cld',
3434 '../third_party/icu/icu.gyp:icui18n', 3429 '../third_party/icu/icu.gyp:icui18n',
3435 '../third_party/icu/icu.gyp:icuuc', 3430 '../third_party/icu/icu.gyp:icuuc',
3436 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 3431 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
3437 '../v8/tools/gyp/v8.gyp:v8', 3432 '../v8/tools/gyp/v8.gyp:v8',
3438 '../webkit/webkit.gyp:test_shell_test_support', 3433 '../webkit/webkit.gyp:test_shell_test_support',
3439 # Runtime dependencies 3434 # Runtime dependencies
3440 '../third_party/mesa/mesa.gyp:osmesa', 3435 '../third_party/mesa/mesa.gyp:osmesa',
3441 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
3442 ], 3436 ],
3443 'include_dirs': [ 3437 'include_dirs': [
3444 '..', 3438 '..',
3445 ], 3439 ],
3446 'defines': [ 3440 'defines': [
3447 'HAS_OUT_OF_PROC_TEST_RUNNER', 3441 'HAS_OUT_OF_PROC_TEST_RUNNER',
3448 ], 3442 ],
3449 'sources': [ 3443 'sources': [
3450 'app/breakpad_mac_stubs.mm', 3444 'app/breakpad_mac_stubs.mm',
3451 'app/chrome_command_ids.h', 3445 'app/chrome_command_ids.h',
(...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
4697 'input_jars_paths': [ 4691 'input_jars_paths': [
4698 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 4692 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
4699 ], 4693 ],
4700 }, 4694 },
4701 'includes': [ '../build/apk_test.gypi' ], 4695 'includes': [ '../build/apk_test.gypi' ],
4702 }, 4696 },
4703 ], 4697 ],
4704 }], 4698 }],
4705 ], # 'conditions' 4699 ], # 'conditions'
4706 } 4700 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698