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

Unified Diff: content/content_tests.gypi

Issue 10806056: Move plugin_browsertests.cc from browser_tests to content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to mac+win fixes Created 8 years, 5 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
===================================================================
--- content/content_tests.gypi (revision 147965)
+++ content/content_tests.gypi (working copy)
@@ -547,10 +547,12 @@
'HAS_OUT_OF_PROC_TEST_RUNNER',
],
'sources': [
+ 'browser/plugin_browsertest.cc',
'test/content_browser_test.h',
'test/content_browser_test.cc',
'test/content_browser_test_utils.cc',
'test/content_browser_test_utils.h',
+ 'test/content_browser_test_utils_mac.mm',
'test/content_browser_test_test.cc',
'test/content_test_launcher.cc',
],
@@ -597,6 +599,18 @@
'content_shell', # Needed for Content Shell.app's Helper.
],
}],
+ ['use_aura==1', {
+ 'sources!': [
+ 'browser/plugin_browsertest.cc',
+ ],
+ }],
+ ['target_arch!="arm"', {
+ 'dependencies': [
+ # Runtime dependencies
+ '../webkit/webkit.gyp:copy_npapi_test_plugin',
+ '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
+ ],
+ }],
],
},
],

Powered by Google App Engine
This is Rietveld 408576698