Mojo: Simplify typemap usage.

third_party/WebKit/public/BUILD.gn

Index: third_party/WebKit/public/BUILD.gn
diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn
index b44ddd7458de35e4356ef26c38ae2e19a76137ca..80636771507d5068f0364b084c33c8ad8eadbe2e 100644
--- a/third_party/WebKit/public/BUILD.gn
+++ b/third_party/WebKit/public/BUILD.gn
@@ -177,45 +177,32 @@ grit("image_resources") {
   ]
 }
 
-# GYP version: WebKit/public/blink.gyp:mojo_bindings_blink_mojom
-mojom("mojo_bindings_blink") {
+# GYP versions: WebKit/public/blink.gyp:mojo_bindings_mojom,
+# WebKit/public/blink.gyp:mojo_bindings_blink_mojom
+mojom("mojo_bindings") {
   sources = [
     "platform/modules/bluetooth/web_bluetooth.mojom",
     "platform/modules/geolocation/geolocation.mojom",
     "platform/modules/notifications/notification.mojom",
-    "platform/modules/payments/payment_request.mojom",
     "platform/modules/permissions/permission.mojom",
     "platform/modules/permissions/permission_status.mojom",
     "platform/modules/wake_lock/wake_lock_service.mojom",
   ]
-  for_blink = true
-  variant = "wtf"
+  public_deps = [
+    ":android_mojo_bindings",
+  ]
 }
 
-# GYP version: WebKit/public/blink.gyp:mojo_bindings_mojom
-mojom("mojo_bindings") {
+# GYP version: WebKit/public/blink.gyp:android_mojo_bindings_java
+mojom("android_mojo_bindings") {
   sources = [
-    "platform/modules/bluetooth/web_bluetooth.mojom",
-    "platform/modules/geolocation/geolocation.mojom",
-    "platform/modules/notifications/notification.mojom",
-    "platform/modules/permissions/permission.mojom",
-    "platform/modules/permissions/permission_status.mojom",
-    "platform/modules/wake_lock/wake_lock_service.mojom",
+    "platform/modules/payments/payment_request.mojom",
   ]
 }
 
-if (is_android) {
-  # GYP version: WebKit/public/blink.gyp:android_mojo_bindings_java
-  mojom("android_mojo_bindings") {
-    sources = [
-      "platform/modules/payments/payment_request.mojom",
-    ]
-  }
-}
-
 group("generate_mojo_bindings") {
   deps = [
     ":mojo_bindings__generator",
-    ":mojo_bindings_blink__generator",
+    ":mojo_bindings_wtf__generator",
   ]
 }