Add creation of ServiceManager to Content (2nd try)

content/content_app.gypi

Index: content/content_app.gypi
diff --git a/content/content_app.gypi b/content/content_app.gypi
index 49081759a5bcb707b060782e875dd33f17e01efe..6187bce207e71e6244a133f57f2fa0aac3838a4b 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -24,6 +24,8 @@
     'app/android/library_loader_hooks.cc',
     'app/content_main.cc',
     'app/content_main_runner.cc',
+    'app/mojo/mojo_init.cc',
+    'app/mojo/mojo_init.h',
     'app/startup_helper_win.cc',
     'public/app/android_library_loader_hooks.h',
     'public/app/content_main.h',
@@ -55,5 +57,18 @@
         'app/content_main.cc',
       ],
     }],
+    ['use_mojo==0', {
+      'sources!': [
+        'app/mojo/mojo_init.cc',
+        'app/mojo/mojo_init.h',
+      ],
+    }, {
+      'dependencies': [
+        '../mojo/mojo.gyp:mojo_environment_chromium',
+        '../mojo/mojo.gyp:mojo_service_manager',
+        '../mojo/mojo.gyp:mojo_system',
+        '../mojo/mojo.gyp:mojo_system_impl',
+     ],
+    }],
   ],
 }