Mojo C++ bindings: change the first template parameter of StructTraits and UnionTraits.

mojo/public/cpp/bindings/tests/struct_with_traits_impl_traits.cc

Index: mojo/public/cpp/bindings/tests/struct_with_traits_impl_traits.cc
diff --git a/mojo/public/cpp/bindings/tests/struct_with_traits_impl_traits.cc b/mojo/public/cpp/bindings/tests/struct_with_traits_impl_traits.cc
index ad9d119e07a4fcae56c0ca79b62b95e4b017c1c7..6b770b1a49bd30fddd57ee009c6fb8bcea0c5dc0 100644
--- a/mojo/public/cpp/bindings/tests/struct_with_traits_impl_traits.cc
+++ b/mojo/public/cpp/bindings/tests/struct_with_traits_impl_traits.cc
@@ -14,7 +14,7 @@ struct Context {
 }  // namespace
 
 // static
-void* StructTraits<test::NestedStructWithTraits,
+void* StructTraits<test::NestedStructWithTraitsDataView,
                    test::NestedStructWithTraitsImpl>::
     SetUpContext(const test::NestedStructWithTraitsImpl& input) {
   Context* context = new Context;
@@ -23,7 +23,7 @@ void* StructTraits<test::NestedStructWithTraits,
 }
 
 // static
-void StructTraits<test::NestedStructWithTraits,
+void StructTraits<test::NestedStructWithTraitsDataView,
                   test::NestedStructWithTraitsImpl>::
     TearDownContext(const test::NestedStructWithTraitsImpl& input,
                     void* context) {
@@ -33,7 +33,7 @@ void StructTraits<test::NestedStructWithTraits,
 }
 
 // static
-int32_t StructTraits<test::NestedStructWithTraits,
+int32_t StructTraits<test::NestedStructWithTraitsDataView,
                      test::NestedStructWithTraitsImpl>::
     value(const test::NestedStructWithTraitsImpl& input, void* context) {
   Context* context_obj = static_cast<Context*>(context);
@@ -42,7 +42,7 @@ int32_t StructTraits<test::NestedStructWithTraits,
 }
 
 // static
-bool StructTraits<test::NestedStructWithTraits,
+bool StructTraits<test::NestedStructWithTraitsDataView,
                   test::NestedStructWithTraitsImpl>::
     Read(test::NestedStructWithTraits::DataView data,
          test::NestedStructWithTraitsImpl* output) {
@@ -80,9 +80,9 @@ bool EnumTraits<test::EnumWithTraits, test::EnumWithTraitsImpl>::FromMojom(
 }
 
 // static
-bool StructTraits<test::StructWithTraits, test::StructWithTraitsImpl>::Read(
-    test::StructWithTraits::DataView data,
-    test::StructWithTraitsImpl* out) {
+bool StructTraits<test::StructWithTraitsDataView, test::StructWithTraitsImpl>::
+    Read(test::StructWithTraits::DataView data,
+         test::StructWithTraitsImpl* out) {
   test::EnumWithTraitsImpl f_enum;
   if (!data.ReadFEnum(&f_enum))
     return false;
@@ -126,7 +126,7 @@ bool StructTraits<test::StructWithTraits, test::StructWithTraitsImpl>::Read(
 }
 
 // static
-bool StructTraits<test::MoveOnlyStructWithTraits,
+bool StructTraits<test::MoveOnlyStructWithTraitsDataView,
                   test::MoveOnlyStructWithTraitsImpl>::
     Read(test::MoveOnlyStructWithTraits::DataView data,
          test::MoveOnlyStructWithTraitsImpl* out) {