arc: bluetooth: enable use_new_wrapper_types for bluetooth.mojom

components/arc/bluetooth/arc_bluetooth_bridge_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/arc_bluetooth_bridge.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 163 matching lines @@
   base::RunLoop get_adapter_run_loop_;
 };
 
 // When we add device to bluez::FakeBluetoothDeviceClient, ArcBluetoothBridge
 // should send new device data to Android. This test will then check
 // the correctness of the device properties sent via arc bridge.
 TEST_F(ArcBluetoothBridgeTest, DeviceFound) {
   EXPECT_EQ(0u, fake_bluetooth_instance_->device_found_data().size());
   AddTestDevice();
   EXPECT_EQ(2u, fake_bluetooth_instance_->device_found_data().size());
-  const mojo::Array<mojom::BluetoothPropertyPtr>& prop =
+  const std::vector<mojom::BluetoothPropertyPtr>& prop =
       fake_bluetooth_instance_->device_found_data().back();
 
   EXPECT_EQ(7u, prop.size());
   EXPECT_TRUE(prop[0]->is_bdname());
   EXPECT_EQ(std::string(bluez::FakeBluetoothDeviceClient::kLowEnergyName),
             prop[0]->get_bdname());
   EXPECT_TRUE(prop[1]->is_bdaddr());
   EXPECT_EQ(std::string(bluez::FakeBluetoothDeviceClient::kLowEnergyAddress),
             prop[1]->get_bdaddr()->To<std::string>());
   EXPECT_TRUE(prop[2]->is_uuids());
   EXPECT_EQ(1u, prop[2]->get_uuids().size());
   EXPECT_EQ(bluez::FakeBluetoothGattServiceClient::kHeartRateServiceUUID,
             prop[2]->get_uuids()[0].value());
   EXPECT_TRUE(prop[3]->is_device_class());
   EXPECT_EQ(bluez::FakeBluetoothDeviceClient::kLowEnergyClass,
             prop[3]->get_device_class());
   EXPECT_TRUE(prop[4]->is_device_type());
   // bluez::FakeBluetoothDeviceClient does not return proper device type.
   EXPECT_TRUE(prop[5]->is_remote_friendly_name());
   EXPECT_EQ(std::string(bluez::FakeBluetoothDeviceClient::kLowEnergyName),
             prop[5]->get_remote_friendly_name());
   EXPECT_TRUE(prop[6]->is_remote_rssi());
   EXPECT_EQ(kTestRssi, prop[6]->get_remote_rssi());
 
   ChangeTestDeviceRssi(kTestRssi2);
   EXPECT_EQ(3u, fake_bluetooth_instance_->device_found_data().size());
-  const mojo::Array<mojom::BluetoothPropertyPtr>& prop2 =
+  const std::vector<mojom::BluetoothPropertyPtr>& prop2 =
       fake_bluetooth_instance_->device_found_data().back();
   EXPECT_EQ(7u, prop2.size());
   EXPECT_TRUE(prop2[6]->is_remote_rssi());
   EXPECT_EQ(kTestRssi2, prop2[6]->get_remote_rssi());
 }
 
 // Invoke OnDiscoveryStarted to send cached device to BT instance,
 // and check correctness of the Advertising data sent via arc bridge.
 TEST_F(ArcBluetoothBridgeTest, LEDeviceFound) {
   EXPECT_EQ(0u, fake_bluetooth_instance_->le_device_found_data().size());
   AddTestDevice();
   EXPECT_EQ(1u, fake_bluetooth_instance_->le_device_found_data().size());
 
   const auto& le_device_found_data =
       fake_bluetooth_instance_->le_device_found_data().back();
   const mojom::BluetoothAddressPtr& addr = le_device_found_data->addr();
-  const mojo::Array<mojom::BluetoothAdvertisingDataPtr>& adv_data =
+  const std::vector<mojom::BluetoothAdvertisingDataPtr>& adv_data =
       le_device_found_data->adv_data();
 
   EXPECT_EQ(std::string(bluez::FakeBluetoothDeviceClient::kLowEnergyAddress),
             addr->To<std::string>());
   EXPECT_EQ(2u, adv_data.size());
 
   EXPECT_TRUE(adv_data[0]->is_local_name());
   EXPECT_EQ(std::string(bluez::FakeBluetoothDeviceClient::kLowEnergyName),
-            adv_data[0]->get_local_name().To<std::string>());
+            adv_data[0]->get_local_name());
 
   EXPECT_TRUE(adv_data[1]->is_service_uuids());
   EXPECT_EQ(1u, adv_data[1]->get_service_uuids().size());
   EXPECT_EQ(bluez::FakeBluetoothGattServiceClient::kHeartRateServiceUUID,
             adv_data[1]->get_service_uuids()[0].canonical_value());
 
   EXPECT_EQ(kTestRssi, le_device_found_data->rssi());
 
   ChangeTestDeviceRssi(kTestRssi2);
   EXPECT_EQ(2u, fake_bluetooth_instance_->le_device_found_data().size());
@@ skipping 13 matching lines @@
       fake_bluetooth_instance_->gatt_db_result().back()->remote_addr();
   EXPECT_EQ(std::string(bluez::FakeBluetoothDeviceClient::kLowEnergyAddress),
             addr->To<std::string>());
 
   // HeartRateService in bluez::FakeBluetoothDeviceClient consists of
   // Service: HeartRateService
   //     Characteristic: HeartRateMeasurement
   //         Descriptor: ClientCharacteristicConfiguration
   //     Characteristic: BodySensorLocation
   //     Characteristic: HeartRateControlPoint
-  const mojo::Array<mojom::BluetoothGattDBElementPtr>& db =
+  const std::vector<mojom::BluetoothGattDBElementPtr>& db =
       fake_bluetooth_instance_->gatt_db_result().back()->db();
   EXPECT_EQ(5u, db.size());
 
   EXPECT_EQ(device::BluetoothUUID(
                 bluez::FakeBluetoothGattServiceClient::kHeartRateServiceUUID),
             db[0]->uuid);
   EXPECT_EQ(mojom::BluetoothGattDBAttributeType::BTGATT_DB_PRIMARY_SERVICE,
             db[0]->type);
 
   EXPECT_EQ(device::BluetoothUUID(bluez::FakeBluetoothGattCharacteristicClient::
@@ skipping 40 matching lines @@
       BroadcastAdvertisement(handle, std::move(adv_data));
   EXPECT_EQ(mojom::BluetoothGattStatus::GATT_SUCCESS, status);
   EXPECT_EQ(1, NumActiveAdvertisements());
 
   status = ReleaseAdvertisementHandle(handle);
   EXPECT_EQ(mojom::BluetoothGattStatus::GATT_SUCCESS, status);
   EXPECT_EQ(0, NumActiveAdvertisements());
 }
 
 }  // namespace arc