Various mojom cleanup from ContentHandler changes.

mojo/mojo_services.gypi

 # Copyright (c) 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.
 
 {
   'targets': [
     {
       'target_name': 'mojo_html_viewer',
       'type': 'loadable_module',
       'dependencies': [
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/native_theme/native_theme.gyp:native_theme',
         '../url/url.gyp:url_lib',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_utility',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_content_handler_bindings',
         'mojo_navigation_bindings',
         'mojo_network_bindings',
-        'mojo_launcher_bindings',
         'mojo_view_manager_lib',
         '<(mojo_system_for_loadable_module)',
       ],
       'include_dirs': [
         'third_party/WebKit'
       ],
       'sources': [
         'services/html_viewer/blink_basic_type_converters.cc',
         'services/html_viewer/blink_basic_type_converters.h',
         'services/html_viewer/blink_input_events_type_converters.cc',
@@ skipping 421 matching lines @@
     },
     {
       # GN version: //mojo/services/public/cpp/view_manager:common
       'target_name': 'mojo_view_manager_common',
       'type': 'static_library',
       'sources': [
         'services/public/cpp/view_manager/types.h',
       ],
     },
     {
-      # GN version: //mojo/services/public/interfaces/launcher
-      'target_name': 'mojo_launcher_bindings',
-      'type': 'static_library',
-      'sources': [
-        'services/public/interfaces/launcher/launcher.mojom',
-      ],
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'export_dependent_settings': [
-        'mojo_base.gyp:mojo_cpp_bindings',
-      ],
-      'dependencies': [
-        'mojo_base.gyp:mojo_cpp_bindings',
-        'mojo_navigation_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_launcher',
-      'type': 'loadable_module',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../url/url.gyp:url_lib',
-        'mojo_base.gyp:mojo_cpp_bindings',
-        'mojo_base.gyp:mojo_application_chromium',
-        'mojo_launcher_bindings',
-        'mojo_network_bindings',
-        '<(mojo_system_for_loadable_module)',
-      ],
-      'sources': [
-        'services/launcher/launcher.cc',
-      ],
-    },
-    {
       # GN version: //mojo/services/public/interfaces/view_manager
       'target_name': 'mojo_view_manager_bindings',
       'type': 'static_library',
       'sources': [
         'services/public/interfaces/view_manager/view_manager.mojom',
         'services/public/interfaces/view_manager/view_manager_constants.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_base.gyp:mojo_application_bindings',
@@ skipping 394 matching lines @@
               'dependencies': [
                 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }