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

Side by Side Diff: content/content_tests.gypi

Issue 592153002: Replace Chrome IPC with Mojo IPC for querying BatteryStatus service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Tim's comments. Created 6 years, 2 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 { 5 {
6 'variables': { 6 'variables': {
7 'layouttest_support_content_sources': [ 7 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 8 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 9 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 10 'public/test/nested_message_pump_android.h',
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 'browser/appcache/appcache_update_job_unittest.cc', 390 'browser/appcache/appcache_update_job_unittest.cc',
391 'browser/appcache/appcache_url_request_job_unittest.cc', 391 'browser/appcache/appcache_url_request_job_unittest.cc',
392 'browser/appcache/chrome_appcache_service_unittest.cc', 392 'browser/appcache/chrome_appcache_service_unittest.cc',
393 'browser/appcache/mock_appcache_policy.cc', 393 'browser/appcache/mock_appcache_policy.cc',
394 'browser/appcache/mock_appcache_policy.h', 394 'browser/appcache/mock_appcache_policy.h',
395 'browser/appcache/mock_appcache_service.cc', 395 'browser/appcache/mock_appcache_service.cc',
396 'browser/appcache/mock_appcache_service.h', 396 'browser/appcache/mock_appcache_service.h',
397 'browser/appcache/mock_appcache_storage.cc', 397 'browser/appcache/mock_appcache_storage.cc',
398 'browser/appcache/mock_appcache_storage.h', 398 'browser/appcache/mock_appcache_storage.h',
399 'browser/appcache/mock_appcache_storage_unittest.cc', 399 'browser/appcache/mock_appcache_storage_unittest.cc',
400 'browser/battery_status/battery_status_manager_linux_unittest.cc',
401 'browser/battery_status/battery_status_manager_win_unittest.cc',
402 'browser/battery_status/battery_status_service_unittest.cc',
403 'browser/browser_thread_unittest.cc', 400 'browser/browser_thread_unittest.cc',
404 'browser/browser_url_handler_impl_unittest.cc', 401 'browser/browser_url_handler_impl_unittest.cc',
405 'browser/byte_stream_unittest.cc', 402 'browser/byte_stream_unittest.cc',
406 'browser/child_process_security_policy_unittest.cc', 403 'browser/child_process_security_policy_unittest.cc',
407 'browser/cocoa/system_hotkey_map_unittest.mm', 404 'browser/cocoa/system_hotkey_map_unittest.mm',
408 'browser/compositor/buffer_queue_unittest.cc', 405 'browser/compositor/buffer_queue_unittest.cc',
409 'browser/compositor/software_browser_compositor_output_surface_unittest. cc', 406 'browser/compositor/software_browser_compositor_output_surface_unittest. cc',
410 'browser/compositor/software_output_device_ozone_unittest.cc', 407 'browser/compositor/software_output_device_ozone_unittest.cc',
411 'browser/databases_table_unittest.cc', 408 'browser/databases_table_unittest.cc',
412 'browser/database_quota_client_unittest.cc', 409 'browser/database_quota_client_unittest.cc',
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 'common/sandbox_mac_diraccess_unittest.mm', 678 'common/sandbox_mac_diraccess_unittest.mm',
682 'common/sandbox_mac_fontloading_unittest.mm', 679 'common/sandbox_mac_fontloading_unittest.mm',
683 'common/sandbox_mac_system_access_unittest.mm', 680 'common/sandbox_mac_system_access_unittest.mm',
684 'common/sandbox_mac_unittest_helper.h', 681 'common/sandbox_mac_unittest_helper.h',
685 'common/sandbox_mac_unittest_helper.mm', 682 'common/sandbox_mac_unittest_helper.mm',
686 'common/shareable_file_reference_unittest.cc', 683 'common/shareable_file_reference_unittest.cc',
687 'common/webplugininfo_unittest.cc', 684 'common/webplugininfo_unittest.cc',
688 'renderer/active_notification_tracker_unittest.cc', 685 'renderer/active_notification_tracker_unittest.cc',
689 'renderer/android/email_detector_unittest.cc', 686 'renderer/android/email_detector_unittest.cc',
690 'renderer/android/phone_number_detector_unittest.cc', 687 'renderer/android/phone_number_detector_unittest.cc',
691 'renderer/battery_status/battery_status_dispatcher_unittest.cc',
692 'renderer/bmp_image_decoder_unittest.cc', 688 'renderer/bmp_image_decoder_unittest.cc',
693 'renderer/device_sensors/device_light_event_pump_unittest.cc', 689 'renderer/device_sensors/device_light_event_pump_unittest.cc',
694 'renderer/device_sensors/device_motion_event_pump_unittest.cc', 690 'renderer/device_sensors/device_motion_event_pump_unittest.cc',
695 'renderer/device_sensors/device_orientation_event_pump_unittest.cc', 691 'renderer/device_sensors/device_orientation_event_pump_unittest.cc',
696 'renderer/disambiguation_popup_helper_unittest.cc', 692 'renderer/disambiguation_popup_helper_unittest.cc',
697 'renderer/dom_storage/dom_storage_cached_area_unittest.cc', 693 'renderer/dom_storage/dom_storage_cached_area_unittest.cc',
698 'renderer/gpu/frame_swap_message_queue_unittest.cc', 694 'renderer/gpu/frame_swap_message_queue_unittest.cc',
699 'renderer/gpu/queue_message_swap_promise_unittest.cc', 695 'renderer/gpu/queue_message_swap_promise_unittest.cc',
700 'renderer/gpu/render_widget_compositor_unittest.cc', 696 'renderer/gpu/render_widget_compositor_unittest.cc',
701 'renderer/ico_image_decoder_unittest.cc', 697 'renderer/ico_image_decoder_unittest.cc',
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 ['OS=="mac"', { 877 ['OS=="mac"', {
882 # These flags are needed to run the test on Mac. 878 # These flags are needed to run the test on Mac.
883 # Search for comments about "xcode_settings" in chrome_tests.gypi. 879 # Search for comments about "xcode_settings" in chrome_tests.gypi.
884 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 880 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
885 }], 881 }],
886 ['chromeos==1', { 882 ['chromeos==1', {
887 'dependencies': [ 883 'dependencies': [
888 '../chromeos/chromeos.gyp:chromeos', 884 '../chromeos/chromeos.gyp:chromeos',
889 ], 885 ],
890 'sources/': [ 886 'sources/': [
891 ['exclude', '^browser/battery_status/battery_status_manager_linux_un ittest.cc'],
892 ['exclude', '^browser/geolocation/wifi_data_provider_linux_unittest. cc'], 887 ['exclude', '^browser/geolocation/wifi_data_provider_linux_unittest. cc'],
893 ], 888 ],
894 }], 889 }],
895 ['use_aura==1', { 890 ['use_aura==1', {
896 'dependencies': [ 891 'dependencies': [
897 '../ui/aura/aura.gyp:aura', 892 '../ui/aura/aura.gyp:aura',
898 '../ui/wm/wm.gyp:wm', 893 '../ui/wm/wm.gyp:wm',
899 ] 894 ]
900 }], 895 }],
901 ['use_aura==1 or toolkit_views==1', { 896 ['use_aura==1 or toolkit_views==1', {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 '../testing/android/native_test.gyp:native_test_native_code', 929 '../testing/android/native_test.gyp:native_test_native_code',
935 ], 930 ],
936 }], 931 }],
937 ['use_aura!=1 and OS!="android"', { 932 ['use_aura!=1 and OS!="android"', {
938 'sources!': [ 933 'sources!': [
939 'browser/renderer_host/input/tap_suppression_controller_unittest.cc' , 934 'browser/renderer_host/input/tap_suppression_controller_unittest.cc' ,
940 ], 935 ],
941 }], 936 }],
942 ['use_dbus==0', { 937 ['use_dbus==0', {
943 'sources!': [ 938 'sources!': [
944 'browser/battery_status/battery_status_manager_linux_unittest.cc',
945 'browser/geolocation/wifi_data_provider_linux_unittest.cc', 939 'browser/geolocation/wifi_data_provider_linux_unittest.cc',
946 ], 940 ],
947 }], 941 }],
948 ['OS!="win" and OS!="mac"', { 942 ['OS!="win" and OS!="mac"', {
949 'sources!': [ 943 'sources!': [
950 'common/plugin_list_unittest.cc', 944 'common/plugin_list_unittest.cc',
951 ], 945 ],
952 }], 946 }],
953 ['use_ozone==1', { 947 ['use_ozone==1', {
954 'dependencies': [ 948 'dependencies': [
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1098 'content.gyp:content_gpu', 1092 'content.gyp:content_gpu',
1099 'content.gyp:content_plugin', 1093 'content.gyp:content_plugin',
1100 'content.gyp:content_renderer', 1094 'content.gyp:content_renderer',
1101 'content.gyp:content_resources', 1095 'content.gyp:content_resources',
1102 'content_browser_test_support', 1096 'content_browser_test_support',
1103 'content_shell_lib', 1097 'content_shell_lib',
1104 'content_shell_pak', 1098 'content_shell_pak',
1105 'test_support_content', 1099 'test_support_content',
1106 'web_ui_test_mojo_bindings', 1100 'web_ui_test_mojo_bindings',
1107 '../base/base.gyp:test_support_base', 1101 '../base/base.gyp:test_support_base',
1102 '../device/battery/battery.gyp:device_battery',
1103 '../device/battery/battery.gyp:device_battery_mojo_bindings',
1108 '../gin/gin.gyp:gin', 1104 '../gin/gin.gyp:gin',
1109 '../gpu/gpu.gyp:gpu', 1105 '../gpu/gpu.gyp:gpu',
1110 '../ipc/ipc.gyp:test_support_ipc', 1106 '../ipc/ipc.gyp:test_support_ipc',
1111 '../media/media.gyp:media_test_support', 1107 '../media/media.gyp:media_test_support',
1112 '../media/media.gyp:shared_memory_support', 1108 '../media/media.gyp:shared_memory_support',
1113 '../mojo/mojo_base.gyp:mojo_common_test_support', 1109 '../mojo/mojo_base.gyp:mojo_common_test_support',
1114 '../mojo/mojo_base.gyp:mojo_cpp_bindings', 1110 '../mojo/mojo_base.gyp:mojo_cpp_bindings',
1115 '../mojo/mojo_base.gyp:mojo_environment_chromium', 1111 '../mojo/mojo_base.gyp:mojo_environment_chromium',
1116 '../mojo/mojo_base.gyp:mojo_js_bindings', 1112 '../mojo/mojo_base.gyp:mojo_js_bindings',
1117 '../mojo/mojo_base.gyp:mojo_system_impl', 1113 '../mojo/mojo_base.gyp:mojo_system_impl',
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
1755 # and //content/public/android:content_javatests 1751 # and //content/public/android:content_javatests
1756 'target_name': 'content_shell_test_apk', 1752 'target_name': 'content_shell_test_apk',
1757 'type': 'none', 1753 'type': 'none',
1758 'dependencies': [ 1754 'dependencies': [
1759 'content_java_test_support', 1755 'content_java_test_support',
1760 'content_shell_apk_java', 1756 'content_shell_apk_java',
1761 'content.gyp:content_java', 1757 'content.gyp:content_java',
1762 '../base/base.gyp:base_java', 1758 '../base/base.gyp:base_java',
1763 '../base/base.gyp:base_javatests', 1759 '../base/base.gyp:base_javatests',
1764 '../base/base.gyp:base_java_test_support', 1760 '../base/base.gyp:base_java_test_support',
1761 '../device/battery/battery.gyp:device_battery_javatests',
1765 '../media/media.gyp:media_java', 1762 '../media/media.gyp:media_java',
1766 '../media/media.gyp:media_test_support', 1763 '../media/media.gyp:media_test_support',
1767 '../net/net.gyp:net_java', 1764 '../net/net.gyp:net_java',
1768 '../net/net.gyp:net_javatests', 1765 '../net/net.gyp:net_javatests',
1769 '../net/net.gyp:net_java_test_support', 1766 '../net/net.gyp:net_java_test_support',
1770 ], 1767 ],
1771 'variables': { 1768 'variables': {
1772 'apk_name': 'ContentShellTest', 1769 'apk_name': 'ContentShellTest',
1773 'java_in_dir': 'shell/android/javatests', 1770 'java_in_dir': 'shell/android/javatests',
1774 'resource_dir': 'shell/android/shell_apk/res', 1771 'resource_dir': 'shell/android/shell_apk/res',
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1918 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1915 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1919 }, 1916 },
1920 ], 1917 ],
1921 }], 1918 }],
1922 ], 1919 ],
1923 }, 1920 },
1924 ], 1921 ],
1925 }], 1922 }],
1926 ], 1923 ],
1927 } 1924 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698