Add creation of ServiceManager to Content (2nd try)

mojo/mojo_services.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_gles2_bindings',
       'type': 'static_library',
       'sources': [
         'services/gles2/command_buffer.mojom',
         'services/gles2/command_buffer_type_conversions.cc',
         'services/gles2/command_buffer_type_conversions.h',
       ],
@@ skipping 53 matching lines @@
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_gles2_service',
         'mojo_native_viewport_bindings',
-        'mojo_shell_bindings',
+        'mojo_shell_client',
       ],
       'defines': [
         'MOJO_NATIVE_VIEWPORT_IMPLEMENTATION',
       ],
       'sources': [
         'services/native_viewport/geometry_conversions.h',
         'services/native_viewport/native_viewport.h',
         'services/native_viewport/native_viewport_android.cc',
         'services/native_viewport/native_viewport_mac.mm',
         'services/native_viewport/native_viewport_service.cc',
@@ skipping 10 matching lines @@
         }],
         ['OS=="android"', {
           'dependencies': [
             'mojo_jni_headers',
           ],
         }],
       ],
     },
   ],
 }