Mojo: Simplify typemap usage.

mojo/public/cpp/bindings/tests/BUILD.gn

Index: mojo/public/cpp/bindings/tests/BUILD.gn
diff --git a/mojo/public/cpp/bindings/tests/BUILD.gn b/mojo/public/cpp/bindings/tests/BUILD.gn
index 6aab2478f43e47adc8c800175c7ee0a39e6ecb03..2e073a45050d964a051c64746cb85e28f3a2b44b 100644
--- a/mojo/public/cpp/bindings/tests/BUILD.gn
+++ b/mojo/public/cpp/bindings/tests/BUILD.gn
@@ -28,14 +28,6 @@ source_set("tests") {
     "message_queue.h",
     "multiplex_router_unittest.cc",
     "pickle_unittest.cc",
-    "pickled_struct_blink.cc",
-    "pickled_struct_blink.h",
-    "pickled_struct_chromium.cc",
-    "pickled_struct_chromium.h",
-    "rect_blink.h",
-    "rect_blink_traits.h",
-    "rect_chromium.h",
-    "rect_chromium_traits.h",
     "request_response_unittest.cc",
     "router_test_util.cc",
     "router_test_util.h",
@@ -46,10 +38,6 @@ source_set("tests") {
     "string_unittest.cc",
     "struct_traits_unittest.cc",
     "struct_unittest.cc",
-    "struct_with_traits_impl.cc",
-    "struct_with_traits_impl.h",
-    "struct_with_traits_impl_traits.cc",
-    "struct_with_traits_impl_traits.h",
     "sync_method_unittest.cc",
     "type_conversion_unittest.cc",
     "union_unittest.cc",
@@ -66,11 +54,9 @@ source_set("tests") {
     "//mojo/public/cpp/test_support:test_utils",
     "//mojo/public/interfaces/bindings/tests:test_associated_interfaces",
     "//mojo/public/interfaces/bindings/tests:test_interfaces",
-    "//mojo/public/interfaces/bindings/tests:test_interfaces_blink",
-    "//mojo/public/interfaces/bindings/tests:test_interfaces_chromium",
     "//mojo/public/interfaces/bindings/tests:test_interfaces_experimental",
+    "//mojo/public/interfaces/bindings/tests:test_interfaces_wtf",
     "//mojo/public/interfaces/bindings/tests:test_struct_traits_interfaces",
-    "//mojo/public/interfaces/bindings/tests:test_variant",
     "//testing/gtest",
   ]
 }
@@ -93,11 +79,22 @@ source_set("for_blink_tests") {
     "//mojo/public/cpp/system",
     "//mojo/public/interfaces/bindings/tests:test_interfaces",
     "//mojo/public/interfaces/bindings/tests:test_wtf_types",
-    "//mojo/public/interfaces/bindings/tests:test_wtf_types_blink",
+    "//mojo/public/interfaces/bindings/tests:test_wtf_types_wtf",
     "//testing/gtest",
   ]
 }
 
+source_set("struct_with_traits_impl") {
+  sources = [
+    "struct_with_traits_impl.cc",
+    "struct_with_traits_impl.h",
+  ]
+
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("perftests") {
   testonly = true