Add creation of ServiceManager to Content (2nd try)

mojo/mojo_examples.gypi

 # Copyright 2013 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.
 
 {
   'targets': [
     {
       'target_name': 'mojo_sample_app',
       'type': 'shared_library',
       'dependencies': [
         # TODO(darin): we should not be linking against these libraries!
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gl/gl.gyp:gl',
+        'mojo_bindings',
         'mojo_environment_standalone',
         'mojo_gles2',
         'mojo_native_viewport_bindings',
-        'mojo_shell_bindings',
+        'mojo_shell_client',
         'mojo_system',
         'mojo_utility',
       ],
       'sources': [
         'examples/sample_app/gles2_client_impl.cc',
         'examples/sample_app/gles2_client_impl.cc',
         'examples/sample_app/sample_app.cc',
         'examples/sample_app/spinning_cube.cc',
         'examples/sample_app/spinning_cube.h',
       ],
@@ skipping 27 matching lines @@
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_common_lib',
         'mojo_compositor_support',
         'mojo_environment_chromium',
         'mojo_gles2',
         'mojo_native_viewport_bindings',
-        'mojo_shell_bindings',
+        'mojo_shell_client',
         'mojo_system',
       ],
       'sources': [
         'examples/compositor_app/compositor_app.cc',
         'examples/compositor_app/compositor_host.cc',
         'examples/compositor_app/compositor_host.h',
       ],
     },
     {
       'target_name': 'package_mojo_compositor_app',
       'variables': {
         'app_name': 'mojo_compositor_app',
       },
       'includes': [ 'build/package_app.gypi' ],
     },
     {
       'target_name': 'mojo_pepper_container_app',
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../ppapi/ppapi.gyp:ppapi_c',
         '../ppapi/ppapi_internal.gyp:ppapi_example_gles2_spinning_cube',
         'mojo_environment_chromium',
         'mojo_gles2',
         'mojo_native_viewport_bindings',
-        'mojo_shell_bindings',
+        'mojo_shell_client',
         'mojo_system',
       ],
       'defines': [
         # We don't really want to export. We could change how
         # ppapi_{shared,thunk}_export.h are defined to avoid this.
         'PPAPI_SHARED_IMPLEMENTATION',
         'PPAPI_THUNK_IMPLEMENTATION',
       ],
       'sources': [
         # Source files from ppapi/.
@@ skipping 100 matching lines @@
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/aura/aura.gyp:aura',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             'mojo_aura_demo_support',
             'mojo_common_lib',
             'mojo_environment_chromium',
             'mojo_gles2',
-            'mojo_shell_bindings',
+            'mojo_shell_client',
             'mojo_system',
           ],
           'sources': [
             'examples/aura_demo/aura_demo.cc',
           ],
         },
         {
           'target_name': 'package_mojo_aura_demo',
           'variables': {
             'app_name': 'mojo_aura_demo',
@@ skipping 30 matching lines @@
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/views/views.gyp:views',
             '../url/url.gyp:url_lib',
             'mojo_aura_demo_support',
             'mojo_common_lib',
             'mojo_environment_chromium',
             'mojo_gles2',
             'mojo_launcher_bindings',
-            'mojo_shell_bindings',
+            'mojo_shell_client',
             'mojo_system',
           ],
           'sources': [
             'examples/launcher/launcher.cc',
           ],
         },
         {
           'target_name': 'package_mojo_launcher',
           'variables': {
             'app_name': 'mojo_launcher',
@@ skipping 22 matching lines @@
         {
           'target_name': 'mojo_view_manager',
           'type': 'shared_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             'mojo_common_lib',
             'mojo_environment_chromium',
             'mojo_launcher_bindings',
             'mojo_native_viewport_bindings',
-            'mojo_shell_bindings',
+            'mojo_shell_client',
             'mojo_system',
             'mojo_view_manager_bindings',
           ],
           'sources': [
             'examples/view_manager/view_manager.cc',
           ],
         },
         {
           'target_name': 'package_mojo_view_manager',
           'variables': {
             'app_name': 'mojo_view_manager',
           },
           'includes': [ 'build/package_app.gypi' ],
         },
       ],
     }],
   ],
 }