Add creation of ServiceManager to Content

content/content_common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   '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',
     '../third_party/icu/icu.gyp:icuuc',
     '../third_party/libjingle/libjingle.gyp:libjingle',
     '../ui/accessibility/accessibility.gyp:accessibility',
     '../ui/base/ui_base.gyp:ui_base',
     '../ui/gfx/gfx.gyp:gfx',
     '../ui/gfx/gfx.gyp:gfx_geometry',
     '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
@@ skipping 305 matching lines @@
     'common/media/video_capture.h',
     'common/media/video_capture_messages.h',
     'common/media/webrtc_identity_messages.h',
     'common/memory_benchmark_messages.h',
     'common/message_port_messages.h',
     'common/message_router.cc',
     'common/message_router.h',
     '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',
     'common/net/url_request_user_data.cc',
     'common/net/url_request_user_data.h',
     'common/one_writer_seqlock.cc',
     'common/one_writer_seqlock.h',
     'common/p2p_messages.h',
     'common/page_state_serialization.cc',
     'common/page_state_serialization.h',
@@ skipping 149 matching lines @@
       'link_settings': {
         'libraries': [
           '<(PRODUCT_DIR)/lib/libmojo_system.so',
         ],
       },
     }],
     ['use_mojo==0', {
       'sources!': [
         'common/mojo/mojo_channel_init.cc',
         'common/mojo/mojo_channel_init.h',
+        'common/mojo/mojo_init.cc',
+        'common/mojo/mojo_init.h',
       ],
     }, {
       'dependencies': [
         '../mojo/mojo.gyp:mojo_environment_chromium',
         '../mojo/mojo.gyp:mojo_system',
         '../mojo/mojo.gyp:mojo_system_impl',
       ],
     }],
     ['OS=="mac"', {
       'sources': [
@@ skipping 221 matching lines @@
         'common/sandbox_linux/bpf_renderer_policy_linux.cc',
         'common/sandbox_linux/bpf_renderer_policy_linux.h',
         'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
         'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
       ],
     }, {
       'defines': ['USE_SECCOMP_BPF'],
     }],
   ],
 }