Adding support for Low Energy device discovery to BluetoothAdapterMac

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 "base/mac/mac_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "device/bluetooth/bluetooth_low_energy_device_mac.h"
@@ skipping 61 matching lines @@
 
 - (void)centralManagerDidUpdateState:(CBCentralManager*)central {
   // Notifies when the powered state of the central manager changed.
   delegate_->TryStartDiscovery();
 }
 
 @end
 
 BluetoothLowEnergyDiscoveryManagerMac::
     ~BluetoothLowEnergyDiscoveryManagerMac() {
-  ClearDevices();
+  // Set the manager's delegate to nil since the object it points to
+  // (|bridge_|) will be deallocated while |manager_| is leaked.
+  if (base::mac::IsOSLionOrLater()) {
+    // CoreBluetooth only available in OSX 10.7 and later.
+    SEL selector = NSSelectorFromString(@"setDelegate:");
+    [manager_ performSelector:selector withObject:nil];
+  }
 }
 
 bool BluetoothLowEnergyDiscoveryManagerMac::IsDiscovering() const {
   return discovering_;
 }
 
 void BluetoothLowEnergyDiscoveryManagerMac::StartDiscovery(
     BluetoothDevice::UUIDList services_uuids) {
-  ClearDevices();
   discovering_ = true;
   pending_ = true;
   services_uuids_ = services_uuids;
   TryStartDiscovery();
 }
 
 void BluetoothLowEnergyDiscoveryManagerMac::TryStartDiscovery() {
   if (!discovering_) {
     return;
   }
@@ skipping 28 matching lines @@
   if (discovering_ && !pending_) {
     [manager_ stopScan];
   }
   discovering_ = false;
 }
 
 void BluetoothLowEnergyDiscoveryManagerMac::DiscoveredPeripheral(
     CBPeripheral* peripheral,
     NSDictionary* advertisementData,
     int rssi) {
-  // Look for existing device.
-  auto iter = devices_.find(
-      BluetoothLowEnergyDeviceMac::GetPeripheralIdentifier(peripheral));
-  if (iter == devices_.end()) {
-    // A device has been added.
-    BluetoothLowEnergyDeviceMac* device =
-        new BluetoothLowEnergyDeviceMac(peripheral, advertisementData, rssi);
-    devices_.insert(devices_.begin(),
-                    std::make_pair(device->GetIdentifier(), device));
-    observer_->DeviceFound(device);
-    return;
-  }
+  observer_->LowEnergyDeviceUpdated(peripheral, advertisementData, rssi);
+}
 
-  // A device has an update.
-  BluetoothLowEnergyDeviceMac* old_device = iter->second;
-  old_device->Update(peripheral, advertisementData, rssi);
-  observer_->DeviceUpdated(old_device);
+void BluetoothLowEnergyDiscoveryManagerMac::SetManagerForTesting(
+    CBCentralManager* manager) {
+  // setDelegate is only available in OSX 10.7 and later.
+  CHECK(base::mac::IsOSLionOrLater());
+  SEL selector = NSSelectorFromString(@"setDelegate:");
+  [manager performSelector:selector withObject:bridge_];
+  manager_.reset(manager);
 }
 
 BluetoothLowEnergyDiscoveryManagerMac*
 BluetoothLowEnergyDiscoveryManagerMac::Create(Observer* observer) {
   return new BluetoothLowEnergyDiscoveryManagerMac(observer);
 }
 
 BluetoothLowEnergyDiscoveryManagerMac::BluetoothLowEnergyDiscoveryManagerMac(
     Observer* observer)
     : observer_(observer) {
   bridge_.reset([[BluetoothLowEnergyDiscoveryManagerMacBridge alloc]
       initWithManager:this]);
   // Since CoreBluetooth is only available on OS X 10.7 or later, we
   // instantiate CBCentralManager only for OS X >= 10.7.
   if (base::mac::IsOSLionOrLater()) {
     Class aClass = NSClassFromString(@"CBCentralManager");
     manager_.reset(
         [[aClass alloc] initWithDelegate:bridge_
                                    queue:dispatch_get_main_queue()]);
+    [manager_ retain];

[scheib, 2015/06/24 23:24:25]

Add a comment here referencing the explanation in the header.
// Increment reference count, see comment at declaration.

[krstnmnlsn, 2015/06/24 23:42:26]

Done.

   }
   discovering_ = false;
 }
-
-void BluetoothLowEnergyDiscoveryManagerMac::ClearDevices() {
-  STLDeleteValues(&devices_);
-}