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

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

 // 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.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_TESTS_STRUCT_WITH_TRAITS_IMPL_TRAITS_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_TESTS_STRUCT_WITH_TRAITS_IMPL_TRAITS_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string_piece.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "mojo/public/cpp/bindings/tests/struct_with_traits_impl.h"
 #include "mojo/public/interfaces/bindings/tests/struct_with_traits.mojom.h"
 
 namespace mojo {
 
 template <>
-struct StructTraits<test::NestedStructWithTraits,
+struct StructTraits<test::NestedStructWithTraitsDataView,
                     test::NestedStructWithTraitsImpl> {
   static void* SetUpContext(const test::NestedStructWithTraitsImpl& input);
   static void TearDownContext(const test::NestedStructWithTraitsImpl& input,
                               void* context);
 
   static int32_t value(const test::NestedStructWithTraitsImpl& input,
                        void* context);
 
-  static bool Read(test::NestedStructWithTraits::DataView data,
+  static bool Read(test::NestedStructWithTraitsDataView data,
                    test::NestedStructWithTraitsImpl* output);
 };
 
 template <>
 struct EnumTraits<test::EnumWithTraits, test::EnumWithTraitsImpl> {
   static test::EnumWithTraits ToMojom(test::EnumWithTraitsImpl input);
   static bool FromMojom(test::EnumWithTraits input,
                         test::EnumWithTraitsImpl* output);
 };
 
 template <>
-struct StructTraits<test::StructWithTraits, test::StructWithTraitsImpl> {
+struct StructTraits<test::StructWithTraitsDataView,
+                    test::StructWithTraitsImpl> {
   // Deserialization to test::StructTraitsImpl.
-  static bool Read(test::StructWithTraits::DataView data,
+  static bool Read(test::StructWithTraitsDataView data,
                    test::StructWithTraitsImpl* out);
 
   // Fields in test::StructWithTraits.
   // See src/mojo/public/interfaces/bindings/tests/struct_with_traits.mojom.
   static test::EnumWithTraitsImpl f_enum(
       const test::StructWithTraitsImpl& value) {
     return value.get_enum();
   }
 
   static bool f_bool(const test::StructWithTraitsImpl& value) {
@@ skipping 36 matching lines @@
     return value.get_struct_array();
   }
 
   static const std::map<std::string, test::NestedStructWithTraitsImpl>&
   f_struct_map(const test::StructWithTraitsImpl& value) {
     return value.get_struct_map();
   }
 };
 
 template <>
-struct StructTraits<test::TrivialStructWithTraits,
+struct StructTraits<test::TrivialStructWithTraitsDataView,
                     test::TrivialStructWithTraitsImpl> {
   // Deserialization to test::TrivialStructTraitsImpl.
-  static bool Read(test::TrivialStructWithTraits::DataView data,
+  static bool Read(test::TrivialStructWithTraitsDataView data,
                    test::TrivialStructWithTraitsImpl* out) {
     out->value = data.value();
     return true;
   }
 
   // Fields in test::TrivialStructWithTraits.
   // See src/mojo/public/interfaces/bindings/tests/struct_with_traits.mojom.
   static int32_t value(test::TrivialStructWithTraitsImpl& input) {
     return input.value;
   }
 };
 
 template <>
-struct StructTraits<test::MoveOnlyStructWithTraits,
+struct StructTraits<test::MoveOnlyStructWithTraitsDataView,
                     test::MoveOnlyStructWithTraitsImpl> {
   // Deserialization to test::MoveOnlyStructTraitsImpl.
-  static bool Read(test::MoveOnlyStructWithTraits::DataView data,
+  static bool Read(test::MoveOnlyStructWithTraitsDataView data,
                    test::MoveOnlyStructWithTraitsImpl* out);
 
   // Fields in test::MoveOnlyStructWithTraits.
   // See src/mojo/public/interfaces/bindings/tests/struct_with_traits.mojom.
   static ScopedHandle f_handle(test::MoveOnlyStructWithTraitsImpl& value) {
     return std::move(value.get_mutable_handle());
   }
 };
 
 template <>
-struct StructTraits<test::StructWithTraitsForUniquePtr, std::unique_ptr<int>> {
+struct StructTraits<test::StructWithTraitsForUniquePtrDataView,
+                    std::unique_ptr<int>> {
   static bool IsNull(const std::unique_ptr<int>& data) { return !data; }
   static void SetToNull(std::unique_ptr<int>* data) { data->reset(); }
 
   static int f_int32(const std::unique_ptr<int>& data) { return *data; }
 
-  static bool Read(test::StructWithTraitsForUniquePtr::DataView data,
+  static bool Read(test::StructWithTraitsForUniquePtrDataView data,
                    std::unique_ptr<int>* out) {
     out->reset(new int(data.f_int32()));
     return true;
   }
 };
 
 template <>
-struct UnionTraits<test::UnionWithTraits,
+struct UnionTraits<test::UnionWithTraitsDataView,
                    std::unique_ptr<test::UnionWithTraitsBase>> {
   static bool IsNull(const std::unique_ptr<test::UnionWithTraitsBase>& data) {
     return !data;
   }
   static void SetToNull(std::unique_ptr<test::UnionWithTraitsBase>* data) {
     data->reset();
   }
 
-  static test::UnionWithTraits::DataView::Tag GetTag(
+  static test::UnionWithTraitsDataView::Tag GetTag(
       const std::unique_ptr<test::UnionWithTraitsBase>& data) {
     if (data->type() == test::UnionWithTraitsBase::Type::INT32)
-      return test::UnionWithTraits::DataView::Tag::F_INT32;
+      return test::UnionWithTraitsDataView::Tag::F_INT32;
 
-    return test::UnionWithTraits::DataView::Tag::F_STRUCT;
+    return test::UnionWithTraitsDataView::Tag::F_STRUCT;
   }
 
   static int32_t f_int32(
       const std::unique_ptr<test::UnionWithTraitsBase>& data) {
     return static_cast<test::UnionWithTraitsInt32*>(data.get())->value();
   }
 
   static const test::NestedStructWithTraitsImpl& f_struct(
       const std::unique_ptr<test::UnionWithTraitsBase>& data) {
     return static_cast<test::UnionWithTraitsStruct*>(data.get())->get_struct();
   }
 
-  static bool Read(test::UnionWithTraits::DataView data,
+  static bool Read(test::UnionWithTraitsDataView data,
                    std::unique_ptr<test::UnionWithTraitsBase>* out) {
     switch (data.tag()) {
-      case test::UnionWithTraits::DataView::Tag::F_INT32: {
+      case test::UnionWithTraitsDataView::Tag::F_INT32: {
         out->reset(new test::UnionWithTraitsInt32(data.f_int32()));
         return true;
       }
-      case test::UnionWithTraits::DataView::Tag::F_STRUCT: {
+      case test::UnionWithTraitsDataView::Tag::F_STRUCT: {
         auto* struct_object = new test::UnionWithTraitsStruct();
         out->reset(struct_object);
         return data.ReadFStruct(&struct_object->get_mutable_struct());
       }
     }
 
     NOTREACHED();
     return false;
   }
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_TESTS_STRUCT_WITH_TRAITS_IMPL_TRAITS_H_