Mojo C++ bindings: rename ArrayValidateParams for clarity

mojo/public/cpp/bindings/tests/serialization_warning_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.
 
 // Serialization warnings are only recorded in debug build.
 #ifndef NDEBUG
 
 #include <stddef.h>
 #include <utility>
 
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
 #include "mojo/public/cpp/bindings/lib/serialization.h"
 #include "mojo/public/cpp/bindings/lib/validation_errors.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
-using mojo::internal::ArrayValidateParams;
+using mojo::internal::ContainerValidateParams;
 
 // Creates an array of arrays of handles (2 X 3) for testing.
 Array<Array<ScopedHandle>> CreateTestNestedHandleArray() {
   Array<Array<ScopedHandle>> array(2);
   for (size_t i = 0; i < array.size(); ++i) {
     Array<ScopedHandle> nested_array(3);
     for (size_t j = 0; j < nested_array.size(); ++j) {
       MessagePipe pipe;
       nested_array[j] = ScopedHandle::From(std::move(pipe.handle1));
     }
@@ skipping 30 matching lines @@
         mojo::internal::PrepareToSerialize<TPtr>(obj, &context));
     typename T::Data_* data;
     mojo::internal::Serialize<TPtr>(obj, &buf, &data, &context);
 
     EXPECT_EQ(expected_warning, warning_observer_.last_warning());
   }
 
   template <typename T>
   void TestArrayWarning(T obj,
                         mojo::internal::ValidationError expected_warning,
-                        const ArrayValidateParams* validate_params) {
+                        const ContainerValidateParams* validate_params) {
     warning_observer_.set_last_warning(mojo::internal::VALIDATION_ERROR_NONE);
 
     mojo::internal::SerializationContext context;
     mojo::internal::FixedBufferForTesting buf(
         mojo::internal::PrepareToSerialize<T>(obj, &context));
     typename T::Data_* data;
     mojo::internal::Serialize<T>(obj, &buf, &data, validate_params, &context);
 
     EXPECT_EQ(expected_warning, warning_observer_.last_warning());
   }
@@ skipping 86 matching lines @@
   test_struct->str = "hello world";
 
   TestWarning(std::move(test_struct), mojo::internal::VALIDATION_ERROR_NONE);
 }
 
 TEST_F(SerializationWarningTest, ArrayOfArraysOfHandles) {
   Array<Array<ScopedHandle>> test_array = CreateTestNestedHandleArray();
   test_array[0] = nullptr;
   test_array[1][0] = ScopedHandle();
 
-  ArrayValidateParams validate_params_0(
-      0, true, new ArrayValidateParams(0, true, nullptr));
+  ContainerValidateParams validate_params_0(
+      0, true, new ContainerValidateParams(0, true, nullptr));
   TestArrayWarning(std::move(test_array), mojo::internal::VALIDATION_ERROR_NONE,
                    &validate_params_0);
 
   test_array = CreateTestNestedHandleArray();
   test_array[0] = nullptr;
-  ArrayValidateParams validate_params_1(
-      0, false, new ArrayValidateParams(0, true, nullptr));
+  ContainerValidateParams validate_params_1(
+      0, false, new ContainerValidateParams(0, true, nullptr));
   TestArrayWarning(std::move(test_array),
                    mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER,
                    &validate_params_1);
 
   test_array = CreateTestNestedHandleArray();
   test_array[1][0] = ScopedHandle();
-  ArrayValidateParams validate_params_2(
-      0, true, new ArrayValidateParams(0, false, nullptr));
+  ContainerValidateParams validate_params_2(
+      0, true, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning(std::move(test_array),
                    mojo::internal::VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE,
                    &validate_params_2);
 }
 
 TEST_F(SerializationWarningTest, ArrayOfStrings) {
   Array<String> test_array(3);
   for (size_t i = 0; i < test_array.size(); ++i)
     test_array[i] = "hello";
 
-  ArrayValidateParams validate_params_0(
-      0, true, new ArrayValidateParams(0, false, nullptr));
+  ContainerValidateParams validate_params_0(
+      0, true, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning(std::move(test_array), mojo::internal::VALIDATION_ERROR_NONE,
                    &validate_params_0);
 
   test_array = Array<String>(3);
   for (size_t i = 0; i < test_array.size(); ++i)
     test_array[i] = nullptr;
-  ArrayValidateParams validate_params_1(
-      0, false, new ArrayValidateParams(0, false, nullptr));
+  ContainerValidateParams validate_params_1(
+      0, false, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning(std::move(test_array),
                    mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER,
                    &validate_params_1);
 
   test_array = Array<String>(2);
-  ArrayValidateParams validate_params_2(
-      3, true, new ArrayValidateParams(0, false, nullptr));
+  ContainerValidateParams validate_params_2(
+      3, true, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning(std::move(test_array),
                    mojo::internal::VALIDATION_ERROR_UNEXPECTED_ARRAY_HEADER,
                    &validate_params_2);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo
 
 #endif