Add creation of ServiceManager to Content

content/content_common.gypi

Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 06bd8edb30184a27087c17e4b8ba8b5a5865dedf..6b61241a993a9f2056ece67e83baba13c8a6567c 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -6,6 +6,8 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../components/tracing.gyp:tracing',
+    '../mojo/mojo.gyp:mojo_environment_chromium',

[sky, 2014/03/19 23:48:29]

These should be moved to around 512ish (use_mojo==1).

[DaveMoore, 2014/03/20 00:04:26]

Done.

+    '../mojo/mojo.gyp:mojo_service_manager',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
     '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
@@ -331,6 +333,8 @@
     'common/mime_registry_messages.h',
     'common/mojo/mojo_channel_init.cc',
     'common/mojo/mojo_channel_init.h',
+    'common/mojo/mojo_init.cc',
+    'common/mojo/mojo_init.h',
     'common/mojo/mojo_messages.h',
     'common/navigation_gesture.h',
     'common/net/url_fetcher.cc',
@@ -500,6 +504,8 @@
       'sources!': [
         'common/mojo/mojo_channel_init.cc',
         'common/mojo/mojo_channel_init.h',
+        'common/mojo/mojo_init.cc',
+        'common/mojo/mojo_init.h',
       ],
     }, {
       'dependencies': [