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

Unified Diff: content/content_browsertests.isolate

Issue 1318143002: Always use ENABLE_PLUGINS to indicate plugins support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tryjob failures: forgot to set/check ENABLE_PDF in a couple places. Created 5 years, 4 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 | « content/browser/child_process_launcher.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browsertests.isolate
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index ca92600e395b22203b16218e5fe673a912b7971a..2ebd3e8b01991c03b5a10e29d6ebf2323fa23251 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -77,12 +77,18 @@
],
},
}],
- ['OS=="linux" or OS=="mac" or OS=="win"', {
+ ['enable_plugins==1', {
'variables': {
'files': [
- '../net/tools/testserver/',
'../ppapi/tests/test_case.html',
'../ppapi/tests/test_page.css',
+ ],
+ },
+ }],
+ ['OS=="linux" or OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'files': [
+ '../net/tools/testserver/',
'../testing/test_env.py',
'../third_party/pyftpdlib/',
'../third_party/pywebsocket/',
« no previous file with comments | « content/browser/child_process_launcher.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698