Remove mojo::Array.

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 when DLOG is enabled.
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 
 #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/system/message_pipe.h"
 #include "mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom.h"
 #include "mojo/public/interfaces/bindings/tests/test_unions.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 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);
+std::vector<base::Optional<std::vector<ScopedHandle>>>
+CreateTestNestedHandleArray() {
+  std::vector<base::Optional<std::vector<ScopedHandle>>> array(2);
   for (size_t i = 0; i < array.size(); ++i) {
-    Array<ScopedHandle> nested_array(3);
+    std::vector<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));
     }
-    array[i] = std::move(nested_array);
+    array[i].emplace(std::move(nested_array));
   }
 
   return array;
 }
 
 class SerializationWarningTest : public testing::Test {
  public:
   ~SerializationWarningTest() override {}
 
  protected:
@@ skipping 104 matching lines @@
   test_struct = Struct5::New();
   test_struct->pair.resize(2);
   test_struct->pair[0] = Struct1::New();
   test_struct->pair[1] = Struct1::New();
 
   TestWarning(std::move(test_struct), mojo::internal::VALIDATION_ERROR_NONE);
 }
 
 TEST_F(SerializationWarningTest, ArrayOfArraysOfHandles) {
   using MojomType = ArrayDataView<ArrayDataView<ScopedHandle>>;
-  Array<Array<ScopedHandle>> test_array = CreateTestNestedHandleArray();
-  test_array[0] = nullptr;
-  test_array[1][0] = ScopedHandle();
+  auto test_array = CreateTestNestedHandleArray();
+  test_array[0] = base::nullopt;
+  (*test_array[1])[0] = ScopedHandle();
 
   ContainerValidateParams validate_params_0(
       0, true, new ContainerValidateParams(0, true, nullptr));
   TestArrayWarning<MojomType>(std::move(test_array),
                               mojo::internal::VALIDATION_ERROR_NONE,
                               &validate_params_0);
 
   test_array = CreateTestNestedHandleArray();
-  test_array[0] = nullptr;
+  test_array[0] = base::nullopt;
   ContainerValidateParams validate_params_1(
       0, false, new ContainerValidateParams(0, true, nullptr));
   TestArrayWarning<MojomType>(
       std::move(test_array),
       mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER,
       &validate_params_1);
 
   test_array = CreateTestNestedHandleArray();
-  test_array[1][0] = ScopedHandle();
+  (*test_array[1])[0] = ScopedHandle();
   ContainerValidateParams validate_params_2(
       0, true, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning<MojomType>(
       std::move(test_array),
       mojo::internal::VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE,
       &validate_params_2);
 }
 
 TEST_F(SerializationWarningTest, ArrayOfStrings) {
   using MojomType = ArrayDataView<StringDataView>;
 
-  Array<std::string> test_array(3);
+  std::vector<std::string> test_array(3);
   for (size_t i = 0; i < test_array.size(); ++i)
     test_array[i] = "hello";
 
   ContainerValidateParams validate_params_0(
       0, true, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning<MojomType>(std::move(test_array),
                               mojo::internal::VALIDATION_ERROR_NONE,
                               &validate_params_0);
 
-  Array<base::Optional<std::string>> optional_test_array(3);
+  std::vector<base::Optional<std::string>> optional_test_array(3);
   ContainerValidateParams validate_params_1(
       0, false, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning<MojomType>(
       std::move(optional_test_array),
       mojo::internal::VALIDATION_ERROR_UNEXPECTED_NULL_POINTER,
       &validate_params_1);
 
-  test_array = Array<std::string>(2);
+  test_array = std::vector<std::string>(2);
   ContainerValidateParams validate_params_2(
       3, true, new ContainerValidateParams(0, false, nullptr));
   TestArrayWarning<MojomType>(
       std::move(test_array),
       mojo::internal::VALIDATION_ERROR_UNEXPECTED_ARRAY_HEADER,
       &validate_params_2);
 }
 
 TEST_F(SerializationWarningTest, StructInUnion) {
   DummyStructPtr dummy(nullptr);
@@ skipping 20 matching lines @@
 
   TestUnionWarning(std::move(handle),
                    mojo::internal::VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo
 
 #endif