Mojo C++ bindings: rename ArrayValidateParams for clarity

mojo/public/cpp/bindings/tests/array_common_test.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.
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
@@ skipping 154 matching lines @@
     ArrayType<int32_t> array(4);
     for (size_t i = 0; i < array.size(); ++i)
       array[i] = static_cast<int32_t>(i);
 
     size_t size =
         mojo::internal::PrepareToSerialize<Array<int32_t>>(array, nullptr);
     EXPECT_EQ(8U + 4 * 4U, size);
 
     mojo::internal::FixedBufferForTesting buf(size);
     mojo::internal::Array_Data<int32_t>* data;
-    mojo::internal::ArrayValidateParams validate_params(0, false, nullptr);
+    mojo::internal::ContainerValidateParams validate_params(0, false, nullptr);
     mojo::internal::Serialize<Array<int32_t>>(array, &buf, &data,
                                               &validate_params, nullptr);
 
     ArrayType<int32_t> array2;
     mojo::internal::Deserialize<Array<int32_t>>(data, &array2, nullptr);
 
     EXPECT_EQ(4U, array2.size());
     for (size_t i = 0; i < array2.size(); ++i)
       EXPECT_EQ(static_cast<int32_t>(i), array2[i]);
   }
 
   static void Serialization_EmptyArrayOfPOD() {
     ArrayType<int32_t> array;
     size_t size =
         mojo::internal::PrepareToSerialize<Array<int32_t>>(array, nullptr);
     EXPECT_EQ(8U, size);
 
     mojo::internal::FixedBufferForTesting buf(size);
     mojo::internal::Array_Data<int32_t>* data;
-    mojo::internal::ArrayValidateParams validate_params(0, false, nullptr);
+    mojo::internal::ContainerValidateParams validate_params(0, false, nullptr);
     mojo::internal::Serialize<Array<int32_t>>(array, &buf, &data,
                                               &validate_params, nullptr);
 
     ArrayType<int32_t> array2;
     mojo::internal::Deserialize<Array<int32_t>>(data, &array2, nullptr);
     EXPECT_EQ(0U, array2.size());
   }
 
   static void Serialization_ArrayOfArrayOfPOD() {
     ArrayType<ArrayType<int32_t>> array(2);
     for (size_t j = 0; j < array.size(); ++j) {
       ArrayType<int32_t> inner(4);
       for (size_t i = 0; i < inner.size(); ++i)
         inner[i] = static_cast<int32_t>(i + (j * 10));
       array[j] = std::move(inner);
     }
 
     size_t size = mojo::internal::PrepareToSerialize<Array<Array<int32_t>>>(
         array, nullptr);
     EXPECT_EQ(8U + 2 * 8U + 2 * (8U + 4 * 4U), size);
 
     mojo::internal::FixedBufferForTesting buf(size);
     mojo::internal::Array_Data<mojo::internal::Array_Data<int32_t>*>* data;
-    mojo::internal::ArrayValidateParams validate_params(
-        0, false, new mojo::internal::ArrayValidateParams(0, false, nullptr));
+    mojo::internal::ContainerValidateParams validate_params(
+        0, false,
+        new mojo::internal::ContainerValidateParams(0, false, nullptr));
     mojo::internal::Serialize<Array<Array<int32_t>>>(array, &buf, &data,
                                                      &validate_params, nullptr);
 
     ArrayType<ArrayType<int32_t>> array2;
     mojo::internal::Deserialize<Array<Array<int32_t>>>(data, &array2, nullptr);
 
     EXPECT_EQ(2U, array2.size());
     for (size_t j = 0; j < array2.size(); ++j) {
       const ArrayType<int32_t>& inner = array2[j];
       EXPECT_EQ(4U, inner.size());
       for (size_t i = 0; i < inner.size(); ++i)
         EXPECT_EQ(static_cast<int32_t>(i + (j * 10)), inner[i]);
     }
   }
 
   static void Serialization_ArrayOfBool() {
     ArrayType<bool> array(10);
     for (size_t i = 0; i < array.size(); ++i)
       array[i] = i % 2 ? true : false;
 
     size_t size =
         mojo::internal::PrepareToSerialize<Array<bool>>(array, nullptr);
     EXPECT_EQ(8U + 8U, size);
 
     mojo::internal::FixedBufferForTesting buf(size);
     mojo::internal::Array_Data<bool>* data;
-    mojo::internal::ArrayValidateParams validate_params(0, false, nullptr);
+    mojo::internal::ContainerValidateParams validate_params(0, false, nullptr);
     mojo::internal::Serialize<Array<bool>>(array, &buf, &data, &validate_params,
                                            nullptr);
 
     ArrayType<bool> array2;
     mojo::internal::Deserialize<Array<bool>>(data, &array2, nullptr);
 
     EXPECT_EQ(10U, array2.size());
     for (size_t i = 0; i < array2.size(); ++i)
       EXPECT_EQ(i % 2 ? true : false, array2[i]);
   }
 
   static void Serialization_ArrayOfString() {
     ArrayType<String> array(10);
     for (size_t i = 0; i < array.size(); ++i) {
       char c = 'A' + static_cast<char>(i);
       array[i] = String(&c, 1);
     }
 
     size_t size =
         mojo::internal::PrepareToSerialize<Array<String>>(array, nullptr);
     EXPECT_EQ(8U +            // array header
                   10 * 8U +   // array payload (10 pointers)
                   10 * (8U +  // string header
                         8U),  // string length of 1 padded to 8
               size);
 
     mojo::internal::FixedBufferForTesting buf(size);
     mojo::internal::Array_Data<mojo::internal::String_Data*>* data;
-    mojo::internal::ArrayValidateParams validate_params(
-        0, false, new mojo::internal::ArrayValidateParams(0, false, nullptr));
+    mojo::internal::ContainerValidateParams validate_params(
+        0, false,
+        new mojo::internal::ContainerValidateParams(0, false, nullptr));
     mojo::internal::Serialize<Array<String>>(array, &buf, &data,
                                              &validate_params, nullptr);
 
     ArrayType<String> array2;
     mojo::internal::Deserialize<Array<String>>(data, &array2, nullptr);
 
     EXPECT_EQ(10U, array2.size());
     for (size_t i = 0; i < array2.size(); ++i) {
       char c = 'A' + static_cast<char>(i);
       EXPECT_EQ(String(&c, 1), array2[i]);
@@ skipping 105 matching lines @@
   }
 };
 
 #define ARRAY_COMMON_TEST(ArrayType, test_name) \
   TEST_F(ArrayType##Test, test_name) {          \
     ArrayCommonTest<ArrayType>::test_name();    \
   }
 
 }  // namespace test
 }  // namespace mojo