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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Check USE_MOJO for Windows bots 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
« content/content_common.gypi ('K') | « content/content_common.gypi ('k') | mojo/mojo.gyp » ('j') | mojo/service_manager/service_manager_export.h » ('J')
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 7188240f6588a891dcbe29f5e1de4b805fef2028..14ef06c55d56a349021d4cf78def8a90561f9591 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -937,6 +937,8 @@
'../ipc/ipc.gyp:test_support_ipc',
'../media/media.gyp:media_test_support',
'../media/media.gyp:shared_memory_support',
+ '../mojo/mojo.gyp:mojo_environment_chromium',
sky 2014/03/19 23:48:29 Guard these in a use_mojo==1 block.
DaveMoore 2014/03/20 00:04:26 Done.
+ '../mojo/mojo.gyp:mojo_service_manager',
'../net/net.gyp:net_test_support',
'../ppapi/ppapi_internal.gyp:ppapi_host',
'../ppapi/ppapi_internal.gyp:ppapi_ipc',
@@ -1027,6 +1029,7 @@
'browser/worker_host/test/worker_browsertest.cc',
'child/site_isolation_policy_browsertest.cc',
'common/gpu/client/context_provider_command_buffer_browsertest.cc',
+ 'common/mojo/mojo_browsertest.cc',
'renderer/accessibility/renderer_accessibility_browsertest.cc',
'renderer/browser_plugin/browser_plugin_browsertest.cc',
'renderer/browser_plugin/browser_plugin_browsertest.h',
« content/content_common.gypi ('K') | « content/content_common.gypi ('k') | mojo/mojo.gyp » ('j') | mojo/service_manager/service_manager_export.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698