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

Unified Diff: content/content_tests.gypi

Issue 187183002: Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge problem Created 6 years, 9 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/content_common.gypi ('k') | mojo/gles2/command_buffer_client_impl.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 5fe67f865b0dd2f0e5c2b6c7e5e8cd0669ba4b56..a1aa041c709297bfbe09b15c922cfd0e2840aaab 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -970,6 +970,7 @@
'HAS_OUT_OF_PROC_TEST_RUNNER',
],
'sources': [
+ 'app/mojo/mojo_browsertest.cc',
'browser/accessibility/accessibility_win_browsertest.cc',
'browser/accessibility/cross_platform_accessibility_browsertest.cc',
'browser/accessibility/dump_accessibility_tree_browsertest.cc',
@@ -1147,6 +1148,16 @@
['exclude', '^browser/compositor/'],
],
}],
+ ['use_mojo==1', {
+ 'dependencies': [
+ '../mojo/mojo.gyp:mojo_environment_chromium',
+ '../mojo/mojo.gyp:mojo_service_manager',
+ ],
+ },{
+ 'sources!': [
+ 'app/mojo/mojo_browsertest.cc',
+ ],
+ }],
['OS!="android" and OS!="ios"', {
# npapi test plugin doesn't build on android or ios
'dependencies': [
« no previous file with comments | « content/content_common.gypi ('k') | mojo/gles2/command_buffer_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698