arc: bluetooth: enable use_new_wrapper_types for bluetooth.mojom

components/arc/bluetooth/bluetooth_struct_traits_unittest.cc

 // 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 "components/arc/bluetooth/bluetooth_struct_traits.h"
 
+#include <string>
+#include <utility>
+
 #include "base/macros.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 constexpr char kUuidStr[] = "12345678-1234-5678-9abc-def123456789";
 constexpr uint8_t kUuidArray[] = {0x12, 0x34, 0x56, 0x78, 0x12, 0x34,
                                   0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf1,
                                   0x23, 0x45, 0x67, 0x89};
 constexpr size_t kUuidSize = 16;
 
 constexpr char kUuid16Str[] = "1234";
 constexpr uint16_t kUuid16 = 0x1234;
 constexpr uint8_t kServiceData[] = {0x11, 0x22, 0x33, 0x44, 0x55};
 constexpr uint8_t kManufacturerData[] = {0x00, 0xe0};
 
 template <typename MojoType, typename UserType>
 mojo::StructPtr<MojoType> ConvertToMojo(UserType& input) {
-  mojo::Array<uint8_t> data = MojoType::Serialize(&input);
+  std::vector<uint8_t> data = MojoType::Serialize(&input);
   mojo::StructPtr<MojoType> output;
   MojoType::Deserialize(std::move(data), &output);
   return output;
 }
 
 template <typename MojoType, typename UserType>
 bool ConvertFromMojo(mojo::StructPtr<MojoType> input, UserType* output) {
-  mojo::Array<uint8_t> data = MojoType::Serialize(&input);
+  std::vector<uint8_t> data = MojoType::Serialize(&input);
   return MojoType::Deserialize(std::move(data), output);
 }
 
 }  // namespace
 
 namespace mojo {
 
 TEST(BluetoothStructTraitsTest, SerializeBluetoothUUID) {
   device::BluetoothUUID uuid_device(kUuidStr);
   arc::mojom::BluetoothUUIDPtr uuid_mojo =
@@ skipping 17 matching lines @@
 
   // Size checks are performed in serialization code. UUIDs with a length
   // other than 16 bytes will not make it through the mojo deserialization
   // code since arc::mojom::BluetoothUUID::uuid is defined as
   // array<uint8, 16>.
 }
 
 TEST(BluetoothStructTraitsTest, DeserializeBluetoothAdvertisement) {
   arc::mojom::BluetoothAdvertisementPtr advertisement_mojo =
       arc::mojom::BluetoothAdvertisement::New();
-  mojo::Array<arc::mojom::BluetoothAdvertisingDataPtr> adv_data;
+  std::vector<arc::mojom::BluetoothAdvertisingDataPtr> adv_data;
 
   // Create service UUIDs.
   arc::mojom::BluetoothAdvertisingDataPtr data =
       arc::mojom::BluetoothAdvertisingData::New();
   std::vector<device::BluetoothUUID> service_uuids;
   service_uuids.push_back((device::BluetoothUUID(kUuidStr)));
   data->set_service_uuids(service_uuids);
   adv_data.push_back(std::move(data));
 
   // Create service data.
@@ skipping 42 matching lines @@
   EXPECT_EQ(cic & 0xff, kManufacturerData[0]);
   EXPECT_EQ((cic >> 8) & 0xff, kManufacturerData[1]);
   EXPECT_EQ(converted_manufacturer->begin()->second.size(),
             static_cast<unsigned long>(arraysize(kManufacturerData) -
                                        sizeof(uint16_t)));
 }
 
 TEST(BluetoothStructTraitsTest, DeserializeBluetoothAdvertisementFailure) {
   arc::mojom::BluetoothAdvertisementPtr advertisement_mojo =
       arc::mojom::BluetoothAdvertisement::New();
-  mojo::Array<arc::mojom::BluetoothAdvertisingDataPtr> adv_data;
+  std::vector<arc::mojom::BluetoothAdvertisingDataPtr> adv_data;
 
   // Create empty manufacturer data. Manufacturer data must include the CIC
   // which is 2 bytes long.
   arc::mojom::BluetoothAdvertisingDataPtr data =
       arc::mojom::BluetoothAdvertisingData::New();
-  data->set_manufacturer_data((mojo::Array<uint8_t>()));
+  data->set_manufacturer_data(std::vector<uint8_t>());
   adv_data.push_back(std::move(data));
 
   advertisement_mojo->type =
       arc::mojom::BluetoothAdvertisementType::ADV_TYPE_CONNECTABLE;
   advertisement_mojo->data = std::move(adv_data);
 
   std::unique_ptr<device::BluetoothAdvertisement::Data> advertisement;
   EXPECT_FALSE(ConvertFromMojo(std::move(advertisement_mojo), &advertisement));
 }
 
 }  // namespace mojo