ShellClient -> Service

services/shell/shell_public.gyp

 # Copyright 2016 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': 'shell_interfaces',
     'type': 'none',
     'variables': {
       'mojom_files': [
         '../catalog/public/interfaces/catalog.mojom',
         'public/interfaces/capabilities.mojom',
         'public/interfaces/connector.mojom',
         'public/interfaces/interface_provider.mojom',
+        'public/interfaces/service.mojom',
+        'public/interfaces/service_factory.mojom',
         'public/interfaces/shell.mojom',
-        'public/interfaces/shell_client.mojom',
-        'public/interfaces/shell_client_factory.mojom',
         'public/interfaces/shell_resolver.mojom',
       ],
       'mojom_typemaps': [
         '<(DEPTH)/mojo/common/common_custom_types.typemap',
       ],
     },
     'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ],
     'dependencies': [
       '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_custom_types_mojom',
     ],
@@ skipping 22 matching lines @@
       'public/cpp/lib/callback_binder.h',
       'public/cpp/lib/connection_impl.cc',
       'public/cpp/lib/connection_impl.h',
       'public/cpp/lib/connector_impl.cc',
       'public/cpp/lib/connector_impl.h',
       'public/cpp/lib/identity.cc',
       'public/cpp/lib/interface_factory_binder.h',
       'public/cpp/lib/interface_registry.cc',
       'public/cpp/lib/names.cc',
       'public/cpp/lib/interface_provider.cc',
-      'public/cpp/lib/shell_client.cc',
+      'public/cpp/lib/service.cc',
       'public/cpp/lib/shell_connection.cc',
       'public/cpp/lib/shell_connection_ref.cc',
       'public/cpp/names.h',
       'public/cpp/interface_provider.h',
-      'public/cpp/shell_client.h',
+      'public/cpp/service.h',
       'public/cpp/shell_connection.h',
       'public/cpp/shell_connection_ref.h',
     ],
     'dependencies': [
       'shell_interfaces',
       '<(DEPTH)/base/base.gyp:base_i18n',
       '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
     ],
   },
   ],
 }