Remove duplicate application cpp files in mojo/application.

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 156 matching lines @@
         '..',
         '../third_party/mojo/src',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../third_party/mojo/src',
         ],
       },
     },
     {
-     # GN version: //mojo/application
-     'target_name': 'mojo_application_chromium',
-     'type': 'static_library',
-     'sources': [
-       'application/application_runner_chromium.cc',
-       'application/application_runner_chromium.h',
-      ],
-      'dependencies': [
-        'mojo_application_base',
-        'mojo_common_lib',
-        'mojo_environment_chromium',
-       ],
-      'export_dependent_settings': [
-        'mojo_application_base',
-       ],
-    },
-    {
       'target_name': 'mojo_application_bindings_mojom',
       'type': 'none',
       'variables': {
         'mojom_files': [
           'application/public/interfaces/application.mojom',
           'application/public/interfaces/service_provider.mojom',
           'application/public/interfaces/shell.mojom',
         ],
       },
       'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
     },
     {
       # GN version: //mojo/application/public/cpp
       'target_name': 'mojo_application_base',
       'type': 'static_library',
       'sources': [
+        'application/public/cpp/app_lifetime_helper.h',
         'application/public/cpp/application_connection.h',
         'application/public/cpp/application_delegate.h',
         'application/public/cpp/application_impl.h',
+        'application/public/cpp/application_runner.h',
         'application/public/cpp/connect.h',
         'application/public/cpp/interface_factory.h',
         'application/public/cpp/interface_factory_impl.h',
+        'application/public/cpp/lib/app_lifetime_helper.cc',
         'application/public/cpp/lib/application_connection.cc',
         'application/public/cpp/lib/application_delegate.cc',
         'application/public/cpp/lib/application_impl.cc',
+        'application/public/cpp/lib/application_runner.cc',
         'application/public/cpp/lib/interface_factory_connector.h',
         'application/public/cpp/lib/service_connector_registry.cc',
         'application/public/cpp/lib/service_connector_registry.h',
         'application/public/cpp/lib/service_provider_impl.cc',
         'application/public/cpp/lib/service_registry.cc',
         'application/public/cpp/lib/service_registry.h',
         'application/public/cpp/service_connector.h',
         'application/public/cpp/service_provider_impl.h',
       ],
       'dependencies': [
         'mojo_application_bindings',
       ],
       'export_dependent_settings': [
         'mojo_application_bindings',
       ],
     },
     {
-      # GN version: //mojo/application/public/cpp:standalone
-      'target_name': 'mojo_application_standalone',
-      'type': 'static_library',
-      'sources': [
-        'application/public/cpp/lib/application_runner.cc',
-        'application/public/cpp/application_runner.h',
-      ],
-      'dependencies': [
-        'mojo_application_base',
-        '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
-      ],
-      'export_dependent_settings': [
-        'mojo_application_base',
-      ],
-    },
-    {
       # GN version: //mojo/public/interfaces/application:application
       'target_name': 'mojo_application_bindings',
       'type': 'static_library',
       'dependencies': [
         'mojo_application_bindings_mojom',
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
       # GN version: //mojo/application/public/cpp/tests
       'target_name': 'mojo_public_application_unittests',
       'type': 'executable',
       'dependencies': [
-        'mojo_application_standalone',
+        'mojo_application_base',
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         '../third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
         '../third_party/mojo/mojo_public.gyp:mojo_utility',
         '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
       ],
       'sources': [
         'application/public/cpp/tests/service_registry_unittest.cc',
       ],
     },
@@ skipping 52 matching lines @@
           ],
           'variables': {
             'java_in_dir': '<(DEPTH)/mojo/android/system',
           },
           'includes': [ '../build/java.gypi' ],
         },
       ]
     }]
   ]
 }