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

Side by Side Diff: content/content_tests.gypi

Issue 939673002: Test that visual state callbacks do not deadlock. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@breakSwapIfNoUpdates
Patch Set: Rebase Created 5 years, 10 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
« no previous file with comments | « no previous file | content/renderer/visual_state_browsertest.cc » ('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) 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 'child/site_isolation_policy_browsertest.cc', 247 'child/site_isolation_policy_browsertest.cc',
248 'child/child_discardable_shared_memory_manager_browsertest.cc', 248 'child/child_discardable_shared_memory_manager_browsertest.cc',
249 'renderer/accessibility/renderer_accessibility_browsertest.cc', 249 'renderer/accessibility/renderer_accessibility_browsertest.cc',
250 'renderer/devtools/v8_sampling_profiler_browsertest.cc', 250 'renderer/devtools/v8_sampling_profiler_browsertest.cc',
251 'renderer/gin_browsertest.cc', 251 'renderer/gin_browsertest.cc',
252 'renderer/mouse_lock_dispatcher_browsertest.cc', 252 'renderer/mouse_lock_dispatcher_browsertest.cc',
253 'renderer/render_thread_impl_browsertest.cc', 253 'renderer/render_thread_impl_browsertest.cc',
254 'renderer/render_view_browsertest.cc', 254 'renderer/render_view_browsertest.cc',
255 'renderer/render_view_browsertest_mac.mm', 255 'renderer/render_view_browsertest_mac.mm',
256 'renderer/render_widget_browsertest.cc', 256 'renderer/render_widget_browsertest.cc',
257 'renderer/visual_state_browsertest.cc',
257 'test/accessibility_browser_test_utils.cc', 258 'test/accessibility_browser_test_utils.cc',
258 'test/accessibility_browser_test_utils.h', 259 'test/accessibility_browser_test_utils.h',
259 'test/browser_test_utils_browsertest.cc', 260 'test/browser_test_utils_browsertest.cc',
260 'test/content_browser_test_test.cc', 261 'test/content_browser_test_test.cc',
261 'test/webui_resource_browsertest.cc', 262 'test/webui_resource_browsertest.cc',
262 263
263 ], 264 ],
264 'content_browsertests_android_sources': [ 265 'content_browsertests_android_sources': [
265 'browser/accessibility/android_granularity_movement_browsertest.cc', 266 'browser/accessibility/android_granularity_movement_browsertest.cc',
266 'browser/accessibility/android_hit_testing_browsertest.cc', 267 'browser/accessibility/android_hit_testing_browsertest.cc',
(...skipping 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1585 ['exclude', '^common/gpu/media/rendering_helper.h'], 1586 ['exclude', '^common/gpu/media/rendering_helper.h'],
1586 ['exclude', '^common/gpu/media/rendering_helper.cc'], 1587 ['exclude', '^common/gpu/media/rendering_helper.cc'],
1587 ['exclude', '^common/gpu/media/video_decode_accelerator_unitte st.cc'], 1588 ['exclude', '^common/gpu/media/video_decode_accelerator_unitte st.cc'],
1588 ], 1589 ],
1589 'dependencies': [ 1590 'dependencies': [
1590 '../media/media.gyp:player_android', 1591 '../media/media.gyp:player_android',
1591 '../testing/gmock.gyp:gmock', 1592 '../testing/gmock.gyp:gmock',
1592 '../testing/android/native_test.gyp:native_test_native_code', 1593 '../testing/android/native_test.gyp:native_test_native_code',
1593 '../gpu/gpu.gyp:gpu_unittest_utils', 1594 '../gpu/gpu.gyp:gpu_unittest_utils',
1594 ], 1595 ],
1595 }, { # OS!="android" 1596 }, { # OS!="android"
1596 'sources/': [ 1597 'sources/': [
1597 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'], 1598 ['exclude', '^common/gpu/media/android_video_decode_accelerato r_unittest.cc'],
1598 ], 1599 ],
1599 }], 1600 }],
1600 ['OS=="win"', { 1601 ['OS=="win"', {
1601 'dependencies': [ 1602 'dependencies': [
1602 '<(angle_path)/src/angle.gyp:libEGL', 1603 '<(angle_path)/src/angle.gyp:libEGL',
1603 '<(angle_path)/src/angle.gyp:libGLESv2', 1604 '<(angle_path)/src/angle.gyp:libGLESv2',
1604 ], 1605 ],
1605 }], 1606 }],
(...skipping 10 matching lines...) Expand all
1616 ], 1617 ],
1617 }], 1618 }],
1618 ['use_x11==1', { 1619 ['use_x11==1', {
1619 'dependencies': [ 1620 'dependencies': [
1620 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c 1621 '../build/linux/system.gyp:x11', # Used by rendering_helper.c c
1621 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', 1622 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
1622 ], 1623 ],
1623 }], 1624 }],
1624 ['use_ozone==1 and chromeos==1', { 1625 ['use_ozone==1 and chromeos==1', {
1625 'dependencies': [ 1626 'dependencies': [
1626 '../ui/display/display.gyp:display', # Used by rendering_helpe r.cc 1627 '../ui/display/display.gyp:display', # Used by rendering_help er.cc
1627 '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helpe r.cc 1628 '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helper.cc
1628 ], 1629 ],
1629 }], 1630 }],
1630 ], 1631 ],
1631 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1632 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1632 'msvs_disabled_warnings': [ 4267, ], 1633 'msvs_disabled_warnings': [ 4267, ],
1633 }, 1634 },
1634 ] 1635 ]
1635 }], 1636 }],
1636 ['chromeos==1 and target_arch != "arm"', { 1637 ['chromeos==1 and target_arch != "arm"', {
1637 'targets': [ 1638 'targets': [
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1988 '../media/media.gyp:media_test_support', 1989 '../media/media.gyp:media_test_support',
1989 '../net/net.gyp:net_java', 1990 '../net/net.gyp:net_java',
1990 '../net/net.gyp:net_javatests', 1991 '../net/net.gyp:net_javatests',
1991 '../net/net.gyp:net_java_test_support', 1992 '../net/net.gyp:net_java_test_support',
1992 '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces', 1993 '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
1993 ], 1994 ],
1994 'variables': { 1995 'variables': {
1995 'apk_name': 'ContentShellTest', 1996 'apk_name': 'ContentShellTest',
1996 'java_in_dir': 'shell/android/javatests', 1997 'java_in_dir': 'shell/android/javatests',
1997 'resource_dir': 'shell/android/shell_apk/res', 1998 'resource_dir': 'shell/android/shell_apk/res',
1998 'additional_src_dirs': ['public/android/javatests/',], 1999 'additional_src_dirs': ['public/android/javatests/', ],
1999 'is_test_apk': 1, 2000 'is_test_apk': 1,
2000 }, 2001 },
2001 'includes': [ '../build/java_apk.gypi' ], 2002 'includes': [ '../build/java_apk.gypi' ],
2002 }, 2003 },
2003 ], 2004 ],
2004 }], 2005 }],
2005 ['OS!="android" and OS!="ios" and OS!="linux"', { 2006 ['OS!="android" and OS!="ios" and OS!="linux"', {
2006 # npapi test plugin doesn't build on android or ios 2007 # npapi test plugin doesn't build on android or ios
2007 'targets': [ 2008 'targets': [
2008 { 2009 {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
2141 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 2142 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
2142 }, 2143 },
2143 ], 2144 ],
2144 }], 2145 }],
2145 ], 2146 ],
2146 }, 2147 },
2147 ], 2148 ],
2148 }], 2149 }],
2149 ], 2150 ],
2150 } 2151 }
OLDNEW
« no previous file with comments | « no previous file | content/renderer/visual_state_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698