arc: bluetooth: Use UUID 16 bits in advertising data

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>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/strings/stringprintf.h"
 #include "components/arc/bluetooth/bluetooth_type_converters.h"
 #include "components/arc/common/bluetooth.mojom.h"
 #include "components/arc/test/fake_arc_bridge_service.h"
 #include "components/arc/test/fake_bluetooth_instance.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "device/bluetooth/dbus/fake_bluetooth_adapter_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_device_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_client.h"
 #include "device/bluetooth/dbus/fake_bluetooth_gatt_service_client.h"
@@ skipping 111 matching lines @@
       fake_bluetooth_instance_->le_device_found_data().back()->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>());
 
-  EXPECT_TRUE(adv_data[1]->is_service_uuids());
-  EXPECT_EQ(1u, adv_data[1]->get_service_uuids().size());
-  EXPECT_EQ(device::BluetoothUUID(
-                bluez::FakeBluetoothGattServiceClient::kHeartRateServiceUUID),
-            adv_data[1]->get_service_uuids()[0].To<device::BluetoothUUID>());
+  EXPECT_TRUE(adv_data[1]->is_service_uuids_16());
+  EXPECT_EQ(1u, adv_data[1]->get_service_uuids_16().size());
+
+  std::string uuid16_str =
+      base::StringPrintf("%04x", adv_data[1]->get_service_uuids_16()[0]);
+  EXPECT_EQ(bluez::FakeBluetoothGattServiceClient::kHeartRateServiceUUID,
+            device::BluetoothUUID(uuid16_str).canonical_value());
 }
 
 // Invoke GetGattDB and check correctness of the GattDB sent via arc bridge.
 TEST_F(ArcBluetoothBridgeTest, GetGattDB) {
   AddTestDevice();
 
   arc_bluetooth_bridge_->GetGattDB(mojom::BluetoothAddress::From(
       std::string(bluez::FakeBluetoothDeviceClient::kLowEnergyAddress)));
   EXPECT_EQ(1u, fake_bluetooth_instance_->gatt_db_result().size());
 
@@ skipping 43 matching lines @@
   EXPECT_EQ(device::BluetoothUUID(bluez::FakeBluetoothGattCharacteristicClient::
                                       kHeartRateControlPointUUID),
             db[4]->uuid.To<device::BluetoothUUID>());
   EXPECT_EQ(mojom::BluetoothGattDBAttributeType::BTGATT_DB_CHARACTERISTIC,
             db[4]->type);
   EXPECT_EQ(device::BluetoothGattCharacteristic::PROPERTY_WRITE,
             db[4]->properties);
 }
 
 }  // namespace arc