Various mojom cleanup from ContentHandler changes.

mojo/mojo_examples.gypi

 # Copyright 2013 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': [
     {
       # GN version: //mojo/examples/echo:client
       'target_name': 'mojo_echo_client',
       'type': 'loadable_module',
@@ skipping 228 matching lines @@
       'type': 'loadable_module',
       'dependencies': [
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_utility',
         'mojo_content_handler_bindings',
         'mojo_media_viewer_bindings',
         'mojo_network_bindings',
-        'mojo_launcher_bindings',
         'mojo_view_manager_lib',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'examples/png_viewer/png_viewer.cc',
       ],
     },
     {
       'target_name': 'mojo_pepper_container_app',
       'type': 'loadable_module',
@@ skipping 390 matching lines @@
             '../ui/views/views.gyp:views',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
             'mojo_aura_support',
             'mojo_core_window_manager_lib',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_input_events_lib',
             'mojo_keyboard_bindings',
-            'mojo_launcher_bindings',
             'mojo_navigation_bindings',
             'mojo_view_manager_lib',
             'mojo_views_support',
             'mojo_window_manager_bindings',
             '<(mojo_system_for_loadable_module)',
           ],
           'includes': [
             'mojo_public_gles2_for_loadable_module.gypi',
           ],
           'sources': [
@@ skipping 192 matching lines @@
           ],
           'sources': [
             'examples/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
 
     }],
   ],
 }