Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/mojo.gyp

 # 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.
 
 {
   'target_defaults': {
     'conditions': [
       ['mojo_shell_debug_url != ""', {
         'defines': [
           'MOJO_SHELL_DEBUG=1',
@@ skipping 404 matching lines @@
       'defines': [
         'MOJO_SERVICE_MANAGER_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_common_lib',
         'mojo_environment_chromium',
-        'mojo_service_provider_bindings',
+        'mojo_shell_bindings',
         'mojo_system_impl',
       ],
       'sources': [
         'service_manager/background_service_loader.cc',
         'service_manager/background_service_loader.h',
         'service_manager/service_loader.h',
         'service_manager/service_manager.cc',
         'service_manager/service_manager.h',
         'service_manager/service_manager_export.h',
       ],
       'export_dependent_settings': [
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        'mojo_service_provider_bindings',
+        'mojo_shell_bindings',
       ],
     },
     {
       'target_name': 'mojo_spy',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
         '../net/net.gyp:http_server',
         '../url/url.gyp:url_lib',
@@ skipping 28 matching lines @@
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_external_service_bindings',
         'mojo_gles2_impl',
         'mojo_service_manager',
-        'mojo_service_provider_bindings',
+        'mojo_shell_bindings',
         'mojo_system_impl',
         'mojo_native_viewport_service',
         'mojo_spy',
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
       },
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'sources': [
         'shell/app_child_process.cc',
@@ skipping 44 matching lines @@
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../dbus/dbus.gyp:dbus',
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             # These are only necessary as long as we hard code use of ViewManager.
             '../skia/skia.gyp:skia',
             'mojo_gles2',
-            'mojo_application',
+            'mojo_shell_client',
             'mojo_view_manager',
             'mojo_view_manager_bindings',
           ],
         }, {  # use_aura==0
           'sources!': [
             'shell/view_manager_loader.cc',
             'shell/view_manager_loader.h',
           ],
         }],
       ],
@@ skipping 36 matching lines @@
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         '../url/url.gyp:url_lib',
         'mojo_common_lib',
         'mojo_cpp_bindings',
         'mojo_environment_chromium',
         'mojo_run_all_unittests',
         'mojo_service_manager',
-        'mojo_application',
+        'mojo_shell_client',
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
       },
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'sources': [
         'service_manager/service_manager_unittest.cc',
         'service_manager/test.mojom',
       ],
     },
@@ skipping 103 matching lines @@
         },
         {
           'target_name': 'libmojo_system_java',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             'mojo_common_lib',
             'mojo_environment_chromium',
             'mojo_jni_headers',
-            'mojo_service_provider_bindings',
+            'mojo_shell_bindings',
             'mojo_shell_lib',
           ],
           'sources': [
             'android/system/core_impl.cc',
             'android/system/core_impl.h',
           ],
         },
         {
           'target_name': 'libmojo_java_unittest',
           'type': 'shared_library',
@@ skipping 59 matching lines @@
           'type': 'shared_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             'mojo_common_lib',
             'mojo_environment_chromium',
             'mojo_jni_headers',
-            'mojo_service_provider_bindings',
+            'mojo_shell_bindings',
             'mojo_shell_lib',
           ],
           'sources': [
             'shell/android/library_loader.cc',
             'shell/android/mojo_main.cc',
             'shell/android/mojo_main.h',
           ],
         },
         {
           'target_name': 'mojo_shell_apk',
@@ skipping 18 matching lines @@
       'targets': [
         {
           'target_name': 'mojo_dbus_service',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../build/linux/system.gyp:dbus',
             '../dbus/dbus.gyp:dbus',
             'mojo_common_lib',
             'mojo_external_service_bindings',
-            'mojo_application',
+            'mojo_shell_client',
             'mojo_system_impl',
           ],
           'sources': [
             'dbus/dbus_external_service.h',
             'dbus/dbus_external_service.cc',
           ],
         },
       ],
     }],
     ['test_isolation_mode != "noop"', {
@@ skipping 37 matching lines @@
             'aura/screen_mojo.cc',
             'aura/screen_mojo.h',
             'aura/window_tree_host_mojo.cc',
             'aura/window_tree_host_mojo.h',
           ],
         },
       ],
     }],
   ],
 }