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 37bc00b00ee5039672a14e80eafdc2600aafbbd7..4bb44c95c3bf775e4bb79ba2427b50e797c585ea 100644
--- a/third_party/WebKit/public/BUILD.gn
+++ b/third_party/WebKit/public/BUILD.gn
@@ -174,20 +174,6 @@ grit("image_resources") {
   ]
 }
 
-# GYP version: WebKit/public/blink.gyp:mojo_bindings_blink_mojom

[ortuno, 2016/04/13 15:35:44]

Do we still the target for the variant in blink.gyp?

[Sam McNally, 2016/04/14 03:27:42]

This CL doesn't affect how the gyp mojom targets work with variants. I've
updated the GYP <-> GN comments to reflect the GN changes.

-mojom("mojo_bindings_blink") {
-  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",
-  ]
-  for_blink = true
-  variant = "wtf"
-}
-
 # GYP version: WebKit/public/blink.gyp:mojo_bindings_mojom
 mojom("mojo_bindings") {
   sources = [
@@ -197,13 +183,14 @@ mojom("mojo_bindings") {
     "platform/modules/permissions/permission.mojom",
     "platform/modules/permissions/permission_status.mojom",
   ]
+  public_deps = [
+    ":android_mojo_bindings",
+  ]
 }
 
-if (is_android) {
-  # GYP version: WebKit/public/blink.gyp:android_mojo_bindings_java
-  mojom("android_mojo_bindings") {
-    sources = [
-      "platform/modules/payments/payment_request.mojom",
-    ]
-  }
+# GYP version: WebKit/public/blink.gyp:android_mojo_bindings_java
+mojom("android_mojo_bindings") {
+  sources = [
+    "platform/modules/payments/payment_request.mojom",
+  ]
 }