[mojo] Get rid of Skia type converters

content/content_common_mojo_bindings.gyp

Index: content/content_common_mojo_bindings.gyp
diff --git a/content/content_common_mojo_bindings.gyp b/content/content_common_mojo_bindings.gyp
index f82059615ef7f989b900f690f45c249dad533eec..19eab7ac0e37531ead05f311ced57ab8955bc87f 100644
--- a/content/content_common_mojo_bindings.gyp
+++ b/content/content_common_mojo_bindings.gyp
@@ -5,47 +5,48 @@
 {
   'targets': [
     {
-      # GN version: //content/common:mojo_bindings
-      'target_name': 'content_common_mojo_bindings_mojom',
-      'type': 'none',
+      'target_name': 'content_common_mojo_bindings',
+      'type': 'static_library',
       'variables': {
-        'mojom_files': [
-          # NOTE: Sources duplicated in //content/common/BUILD.gn:mojo_bindings.
-          'common/application_setup.mojom',
-          'common/background_sync_service.mojom',
-          'common/geolocation_service.mojom',
-          'common/image_downloader/image_downloader.mojom',
-          'common/permission_service.mojom',
-          'common/presentation/presentation_service.mojom',
-          'common/process_control.mojom',
-          'common/render_frame_setup.mojom',
-          'common/service_port_service.mojom',
-          'common/service_worker/embedded_worker_setup.mojom',
-          'common/vr_service.mojom',
-          'common/wake_lock_service.mojom',
-
-          # NOTE: Sources duplicated in
-          # //content/public/common/BUILD.gn:mojo_bindings.
-          'public/common/background_sync.mojom',
-          'public/common/mojo_geoposition.mojom',
-          'public/common/permission_status.mojom',
-          'public/common/service_worker_event_status.mojom',
+        'enable_wexit_time_destructors': 1,
+        'mojom_typemaps': [
+          '<(DEPTH)/skia/public/interfaces/skia.typemap',
+        ],
+        'mojom_typemap_dependencies': [
+          '<(DEPTH)/skia/skia.gyp:skia',
+          '<(DEPTH)/ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc',
         ],
       },
-      'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
-    },
-    {
-      'target_name': 'content_common_mojo_bindings',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
+      'sources': [
+        # NOTE: Sources duplicated in //content/common/BUILD.gn:mojo_bindings.
+        'common/application_setup.mojom',
+        'common/background_sync_service.mojom',
+        'common/geolocation_service.mojom',
+        'common/image_downloader/image_downloader.mojom',
+        'common/permission_service.mojom',
+        'common/presentation/presentation_service.mojom',
+        'common/process_control.mojom',
+        'common/render_frame_setup.mojom',
+        'common/service_port_service.mojom',
+        'common/service_worker/embedded_worker_setup.mojom',
+        'common/vr_service.mojom',
+        'common/wake_lock_service.mojom',
+
+        # NOTE: Sources duplicated in
+        # //content/public/common/BUILD.gn:mojo_bindings.
+        'public/common/background_sync.mojom',
+        'public/common/mojo_geoposition.mojom',
+        'public/common/permission_status.mojom',
+        'public/common/service_worker_event_status.mojom',
+      ],
       'dependencies': [
-        'content_common_mojo_bindings_mojom',
         '../mojo/mojo_base.gyp:mojo_application_bindings',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../skia/skia.gyp:skia_mojo',
+        '../skia/skia_mojo_bindings.gyp:skia_mojo_bindings',
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../ui/mojo/geometry/mojo_bindings.gyp:mojo_geometry_bindings',
-      ]
+      ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
     },
   ]
 }