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

Unified Diff: content/content_tests.gypi

Issue 942973002: Revert of 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
« no previous file with comments | « no previous file | content/renderer/visual_state_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 08e7214fe571a94fe0a2ba0bd997503282085d7c..92ec2e6a5ead80fa5c4a6c50346852249f16c17a 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -254,7 +254,6 @@
'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',
@@ -1593,7 +1592,7 @@
'../testing/android/native_test.gyp:native_test_native_code',
'../gpu/gpu.gyp:gpu_unittest_utils',
],
- }, { # OS!="android"
+ }, { # OS!="android"
'sources/': [
['exclude', '^common/gpu/media/android_video_decode_accelerator_unittest.cc'],
],
@@ -1624,8 +1623,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
],
}],
],
@@ -1996,7 +1995,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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698