| Index: components/arc/bluetooth/bluetooth_type_converters_unittest.cc
|
| diff --git a/components/arc/bluetooth/bluetooth_type_converters_unittest.cc b/components/arc/bluetooth/bluetooth_type_converters_unittest.cc
|
| index 6d379839ca341dfa65cf9d1621b9214689246926..5b61f8323a3250b09025852744c1b956df0f5d95 100644
|
| --- a/components/arc/bluetooth/bluetooth_type_converters_unittest.cc
|
| +++ b/components/arc/bluetooth/bluetooth_type_converters_unittest.cc
|
| @@ -38,7 +38,6 @@ arc::mojom::BluetoothSdpAttributePtr CreateDeepMojoSequenceAttribute(
|
| value->type = bluez::BluetoothServiceAttributeValueBlueZ::UINT;
|
| value->type_size = static_cast<uint32_t>(sizeof(data));
|
| value->value.AppendInteger(static_cast<int>(data));
|
| - value->sequence = mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
| }
|
| return value;
|
| }
|
| @@ -116,8 +115,6 @@ TEST(BluetoothTypeConvertorTest, ConvertMojoValueAttributeToBlueZAttribute) {
|
| bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE;
|
| nulltypeAttributeMojo->type_size = 0;
|
| nulltypeAttributeMojo->value.Append(base::Value::CreateNullValue());
|
| - nulltypeAttributeMojo->sequence =
|
| - mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
|
|
| auto nulltypeAttributeBlueZ =
|
| nulltypeAttributeMojo.To<bluez::BluetoothServiceAttributeValueBlueZ>();
|
| @@ -133,9 +130,6 @@ TEST(BluetoothTypeConvertorTest, ConvertMojoValueAttributeToBlueZAttribute) {
|
| boolAttributeMojo->type = bluez::BluetoothServiceAttributeValueBlueZ::BOOL;
|
| boolAttributeMojo->type_size = static_cast<uint32_t>(sizeof(valueBool));
|
| boolAttributeMojo->value.AppendBoolean(valueBool);
|
| - boolAttributeMojo->sequence =
|
| - mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
| -
|
| auto boolAttributeBlueZ =
|
| boolAttributeMojo.To<bluez::BluetoothServiceAttributeValueBlueZ>();
|
|
|
| @@ -153,8 +147,6 @@ TEST(BluetoothTypeConvertorTest, ConvertMojoValueAttributeToBlueZAttribute) {
|
| uintAttributeMojo->type = bluez::BluetoothServiceAttributeValueBlueZ::UINT;
|
| uintAttributeMojo->type_size = static_cast<uint32_t>(sizeof(valueUint16));
|
| uintAttributeMojo->value.AppendInteger(static_cast<int>(valueUint16));
|
| - uintAttributeMojo->sequence =
|
| - mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
|
|
| auto uintAttributeBlueZ =
|
| uintAttributeMojo.To<bluez::BluetoothServiceAttributeValueBlueZ>();
|
| @@ -173,8 +165,6 @@ TEST(BluetoothTypeConvertorTest, ConvertMojoValueAttributeToBlueZAttribute) {
|
| intAttributeMojo->type = bluez::BluetoothServiceAttributeValueBlueZ::INT;
|
| intAttributeMojo->type_size = static_cast<uint32_t>(sizeof(valueInt16));
|
| intAttributeMojo->value.AppendInteger(static_cast<int>(valueInt16));
|
| - intAttributeMojo->sequence =
|
| - mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
|
|
| auto intAttributeBlueZ =
|
| intAttributeMojo.To<bluez::BluetoothServiceAttributeValueBlueZ>();
|
| @@ -195,8 +185,6 @@ TEST(BluetoothTypeConvertorTest, ConvertMojoValueAttributeToBlueZAttribute) {
|
| // UUID16, UUID32 and UUID128.
|
| uuidAttributeMojo->type_size = static_cast<uint32_t>(sizeof(uint16_t));
|
| uuidAttributeMojo->value.AppendString(expectedUUID);
|
| - uuidAttributeMojo->sequence =
|
| - mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
|
|
| auto uuidAttributeBlueZ =
|
| uuidAttributeMojo.To<bluez::BluetoothServiceAttributeValueBlueZ>();
|
| @@ -218,8 +206,6 @@ TEST(BluetoothTypeConvertorTest, ConvertMojoValueAttributeToBlueZAttribute) {
|
| stringAttributeMojo->type_size =
|
| static_cast<uint32_t>(expectedString.length());
|
| stringAttributeMojo->value.AppendString(expectedString);
|
| - stringAttributeMojo->sequence =
|
| - mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
|
|
| auto stringAttributeBlueZ =
|
| stringAttributeMojo.To<bluez::BluetoothServiceAttributeValueBlueZ>();
|
| @@ -239,8 +225,6 @@ TEST(BluetoothTypeConvertorTest, ConvertMojoSequenceAttributeToBlueZAttribute) {
|
| valueUUID->type = bluez::BluetoothServiceAttributeValueBlueZ::UUID;
|
| valueUUID->type_size = static_cast<uint32_t>(sizeof(uint16_t));
|
| valueUUID->value.AppendString(l2capUUID);
|
| - valueUUID->sequence =
|
| - mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
|
|
| // Create an UINT value.
|
| uint16_t l2capChannel = 3;
|
| @@ -248,8 +232,6 @@ TEST(BluetoothTypeConvertorTest, ConvertMojoSequenceAttributeToBlueZAttribute) {
|
| valueUint16->type = bluez::BluetoothServiceAttributeValueBlueZ::UINT;
|
| valueUint16->type_size = static_cast<uint32_t>(sizeof(l2capChannel));
|
| valueUint16->value.AppendInteger(static_cast<int>(l2capChannel));
|
| - valueUint16->sequence =
|
| - mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
|
|
| // Create a sequence with the above two values.
|
| auto sequenceMojo = arc::mojom::BluetoothSdpAttribute::New();
|
| @@ -289,8 +271,6 @@ TEST(BluetoothTypeConvertorTest,
|
| valueNoData->type = bluez::BluetoothServiceAttributeValueBlueZ::UINT;
|
| valueNoData->type_size = static_cast<uint32_t>(sizeof(uint32_t));
|
| valueNoData->value.Clear();
|
| - valueNoData->sequence =
|
| - mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
|
|
| auto valueNoDataBlueZ =
|
| valueNoData.To<bluez::BluetoothServiceAttributeValueBlueZ>();
|
| @@ -308,8 +288,6 @@ TEST(BluetoothTypeConvertorTest,
|
| sequenceNoData->type = bluez::BluetoothServiceAttributeValueBlueZ::SEQUENCE;
|
| sequenceNoData->type_size = 0;
|
| sequenceNoData->value.Append(base::Value::CreateNullValue());
|
| - sequenceNoData->sequence =
|
| - mojo::Array<arc::mojom::BluetoothSdpAttributePtr>::New(0);
|
|
|
| auto sequenceNoDataBlueZ =
|
| sequenceNoData.To<bluez::BluetoothServiceAttributeValueBlueZ>();
|
|
|