Adding support for service scan on OS X

device/bluetooth/bluetooth_low_energy_device_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_DEVICE_MAC_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DEVICE_MAC_H_
 
 #if defined(OS_IOS)
 #import <CoreBluetooth/CoreBluetooth.h>
 #else  // !defined(OS_IOS)
 #import <IOBluetooth/IOBluetooth.h>
 #endif  // defined(OS_IOS)
 
 #include <stdint.h>
 
 #include <set>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "crypto/sha2.h"
 #include "device/bluetooth/bluetooth_device_mac.h"
 
+@class BluetoothLowEnergyPeripheralDelegate;
+
 namespace device {
 
 class BluetoothAdapterMac;
 class BluetoothLowEnergyDiscoverManagerMac;
+class BluetoothRemoteGattServiceMac;
 
 class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
     : public BluetoothDeviceMac {
  public:
   BluetoothLowEnergyDeviceMac(BluetoothAdapterMac* adapter,
                               CBPeripheral* peripheral,
                               NSDictionary* advertisement_data,
                               int rssi);
   ~BluetoothLowEnergyDeviceMac() override;
 
@@ skipping 41 matching lines @@
       const ConnectToServiceCallback& callback,
       const ConnectToServiceErrorCallback& error_callback) override;
 
   // BluetoothDeviceMac override.
   NSDate* GetLastUpdateTime() const override;
 
  protected:
   // BluetoothDevice override.
   std::string GetDeviceName() const override;
   void CreateGattConnectionImpl() override;
+  void DidConnectGatt() override;
   void DisconnectGatt() override;
 
+  // Methods for BluetoothLowEnergyPeripheralBridge.

[ortuno, 2016/05/06 16:03:32]

nit: Methods used by BluetoothLowEnergyPeripheralBridge.

[jlebel, 2016/05/07 00:16:10]

Done.

+  void DidDiscoverPrimaryServices(NSError* error);
+  void DidModifyServices(NSArray* invalidatedServices);
+
   // Updates information about the device.
   virtual void Update(NSDictionary* advertisement_data, int rssi);
 
   static std::string GetPeripheralIdentifier(CBPeripheral* peripheral);
 
   // Hashes and truncates the peripheral identifier to deterministically
   // construct an address. The use of fake addresses is a temporary fix before
   // we switch to using bluetooth identifiers throughout Chrome.
   // http://crbug.com/507824
   static std::string GetPeripheralHashAddress(CBPeripheral* peripheral);
 
  private:
   friend class BluetoothAdapterMac;
   friend class BluetoothAdapterMacTest;
+  friend class BluetoothLowEnergyPeripheralBridge;
   friend class BluetoothTestMac;
 
   // Returns the Bluetooth adapter.
   BluetoothAdapterMac* GetMacAdapter();
 
   // Returns the CoreBluetooth Peripheral.
   CBPeripheral* GetPeripheral();
 
+  // Returns BluetoothRemoteGattServiceMac based on the CBService.
+  BluetoothRemoteGattServiceMac* GetBluetoothRemoteGattService(
+      CBService* service) const;
+
   // Callback used when the CoreBluetooth Peripheral is disconnected.
   void DidDisconnectPeripheral(BluetoothDevice::ConnectErrorCode error_code);
 
   // CoreBluetooth data structure.
   base::scoped_nsobject<CBPeripheral> peripheral_;
+  base::scoped_nsobject<BluetoothLowEnergyPeripheralDelegate>

[ortuno, 2016/05/06 16:03:32]

nit: Add comment for this member.

[jlebel, 2016/05/07 00:16:10]

Done.

+      peripheral_delegate_;
 
   // RSSI value.
   int rssi_;
 
   // Whether the device is connectable.
   bool connectable_;
 
   // The peripheral's identifier, as returned by [CBPeripheral identifier].
   std::string identifier_;
 
   // A local address for the device created by hashing the peripheral
   // identifier.
   std::string hash_address_;
 
   // Stores the time of the most recent call to Update().
   base::scoped_nsobject<NSDate> last_update_time_;
 
   // The services (identified by UUIDs) that this device provides.
   std::set<BluetoothUUID> advertised_uuids_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothLowEnergyDeviceMac);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DEVICE_MAC_H_