Remove mojo::Array.

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"
 #include "base/run_loop.h"
-#include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/binding.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_context.h"
 #include "mojo/public/cpp/bindings/lib/validation_errors.h"
 #include "mojo/public/cpp/test_support/test_utils.h"
 #include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h"
 #include "mojo/public/interfaces/bindings/tests/test_unions.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 397 matching lines @@
   small_struct->pod_union_array.value()[1] = PodUnion::New();
 
   small_struct->pod_union_array.value()[0]->set_f_int8(10);
   small_struct->pod_union_array.value()[1]->set_f_int16(12);
 
   EXPECT_EQ(10, small_struct->pod_union_array.value()[0]->get_f_int8());
   EXPECT_EQ(12, small_struct->pod_union_array.value()[1]->get_f_int16());
 }
 
 TEST(UnionTest, PodUnionInArraySerialization) {
-  Array<PodUnionPtr> array(2);
+  std::vector<PodUnionPtr> array(2);
   array[0] = PodUnion::New();
   array[1] = PodUnion::New();
 
   array[0]->set_f_int8(10);
   array[1]->set_f_int16(12);
   EXPECT_EQ(2U, array.size());
 
   size_t size =
       mojo::internal::PrepareToSerialize<ArrayDataView<PodUnionDataView>>(
           array, nullptr);
   EXPECT_EQ(40U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   mojo::internal::Array_Data<internal::PodUnion_Data>* data;
   mojo::internal::ContainerValidateParams validate_params(0, false, nullptr);
   mojo::internal::Serialize<ArrayDataView<PodUnionDataView>>(
       array, &buf, &data, &validate_params, nullptr);
 
-  Array<PodUnionPtr> array2;
+  std::vector<PodUnionPtr> array2;
   mojo::internal::Deserialize<ArrayDataView<PodUnionDataView>>(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);
+  std::vector<PodUnionPtr> array(2);
   array[0] = PodUnion::New();
 
   array[0]->set_f_int8(10);
   EXPECT_EQ(2U, array.size());
 
   size_t size =
       mojo::internal::PrepareToSerialize<ArrayDataView<PodUnionDataView>>(
           array, nullptr);
   EXPECT_EQ(40U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   mojo::internal::Array_Data<internal::PodUnion_Data>* data;
   mojo::internal::ContainerValidateParams validate_params(0, true, nullptr);
   mojo::internal::Serialize<ArrayDataView<PodUnionDataView>>(
       array, &buf, &data, &validate_params, nullptr);
 
-  Array<PodUnionPtr> array2;
+  std::vector<PodUnionPtr> array2;
   mojo::internal::Deserialize<ArrayDataView<PodUnionDataView>>(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);
+  std::vector<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<ArrayDataView<ObjectUnionDataView>>(
           array, nullptr);
@@ skipping 14 matching lines @@
   free(raw_buf);
 
   data =
       reinterpret_cast<mojo::internal::Array_Data<internal::ObjectUnion_Data>*>(
           new_buf.data());
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   ASSERT_TRUE(mojo::internal::Array_Data<internal::ObjectUnion_Data>::Validate(
       data, &validation_context, &validate_params));
 
-  Array<ObjectUnionPtr> array2;
+  std::vector<ObjectUnionPtr> array2;
   mojo::internal::Deserialize<ArrayDataView<ObjectUnionDataView>>(data, &array2,
                                                                   nullptr);
 
   EXPECT_EQ(2U, array2.size());
 
   EXPECT_EQ("hello", array2[0]->get_f_string());
   EXPECT_EQ("world", array2[1]->get_f_string());
 }
 
 // TODO(azani): Move back in struct_unittest.cc when possible.
@@ skipping 307 matching lines @@
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
       raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, ArrayInUnionGetterSetter) {
-  Array<int8_t> array(2);
+  std::vector<int8_t> array(2);
   array[0] = 8;
   array[1] = 9;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(std::move(array));
 
   EXPECT_EQ(8, obj->get_f_array_int8()[0]);
   EXPECT_EQ(9, obj->get_f_array_int8()[1]);
 }
 
 TEST(UnionTest, ArrayInUnionSerialization) {
-  Array<int8_t> array(2);
+  std::vector<int8_t> array(2);
   array[0] = 8;
   array[1] = 9;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(std::move(array));
 
   size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
       obj, false, nullptr);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
                                                  nullptr);
 
   ObjectUnionPtr obj2;
   mojo::internal::Deserialize<ObjectUnionDataView>(data, &obj2, nullptr);
 
   EXPECT_EQ(8, obj2->get_f_array_int8()[0]);
   EXPECT_EQ(9, obj2->get_f_array_int8()[1]);
 }
 
 TEST(UnionTest, ArrayInUnionValidation) {
-  Array<int8_t> array(2);
+  std::vector<int8_t> array(2);
   array[0] = 8;
   array[1] = 9;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(std::move(array));
 
   size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
       obj, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
@@ skipping 340 matching lines @@
 
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int16(16);
 
   ptr->Echo(std::move(pod), base::Bind(&ExpectInt16, 16));
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace mojo