Mojo: Simplify typemap usage.

third_party/WebKit/public/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//third_party/WebKit/Source/config.gni")
 import("//tools/grit/grit_rule.gni")
 
 blink_headers_values = exec_script("//build/gypi_to_gn.py",
                                    [ rebase_path("blink_headers.gypi") ],
@@ skipping 156 matching lines @@
   output_dir = "$root_gen_dir/blink/public/resources"
   use_qualified_include = true
   source = "blink_image_resources.grd"
   outputs = [
     "grit/blink_image_resources.h",
     "blink_image_resources_100_percent.pak",
     "blink_image_resources_200_percent.pak",
   ]
 }
 
-# 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 = [
     "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",
   ]
+  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",
+  ]
 }