Move mojo/services/public/cpp TypeConverters to mojo/converters.

mojo/mojo_services.gypi

Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index c3e0fe7ffcbf7023034cbb2cbf6f2a8c4283adce..2a4ab5af358230b721a5d89d71b7c0975cef380c 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -466,138 +466,6 @@
         'services/test_service/test_request_tracker_impl.h',
       ],
     },
-    {
-      # GN version: //mojo/services/public/cpp/input_events
-      'target_name': 'mojo_input_events_lib',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_INPUT_EVENTS_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../ui/events/events.gyp:events',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_geometry_lib',
-        'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
-        'services/public/mojo_services_public.gyp:mojo_input_events_bindings',
-        '<(mojo_system_for_component)',
-      ],
-      'sources': [
-        'services/public/cpp/input_events/lib/input_events_type_converters.cc',
-        'services/public/cpp/input_events/lib/mojo_extended_key_event_data.cc',
-        'services/public/cpp/input_events/lib/mojo_extended_key_event_data.h',
-        'services/public/cpp/input_events/input_events_type_converters.h',
-        'services/public/cpp/input_events/mojo_input_events_export.h',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            'mojo_base.gyp:mojo_environment_chromium',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/services/public/cpp/geometry
-      'target_name': 'mojo_geometry_lib',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_GEOMETRY_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../skia/skia.gyp:skia',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
-        '<(mojo_system_for_component)',
-      ],
-      'export_dependent_settings': [
-        '../ui/gfx/gfx.gyp:gfx',
-      ],
-      'sources': [
-        'services/public/cpp/geometry/lib/geometry_type_converters.cc',
-        'services/public/cpp/geometry/geometry_type_converters.h',
-        'services/public/cpp/geometry/mojo_geometry_export.h',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            'mojo_base.gyp:mojo_environment_chromium',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/services/public/cpp/surfaces
-      'target_name': 'mojo_surfaces_lib',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_SURFACES_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../cc/cc.gyp:cc',
-        '../cc/cc.gyp:cc_surfaces',
-        '../skia/skia.gyp:skia',
-        '../gpu/gpu.gyp:gpu',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_geometry_lib',
-        'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
-        'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
-        '<(mojo_system_for_component)',
-      ],
-      'export_dependent_settings': [
-        'mojo_geometry_lib',
-        'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
-      ],
-      'sources': [
-        'services/public/cpp/surfaces/lib/surfaces_type_converters.cc',
-        'services/public/cpp/surfaces/lib/surfaces_utils.cc',
-        'services/public/cpp/surfaces/surfaces_type_converters.h',
-        'services/public/cpp/surfaces/surfaces_utils.h',
-        'services/public/cpp/surfaces/mojo_surfaces_export.h',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            'mojo_base.gyp:mojo_environment_chromium',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/services/public/cpp/surfaces/tests
-      'target_name': 'mojo_surfaces_lib_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../cc/cc.gyp:cc',
-        '../cc/cc.gyp:cc_surfaces',
-        '../gpu/gpu.gyp:gpu',
-        '../skia/skia.gyp:skia',
-        '../testing/gtest.gyp:gtest',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/gfx/gfx.gyp:gfx_test_support',
-        'edk/mojo_edk.gyp:mojo_run_all_unittests',
-        'mojo_base.gyp:mojo_environment_chromium',
-        'mojo_geometry_lib',
-        'mojo_surfaces_lib',
-        'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
-      ],
-      'sources': [
-        'services/public/cpp/surfaces/tests/surface_unittest.cc',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            'mojo_base.gyp:mojo_environment_chromium',
-          ],
-        }],
-      ],
-    },
   ],
   'conditions': [
     ['use_aura==1', {