Mojo C++ bindings: rename ArrayValidateParams for clarity

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

 // 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.
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 422 matching lines @@
   array[0]->set_f_int8(10);
   array[1]->set_f_int16(12);
   EXPECT_EQ(2U, array.size());
 
   size_t size =
       mojo::internal::PrepareToSerialize<Array<PodUnionPtr>>(array, nullptr);
   EXPECT_EQ(40U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   mojo::internal::Array_Data<internal::PodUnion_Data>* data;
-  mojo::internal::ArrayValidateParams validate_params(0, false, nullptr);
+  mojo::internal::ContainerValidateParams validate_params(0, false, nullptr);
   mojo::internal::Serialize<Array<PodUnionPtr>>(array, &buf, &data,
                                                 &validate_params, nullptr);
 
   Array<PodUnionPtr> array2;
   mojo::internal::Deserialize<Array<PodUnionPtr>>(data, &array2, nullptr);
 
   EXPECT_EQ(2U, array2.size());
 
   EXPECT_EQ(10, array2[0]->get_f_int8());
   EXPECT_EQ(12, array2[1]->get_f_int16());
 }
 
 TEST(UnionTest, PodUnionInArraySerializationWithNull) {
   Array<PodUnionPtr> array(2);
   array[0] = PodUnion::New();
 
   array[0]->set_f_int8(10);
   EXPECT_EQ(2U, array.size());
 
   size_t size =
       mojo::internal::PrepareToSerialize<Array<PodUnionPtr>>(array, nullptr);
   EXPECT_EQ(40U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   mojo::internal::Array_Data<internal::PodUnion_Data>* data;
-  mojo::internal::ArrayValidateParams validate_params(0, true, nullptr);
+  mojo::internal::ContainerValidateParams validate_params(0, true, nullptr);
   mojo::internal::Serialize<Array<PodUnionPtr>>(array, &buf, &data,
                                                 &validate_params, nullptr);
 
   Array<PodUnionPtr> array2;
   mojo::internal::Deserialize<Array<PodUnionPtr>>(data, &array2, nullptr);
 
   EXPECT_EQ(2U, array2.size());
 
   EXPECT_EQ(10, array2[0]->get_f_int8());
   EXPECT_TRUE(array2[1].is_null());
 }
 
 TEST(UnionTest, ObjectUnionInArraySerialization) {
   Array<ObjectUnionPtr> array(2);
   array[0] = ObjectUnion::New();
   array[1] = ObjectUnion::New();
 
   array[0]->set_f_string("hello");
   array[1]->set_f_string("world");
   EXPECT_EQ(2U, array.size());
 
   size_t size =
       mojo::internal::PrepareToSerialize<Array<ObjectUnionPtr>>(array, nullptr);
   EXPECT_EQ(72U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
 
   mojo::internal::Array_Data<internal::ObjectUnion_Data>* data;
-  mojo::internal::ArrayValidateParams validate_params(0, false, nullptr);
+  mojo::internal::ContainerValidateParams validate_params(0, false, nullptr);
   mojo::internal::Serialize<Array<ObjectUnionPtr>>(array, &buf, &data,
                                                    &validate_params, nullptr);
 
   data->EncodePointers();
 
   std::vector<char> new_buf;
   new_buf.resize(size);
 
   void* raw_buf = buf.Leak();
   memcpy(new_buf.data(), raw_buf, size);
@@ skipping 189 matching lines @@
   map["two"]->set_f_int16(16);
 
   mojo::internal::SerializationContext context;
   size_t size = mojo::internal::PrepareToSerialize<Map<String, PodUnionPtr>>(
       map, &context);
   EXPECT_EQ(120U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   mojo::internal::Map_Data<mojo::internal::String_Data*,
                            internal::PodUnion_Data>* data;
-  mojo::internal::ArrayValidateParams validate_params(
-      new mojo::internal::ArrayValidateParams(0, false, nullptr),
-      new mojo::internal::ArrayValidateParams(0, false, nullptr));
+  mojo::internal::ContainerValidateParams validate_params(
+      new mojo::internal::ContainerValidateParams(0, false, nullptr),
+      new mojo::internal::ContainerValidateParams(0, false, nullptr));
   mojo::internal::Serialize<Map<String, PodUnionPtr>>(
       map, &buf, &data, &validate_params, &context);
 
   Map<String, PodUnionPtr> map2;
   mojo::internal::Deserialize<Map<String, PodUnionPtr>>(data, &map2, &context);
 
   EXPECT_EQ(8, map2["one"]->get_f_int8());
   EXPECT_EQ(16, map2["two"]->get_f_int16());
 }
 
 TEST(UnionTest, PodUnionInMapSerializationWithNull) {
   Map<String, PodUnionPtr> map;
   map.insert("one", PodUnion::New());
   map.insert("two", nullptr);
 
   map["one"]->set_f_int8(8);
 
   mojo::internal::SerializationContext context;
   size_t size = mojo::internal::PrepareToSerialize<Map<String, PodUnionPtr>>(
       map, &context);
   EXPECT_EQ(120U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   mojo::internal::Map_Data<mojo::internal::String_Data*,
                            internal::PodUnion_Data>* data;
-  mojo::internal::ArrayValidateParams validate_params(
-      new mojo::internal::ArrayValidateParams(0, false, nullptr),
-      new mojo::internal::ArrayValidateParams(0, true, nullptr));
+  mojo::internal::ContainerValidateParams validate_params(
+      new mojo::internal::ContainerValidateParams(0, false, nullptr),
+      new mojo::internal::ContainerValidateParams(0, true, nullptr));
   mojo::internal::Serialize<Map<String, PodUnionPtr>>(
       map, &buf, &data, &validate_params, &context);
 
   Map<String, PodUnionPtr> map2;
   mojo::internal::Deserialize<Map<String, PodUnionPtr>>(data, &map2, &context);
 
   EXPECT_EQ(8, map2["one"]->get_f_int8());
   EXPECT_TRUE(map2["two"].is_null());
 }
 
@@ skipping 493 matching lines @@
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int16(16);
 
   ptr->Echo(std::move(pod),
             [](PodUnionPtr out) { EXPECT_EQ(16, out->get_f_int16()); });
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace mojo