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

Unified 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: 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 side-by-side diff with in-line comments
Download patch
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index dc28aeefd5d2ea46f6b80f659e474166bcf1a9d0..8ec6cbf4144e9613e5b9ac5de3986984c04efe82 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -253,6 +253,7 @@
'renderer/render_view_browsertest.cc',
'renderer/render_view_browsertest_mac.mm',
'renderer/render_widget_browsertest.cc',
+ 'renderer/visual_state_browsertest.cc',
'test/accessibility_browser_test_utils.cc',
'test/accessibility_browser_test_utils.h',
'test/browser_test_utils_browsertest.cc',
@@ -1590,7 +1591,7 @@
'../testing/android/native_test.gyp:native_test_native_code',
'../gpu/gpu.gyp:gpu_unittest_utils',
],
- }, { # OS!="android"
+ }, { # OS!="android"
Sami 2015/02/18 16:12:22 Did you mean to change this and the other whitespa
Ignacio Solla 2015/02/18 16:42:34 it wasn't me, it was either git format patch or th
'sources/': [
['exclude', '^common/gpu/media/android_video_decode_accelerator_unittest.cc'],
],
@@ -1621,8 +1622,8 @@
}],
['use_ozone==1 and chromeos==1', {
'dependencies': [
- '../ui/display/display.gyp:display', # Used by rendering_helper.cc
- '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helper.cc
+ '../ui/display/display.gyp:display', # Used by rendering_helper.cc
+ '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helper.cc
],
}],
],
@@ -1993,7 +1994,7 @@
'apk_name': 'ContentShellTest',
'java_in_dir': 'shell/android/javatests',
'resource_dir': 'shell/android/shell_apk/res',
- 'additional_src_dirs': ['public/android/javatests/',],
+ 'additional_src_dirs': ['public/android/javatests/', ],
'is_test_apk': 1,
},
'includes': [ '../build/java_apk.gypi' ],
« no previous file with comments | « no previous file | content/renderer/visual_state_browsertest.cc » ('j') | content/renderer/visual_state_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698