Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/mojo_services.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_echo_bindings',
       'type': 'static_library',
       'sources': [
         'services/dbus_echo/echo.mojom',
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
@@ skipping 73 matching lines @@
         '../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_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gles2_service',
         'mojo_native_viewport_bindings',
-        'mojo_application',
+        'mojo_shell_client',
         'mojo_system_impl',
       ],
       'defines': [
         'MOJO_NATIVE_VIEWPORT_IMPLEMENTATION',
       ],
       'sources': [
         '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 43 matching lines @@
     {
       'target_name': 'mojo_view_manager_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
-        'mojo_service_provider_bindings',
+        'mojo_shell_bindings',
         'mojo_view_manager_bindings',
         'mojo_view_manager_common',
       ],
       'sources': [
         'services/public/cpp/view_manager/lib/view.cc',
         'services/public/cpp/view_manager/lib/view_private.cc',
         'services/public/cpp/view_manager/lib/view_private.h',
         'services/public/cpp/view_manager/lib/view_manager.cc',
         'services/public/cpp/view_manager/lib/view_manager_private.cc',
         'services/public/cpp/view_manager/lib/view_manager_private.h',
@@ skipping 60 matching lines @@
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             'mojo_aura_support',
             'mojo_common_lib',
             'mojo_environment_chromium',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_gles2',
             'mojo_launcher_bindings',
             'mojo_native_viewport_bindings',
-            'mojo_application',
+            'mojo_shell_client',
             'mojo_system_impl',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
           ],
           'sources': [
             'services/view_manager/ids.h',
             'services/view_manager/main.cc',
             'services/view_manager/node.cc',
             'services/view_manager/node.h',
             'services/view_manager/node_delegate.h',
@@ skipping 32 matching lines @@
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../ui/aura/aura.gyp:aura',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             'mojo_environment_chromium',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
-            'mojo_application',
+            'mojo_shell_client',
             'mojo_shell_test_support',
             'mojo_system_impl',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
             'mojo_view_manager_run_unittests',
           ],
           'sources': [
             'services/view_manager/view_manager_connection_unittest.cc',
           ],
         },
@@ skipping 12 matching lines @@
           'target_name': 'mojo_dbus_echo_service',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../build/linux/system.gyp:dbus',
             '../dbus/dbus.gyp:dbus',
             'mojo_common_lib',
             'mojo_dbus_service',
             'mojo_echo_bindings',
             'mojo_environment_chromium',
-            'mojo_application',
+            'mojo_shell_client',
             'mojo_system_impl',
           ],
           'sources': [
             'services/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
     }],
   ],
 }