Various mojom cleanup from ContentHandler changes.

mojo/mojo_services.gypi

Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 1f5e9329707e8c551c2a569715e2d3304c22f164..123254ff3f4c3f9ed7b5ef1001250140729cc596 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -20,7 +20,6 @@
         'mojo_content_handler_bindings',
         'mojo_navigation_bindings',
         'mojo_network_bindings',
-        'mojo_launcher_bindings',
         'mojo_view_manager_lib',
         '<(mojo_system_for_loadable_module)',
       ],
@@ -460,38 +459,6 @@
       ],
     },
     {
-      # 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',