arc: bluetooth: Fix advertised uuid

components/arc/bluetooth/arc_bluetooth_bridge.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 <fcntl.h>
 #include <stddef.h>
 
 #include <iomanip>
@@ skipping 1542 matching lines @@
 ArcBluetoothBridge::GetAdvertisingData(BluetoothDevice* device) const {
   mojo::Array<mojom::BluetoothAdvertisingDataPtr> advertising_data;
 
   // LocalName
   mojom::BluetoothAdvertisingDataPtr local_name =
       mojom::BluetoothAdvertisingData::New();
   local_name->set_local_name(base::UTF16ToUTF8(device->GetNameForDisplay()));
   advertising_data.push_back(std::move(local_name));
 
   // ServiceUuid
-  BluetoothDevice::UUIDList uuid_list = device->GetServiceDataUUIDs();
+  BluetoothDevice::UUIDList uuid_list = device->GetUUIDs();
   if (uuid_list.size() > 0) {
     mojom::BluetoothAdvertisingDataPtr service_uuids_16 =
         mojom::BluetoothAdvertisingData::New();
     mojo::Array<uint16_t> uuid16s;
     for (auto& uuid : uuid_list) {
       uuid16s.push_back(GetUUID16(uuid));
     }
     service_uuids_16->set_service_uuids_16(std::move(uuid16s));
     advertising_data.push_back(std::move(service_uuids_16));
   }
 
   // Service data
-  for (auto& uuid : uuid_list) {
+  for (auto& uuid : device->GetServiceDataUUIDs()) {
     base::BinaryValue* data = device->GetServiceData(uuid);
     if (data->GetSize() == 0)
       continue;
     std::string data_str;
     if (!data->GetAsString(&data_str))
       continue;
 
     mojom::BluetoothAdvertisingDataPtr service_data_element =
         mojom::BluetoothAdvertisingData::New();
     mojom::BluetoothServiceDataPtr service_data =
@@ skipping 92 matching lines @@
   LOG(WARNING) << "Bluetooth instance is too old (version " << version
                << ") need version " << version_need;
   return false;
 }
 
 bool ArcBluetoothBridge::CalledOnValidThread() {
   return thread_checker_.CalledOnValidThread();
 }
 
 }  // namespace arc