ApplicationImpl->ShellConnection, mojom::Application->mojom::ShellClient

mojo/mojo_base.gyp

 # Copyright 2014 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.
 
 # Essential components (and their tests) that are needed to build
 # Chrome should be here.  Other components that are useful only in
 # Mojo land like mojo_shell should be in mojo.gyp.
 {
   'includes': [
     '../third_party/mojo/mojo_variables.gypi',
@@ skipping 186 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
     },
     {
       'target_name': 'mojo_application_bindings_mojom',
       'type': 'none',
       'variables': {
         'mojom_files': [
-          'shell/public/interfaces/application.mojom',
           'shell/public/interfaces/application_manager.mojom',
           'shell/public/interfaces/content_handler.mojom',
           'shell/public/interfaces/service_provider.mojom',
           'shell/public/interfaces/shell.mojom',
+          'shell/public/interfaces/shell_client.mojom',
         ],
       },
       'dependencies': [
         'mojo_services.gyp:network_service_bindings_generation',
       ],
       'export_dependent_settings': [
         'mojo_services.gyp:network_service_bindings_generation',
       ],
       'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
     },
     {
       # GN version: //mojo/shell/public/cpp
       'target_name': 'mojo_application_base',
       'type': 'static_library',
       'sources': [
         'shell/public/cpp/app_lifetime_helper.h',
-        'shell/public/cpp/application_impl.h',
         'shell/public/cpp/application_runner.h',
         'shell/public/cpp/connect.h',
         'shell/public/cpp/connection.h',
         'shell/public/cpp/initialize_base_and_icu.cc',
         'shell/public/cpp/initialize_base_and_icu.h',
         'shell/public/cpp/interface_factory.h',
         'shell/public/cpp/interface_factory_impl.h',
         'shell/public/cpp/lib/app_lifetime_helper.cc',
-        'shell/public/cpp/lib/application_impl.cc',
         'shell/public/cpp/lib/application_runner.cc',
         'shell/public/cpp/lib/connection_impl.cc',
         'shell/public/cpp/lib/connection_impl.h',
         'shell/public/cpp/lib/interface_factory_connector.h',
         'shell/public/cpp/lib/shell_client.cc',
+        'shell/public/cpp/lib/shell_connection.cc',
         'shell/public/cpp/service_connector.h',
         'shell/public/cpp/shell.h',
         'shell/public/cpp/shell_client.h',
+        'shell/public/cpp/shell_connection.h',
       ],
       'dependencies': [
         '../base/base.gyp:base_i18n',
         'mojo_application_bindings',
         'mojo_message_pump_lib',
         'mojo_services.gyp:network_type_converters',
       ],
     },
     {
       # GN version: //mojo/public/interfaces/application:application
@@ skipping 109 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'mojo_common_unittests.isolate',
           ],
         },
       ],
     }],
   ]
 }