bluetooth: mac: add connected LE devices to chooser

device/bluetooth/bluetooth_low_energy_discovery_manager_mac.mm

 // Copyright 2015 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 "device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h"
 
 #include <memory>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "device/bluetooth/bluetooth_adapter_mac.h"
 #include "device/bluetooth/bluetooth_low_energy_device_mac.h"
 
 namespace device {
 
 BluetoothLowEnergyDiscoveryManagerMac::
     ~BluetoothLowEnergyDiscoveryManagerMac() {
 }
 
 bool BluetoothLowEnergyDiscoveryManagerMac::IsDiscovering() const {
   return discovering_;
 }
 
 void BluetoothLowEnergyDiscoveryManagerMac::StartDiscovery(
-    BluetoothDevice::UUIDList services_uuids) {
+    NSArray* services_uuids) {
   discovering_ = true;
   pending_ = true;
-  services_uuids_ = services_uuids;
+  services_uuids_.reset(services_uuids, base::scoped_policy::RETAIN);
   TryStartDiscovery();
 }
 
 void BluetoothLowEnergyDiscoveryManagerMac::TryStartDiscovery() {
   if (!discovering_) {
     VLOG(1) << "TryStartDiscovery !discovering_";
     return;
   }
 
   if (!pending_) {
     VLOG(1) << "TryStartDiscovery !pending_";
     return;
   }
 
   if (!central_manager_) {
     VLOG(1) << "TryStartDiscovery !central_manager_";
     return;
   }
 
   if ([central_manager_ state] != CBCentralManagerStatePoweredOn) {
     VLOG(1) << "TryStartDiscovery != CBCentralManagerStatePoweredOn";
     return;
   }
 
-  // Converts the services UUIDs to a CoreBluetooth data structure.
-  NSMutableArray* services = nil;
-  if (!services_uuids_.empty()) {
-    services = [NSMutableArray array];
-    for (auto& service_uuid : services_uuids_) {
-      NSString* uuidString =
-          base::SysUTF8ToNSString(service_uuid.canonical_value().c_str());
-      CBUUID* uuid = [CBUUID UUIDWithString:uuidString];
-      [services addObject:uuid];
-    }
-  };
-
   VLOG(1) << "TryStartDiscovery scanForPeripheralsWithServices";
   // Start a scan with the Allow Duplicates option so that we get notified
   // of each new Advertisement Packet. This allows us to provide up to date
   // values for RSSI, Advertised Services, Advertised Data, etc.
   [central_manager_
-      scanForPeripheralsWithServices:services
+      scanForPeripheralsWithServices:services_uuids_

[ortuno, 2016/09/28 23:15:52]

This seems unrelated. Please do in another patch.

Also fwiw I tried implementing this in
https://codereview.chromium.org/2253223002 but there is quite a bit of
refactoring that needs to be done at the cross platform layer.

[jlebel, 2016/10/05 14:09:41]

Done.

                              options:@{
                                CBCentralManagerScanOptionAllowDuplicatesKey :
                                    @YES
                              }];
   pending_ = false;
 }
 
 void BluetoothLowEnergyDiscoveryManagerMac::StopDiscovery() {
   VLOG(1) << "StopDiscovery";
   if (discovering_ && !pending_) {
@@ skipping 21 matching lines @@
 }
 
 BluetoothLowEnergyDiscoveryManagerMac::BluetoothLowEnergyDiscoveryManagerMac(
     Observer* observer)
     : observer_(observer) {
   DCHECK(BluetoothAdapterMac::IsLowEnergyAvailable());
   discovering_ = false;
 }
 
 }  // namespace device