Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/mojo_public.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_system',
       'type': 'static_library',
       'defines': [
         'MOJO_SYSTEM_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
@@ skipping 346 matching lines @@
       },
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
     },
     {
-      'target_name': 'mojo_service_provider_bindings',
+      'target_name': 'mojo_shell_bindings',
       'type': 'static_library',
       'sources': [
-        'public/interfaces/service_provider/service_provider.mojom',
+        'public/interfaces/shell/shell.mojom',
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
       },
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
     },
     {
-      'target_name': 'mojo_application',
+      'target_name': 'mojo_shell_client',
       'type': 'static_library',
       'sources': [
-        'public/cpp/application/application.h',
-        'public/cpp/application/connect.h',
-        'public/cpp/application/lib/application.cc',
-        'public/cpp/application/lib/service_connector.cc',
-        'public/cpp/application/lib/service_connector.h',
+        'public/cpp/shell/application.h',
+        'public/cpp/shell/connect.h',
+        'public/cpp/shell/lib/application.cc',
+        'public/cpp/shell/lib/service_connector.cc',
+        'public/cpp/shell/lib/service_connector.h',
       ],
       'dependencies': [
-        'mojo_service_provider_bindings',
+        'mojo_shell_bindings',
       ],
       'export_dependent_settings': [
-        'mojo_service_provider_bindings',
+        'mojo_shell_bindings',
       ],
     },
   ],
   'conditions': [
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'mojo_public_java',
           'type': 'none',
           'variables': {
             'java_in_dir': 'public/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'mojo_bindings_java',
           'type': 'none',
           'variables': {
             'java_in_dir': 'bindings/java',
           },
           'dependencies': [
             'mojo_public_java',
           ],
           'includes': [ '../build/java.gypi' ],
         },
       ],
     }],
   ],
 }