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

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

 // Copyright 2016 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.
 
 #include "mojo/public/cpp/bindings/tests/struct_with_traits_impl_traits.h"
 
 namespace mojo {
 namespace {
 
 struct Context {
   int32_t value;
 };
 
 }  // namespace
 
 // static
-void* StructTraits<test::NestedStructWithTraits,
+void* StructTraits<test::NestedStructWithTraitsDataView,
                    test::NestedStructWithTraitsImpl>::
     SetUpContext(const test::NestedStructWithTraitsImpl& input) {
   Context* context = new Context;
   context->value = input.value;
   return context;
 }
 
 // static
-void StructTraits<test::NestedStructWithTraits,
+void StructTraits<test::NestedStructWithTraitsDataView,
                   test::NestedStructWithTraitsImpl>::
     TearDownContext(const test::NestedStructWithTraitsImpl& input,
                     void* context) {
   Context* context_obj = static_cast<Context*>(context);
   CHECK_EQ(context_obj->value, input.value);
   delete context_obj;
 }
 
 // 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);
   CHECK_EQ(context_obj->value, input.value);
   return input.value;
 }
 
 // static
-bool StructTraits<test::NestedStructWithTraits,
+bool StructTraits<test::NestedStructWithTraitsDataView,
                   test::NestedStructWithTraitsImpl>::
     Read(test::NestedStructWithTraits::DataView data,
          test::NestedStructWithTraitsImpl* output) {
   output->value = data.value();
   return true;
 }
 
 test::EnumWithTraits
 EnumTraits<test::EnumWithTraits, test::EnumWithTraitsImpl>::ToMojom(
     test::EnumWithTraitsImpl input) {
@@ skipping 17 matching lines @@
       return true;
     case test::EnumWithTraits::VALUE_1:
       *output = test::EnumWithTraitsImpl::CUSTOM_VALUE_1;
       return true;
   };
 
   return false;
 }
 
 // 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;
   out->set_enum(f_enum);
 
   out->set_bool(data.f_bool());
   out->set_uint32(data.f_uint32());
   out->set_uint64(data.f_uint64());
 
   base::StringPiece f_string;
@@ skipping 23 matching lines @@
   if (!data.ReadFStructArray(&out->get_mutable_struct_array()))
     return false;
 
   if (!data.ReadFStructMap(&out->get_mutable_struct_map()))
     return false;
 
   return true;
 }
 
 // static
-bool StructTraits<test::MoveOnlyStructWithTraits,
+bool StructTraits<test::MoveOnlyStructWithTraitsDataView,
                   test::MoveOnlyStructWithTraitsImpl>::
     Read(test::MoveOnlyStructWithTraits::DataView data,
          test::MoveOnlyStructWithTraitsImpl* out) {
   out->get_mutable_handle() = data.TakeFHandle();
   return true;
 }
 
 }  // namespace mojo