Revert "Move geometry to mojo/services, extract input events to their own mojom"

mojo/mojo_services.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_echo_bindings',
       'type': 'static_library',
       'sources': [
         'services/dbus_echo/echo.mojom',
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
       },
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_cpp_bindings',
       ],
     },
     {
-      'target_name': 'mojo_input_events_bindings',
-      'type': 'static_library',
-      'sources': [
-        'services/public/interfaces/input_events/input_events.mojom',
-      ],
-      'variables': {
-        'mojom_base_output_dir': 'mojo',
-      },
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-      'dependencies': [
-        'mojo_cpp_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_geometry_bindings',
-      'type': 'static_library',
-      'sources': [
-        'services/public/interfaces/geometry/geometry.mojom',
-      ],
-      'variables': {
-        'mojom_base_output_dir': 'mojo',
-      },
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'dependencies': [
-        'mojo_cpp_bindings',
-      ],
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_geometry_lib',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_GEOMETRY_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_environment_chromium',
-        'mojo_geometry_bindings',
-        'mojo_system_impl',
-      ],
-      'sources': [
-        'services/public/cpp/geometry/lib/geometry_type_converters.cc',
-        'services/public/cpp/geometry/geometry_type_converters.h',
-      ],
-    },
-    {
       'target_name': 'mojo_gles2_bindings',
       'type': 'static_library',
       'sources': [
         'services/gles2/command_buffer.mojom',
         'services/gles2/command_buffer_type_conversions.cc',
         'services/gles2/command_buffer_type_conversions.h',
         'services/gles2/mojo_buffer_backing.cc',
         'services/gles2/mojo_buffer_backing.h',
       ],
       'variables': {
@@ skipping 35 matching lines @@
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
       },
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_geometry_bindings',
-        'mojo_input_events_bindings',
         'mojo_cpp_bindings',
       ],
     },
     {
       'target_name': 'mojo_native_viewport_service',
       # This is linked directly into the embedder, so we make it a component.
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/events/events.gyp:events',
@@ skipping 240 matching lines @@
             'mojo_system_impl',
           ],
           'sources': [
             'services/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
     }],
   ],
 }