Adding support for Low Energy device discovery to BluetoothAdapterMac

device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DISCOVERY_MANAGER_MAC_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DISCOVERY_MANAGER_MAC_H_
 
 #if defined(OS_IOS)
 #import <CoreBluetooth/CoreBluetooth.h>
 #else
@@ skipping 10 matching lines @@
 
 class BluetoothLowEnergyDeviceMac;
 class BluetoothLowEnergyDiscoveryManagerMacDelegate;
 
 // This class will scan for Bluetooth LE device on Mac.
 class BluetoothLowEnergyDiscoveryManagerMac {
  public:
   // Interface for being notified of events during a device discovery session.
   class Observer {
    public:
-    // Called when |this| manager has found a device.
-    virtual void DeviceFound(BluetoothLowEnergyDeviceMac* device) = 0;
-
-    // Called when |this| manager has updated on a device.
-    virtual void DeviceUpdated(BluetoothLowEnergyDeviceMac* device) = 0;
+    // Called when |this| manager has found a device or an update on a device.
+    virtual void LowEnergyDeviceUpdated(CBPeripheral* peripheral,
+                                        NSDictionary* advertisementData,
+                                        int rssi) = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
   virtual ~BluetoothLowEnergyDiscoveryManagerMac();
 
   // Returns true, if discovery is currently being performed.
   virtual bool IsDiscovering() const;
 
@@ skipping 16 matching lines @@
 
   // The device discovery can really be started when Bluetooth is powered on.
   // The method TryStartDiscovery() is called when it's a good time to try to
   // start the BLE device discovery. It will check if the discovery session has
   // been started and if the Bluetooth is powered and then really start the
   // CoreBluetooth BLE device discovery.
   virtual void TryStartDiscovery();
 
  private:
   explicit BluetoothLowEnergyDiscoveryManagerMac(Observer* observer);
-  void ClearDevices();
+
+  // Private method for testing.  Resets |manager_| to |manager| and set
+  // |bridge_| as its delegate.
+  virtual void SetManager(CBCentralManager* manager);

[scheib, 2015/06/17 16:55:08]

If it is only called in tests, rename to SetManagerForTesting.
https://www.chromium.org/developers/coding-style#Naming

[krstnmnlsn, 2015/06/17 20:18:41]

Done.

 
   friend class BluetoothLowEnergyDiscoveryManagerMacDelegate;
+  friend class BluetoothAdapterMacTest;
 
   // Observer interested in notifications from us.
   Observer* observer_;
 
   // Underlaying CoreBluetooth central manager.
   base::scoped_nsobject<CBCentralManager> manager_;
 
   // Discovery has been initiated by calling the API StartDiscovery().
   bool discovering_;
 
   // A discovery has been initiated but has not started yet because it's
   // waiting for Bluetooth to turn on.
   bool pending_;
 
   // Delegate of the central manager.
   base::scoped_nsobject<BluetoothLowEnergyDiscoveryManagerMacBridge> bridge_;
 
-  // Map of the device identifiers to the discovered device.
-  std::map<const std::string, BluetoothLowEnergyDeviceMac*> devices_;
-
   // List of service UUIDs to scan.
   BluetoothDevice::UUIDList services_uuids_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothLowEnergyDiscoveryManagerMac);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DISCOVERY_MANAGER_MAC_H_