Mojo C++ bindings: share DataView class between chromium and blink variants.

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

Index: mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
index 97392d44eb72513e476dcb98b8131e8b0118236f..16b36d31cc5f5afd0dace363fb55dbd154de60bb 100644
--- a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
@@ -107,63 +107,68 @@ void ExpectStringMap(
 }  // namespace
 
 TEST_F(WTFTypesTest, Serialization_WTFArrayToWTFArray) {
+  using MojomType = ArrayDataView<StringDataView>;
+
   WTFArray<WTF::String> strs = ConstructStringArray();
   auto cloned_strs = strs.Clone();
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<Array<mojo::String>>(
-      cloned_strs, &context);
+  size_t size =
+      mojo::internal::PrepareToSerialize<MojomType>(cloned_strs, &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  typename mojo::internal::MojomTypeTraits<Array<mojo::String>>::Data* data;
+  typename mojo::internal::MojomTypeTraits<MojomType>::Data* data;
   mojo::internal::ContainerValidateParams validate_params(
       0, true, new mojo::internal::ContainerValidateParams(0, false, nullptr));
-  mojo::internal::Serialize<Array<mojo::String>>(cloned_strs, &buf, &data,
-                                                 &validate_params, &context);
+  mojo::internal::Serialize<MojomType>(cloned_strs, &buf, &data,
+                                       &validate_params, &context);
 
   WTFArray<WTF::String> strs2;
-  mojo::internal::Deserialize<Array<mojo::String>>(data, &strs2, &context);
+  mojo::internal::Deserialize<MojomType>(data, &strs2, &context);
 
   EXPECT_TRUE(strs.Equals(strs2));
 }
 
 TEST_F(WTFTypesTest, Serialization_WTFVectorToWTFVector) {
+  using MojomType = ArrayDataView<StringDataView>;
+
   WTF::Vector<WTF::String> strs = ConstructStringArray();
   auto cloned_strs = strs;
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<Array<mojo::String>>(
-      cloned_strs, &context);
+  size_t size =
+      mojo::internal::PrepareToSerialize<MojomType>(cloned_strs, &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  typename mojo::internal::MojomTypeTraits<Array<mojo::String>>::Data* data;
+  typename mojo::internal::MojomTypeTraits<MojomType>::Data* data;
   mojo::internal::ContainerValidateParams validate_params(
       0, true, new mojo::internal::ContainerValidateParams(0, false, nullptr));
-  mojo::internal::Serialize<Array<mojo::String>>(cloned_strs, &buf, &data,
-                                                 &validate_params, &context);
+  mojo::internal::Serialize<MojomType>(cloned_strs, &buf, &data,
+                                       &validate_params, &context);
 
   WTF::Vector<WTF::String> strs2;
-  mojo::internal::Deserialize<Array<mojo::String>>(data, &strs2, &context);
+  mojo::internal::Deserialize<MojomType>(data, &strs2, &context);
 
   EXPECT_EQ(strs, strs2);
 }
 
 TEST_F(WTFTypesTest, Serialization_WTFArrayToMojoArray) {
+  using MojomType = ArrayDataView<StringDataView>;
+
   WTFArray<WTF::String> strs = ConstructStringArray();
 
   mojo::internal::SerializationContext context;
-  size_t size =
-      mojo::internal::PrepareToSerialize<Array<mojo::String>>(strs, &context);
+  size_t size = mojo::internal::PrepareToSerialize<MojomType>(strs, &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  typename mojo::internal::MojomTypeTraits<Array<mojo::String>>::Data* data;
+  typename mojo::internal::MojomTypeTraits<MojomType>::Data* data;
   mojo::internal::ContainerValidateParams validate_params(
       0, true, new mojo::internal::ContainerValidateParams(0, false, nullptr));
-  mojo::internal::Serialize<Array<mojo::String>>(strs, &buf, &data,
-                                                 &validate_params, &context);
+  mojo::internal::Serialize<MojomType>(strs, &buf, &data, &validate_params,
+                                       &context);
 
   Array<mojo::String> strs2;
-  mojo::internal::Deserialize<Array<mojo::String>>(data, &strs2, &context);
+  mojo::internal::Deserialize<MojomType>(data, &strs2, &context);
 
   ASSERT_EQ(4u, strs2.size());
   EXPECT_TRUE(strs2[0].is_null());
@@ -174,7 +179,7 @@ TEST_F(WTFTypesTest, Serialization_WTFArrayToMojoArray) {
 
 TEST_F(WTFTypesTest, Serialization_WTFMapToWTFMap) {
   using WTFType = WTFMap<WTF::String, WTF::String>;
-  using MojomType = Map<mojo::String, mojo::String>;
+  using MojomType = MapDataView<StringDataView, StringDataView>;
 
   WTFType str_map = ConstructStringMap();
   WTFType cloned_str_map = str_map.Clone();
@@ -203,7 +208,7 @@ TEST_F(WTFTypesTest, Serialization_WTFMapToWTFMap) {
 
 TEST_F(WTFTypesTest, Serialization_WTFMapToMojoMap) {
   using WTFType = WTFMap<WTF::String, WTF::String>;
-  using MojomType = Map<mojo::String, mojo::String>;
+  using MojomType = MapDataView<StringDataView, StringDataView>;
 
   WTFType str_map = ConstructStringMap();
 
@@ -223,7 +228,7 @@ TEST_F(WTFTypesTest, Serialization_WTFMapToMojoMap) {
   mojo::internal::Serialize<MojomType>(str_map, &buf, &data, &validate_params,
                                        &context);
 
-  MojomType str_map2;
+  Map<mojo::String, mojo::String> str_map2;
   mojo::internal::Deserialize<MojomType>(data, &str_map2, &context);
 
   ASSERT_EQ(3u, str_map2.size());