Mojo: Simplify typemap usage.

mojo/public/cpp/bindings/tests/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_application.gni")
 
 source_set("tests") {
   testonly = true
 
   sources = [
@@ skipping 10 matching lines @@
     "container_test_util.cc",
     "container_test_util.h",
     "equals_unittest.cc",
     "handle_passing_unittest.cc",
     "interface_ptr_unittest.cc",
     "map_unittest.cc",
     "message_queue.cc",
     "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",
     "router_unittest.cc",
     "sample_service_unittest.cc",
     "serialization_warning_unittest.cc",
     "stl_converters_unittest.cc",
     "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",
     "validation_unittest.cc",
     "variant_test_util.h",
   ]
 
   deps = [
     ":mojo_public_bindings_test_utils",
     "//mojo/message_pump",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/cpp/system",
     "//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",
   ]
 }
 
 source_set("for_blink_tests") {
   testonly = true
 
   sources = [
     "array_common_test.h",
     "container_test_util.cc",
     "container_test_util.h",
     "variant_test_util.h",
     "wtf_array_unittest.cc",
     "wtf_types_unittest.cc",
   ]
 
   deps = [
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/bindings:callback",
     "//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
 
   sources = [
     "bindings_perftest.cc",
     "e2e_perftest.cc",
   ]
 
   deps = [
     "//base/test:test_support",
@@ skipping 11 matching lines @@
 source_set("mojo_public_bindings_test_utils") {
   sources = [
     "validation_test_input_parser.cc",
     "validation_test_input_parser.h",
   ]
 
   deps = [
     "//mojo/public/c/system",
   ]
 }