Bluetooth: mac: add connected BLE devices at startup

device/bluetooth/bluetooth_adapter_mac.mm

 // Copyright 2013 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_adapter_mac.h"
 
 #import <IOBluetooth/objc/IOBluetoothDevice.h>
 #import <IOBluetooth/objc/IOBluetoothHostController.h>
 #include <stddef.h>
 
@@ skipping 361 matching lines @@
     // Begin a low energy discovery session or update it if one is already
     // running.
     if (IsLowEnergyAvailable())
       low_energy_discovery_manager_->StartDiscovery(
           BluetoothDevice::UUIDList());
   }
   return true;
 }
 
 void BluetoothAdapterMac::Init() {
+  if (IsLowEnergyAvailable())
+    AddConnectedLowEnergyDevices();
   ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
   PollAdapter();
 }
 
 void BluetoothAdapterMac::InitForTest(
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner) {
   ui_task_runner_ = ui_task_runner;
 }
 
 void BluetoothAdapterMac::PollAdapter() {
@@ skipping 56 matching lines @@
   // is fixed.
   tracked_objects::ScopedTracker tracking_profile5(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "461181 BluetoothAdapterMac::PollAdapter::RemoveTimedOutDevices"));
   RemoveTimedOutDevices();
 
   // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/461181
   // is fixed.
   tracked_objects::ScopedTracker tracking_profile6(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "461181 BluetoothAdapterMac::PollAdapter::AddPairedDevices"));
-  AddPairedDevices();
+          "461181 BluetoothAdapterMac::PollAdapter::AddPairedClassicDevices"));
+  AddPairedClassicDevices();
 
   ui_task_runner_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&BluetoothAdapterMac::PollAdapter,
                  weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kPollIntervalMs));
 }
 
 void BluetoothAdapterMac::ClassicDeviceAdded(IOBluetoothDevice* device) {
   std::string device_address =
@@ skipping 87 matching lines @@
                       DeviceAdded(this, device_mac));
   } else {
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       DeviceChanged(this, device_mac));
   }
 }
 
 // TODO(krstnmnlsn): Implement. crbug.com/511025
 void BluetoothAdapterMac::LowEnergyCentralManagerUpdatedState() {}
 
-void BluetoothAdapterMac::AddPairedDevices() {
-  // Add any new paired devices.
+void BluetoothAdapterMac::AddPairedClassicDevices() {
   for (IOBluetoothDevice* device in [IOBluetoothDevice pairedDevices]) {
-    ClassicDeviceAdded(device);
+    IOBluetoothSDPServiceRecord* pnp_information =

[jracle (use Gerrit), 2016/09/02 14:23:10]

Still need to confirm this logic.

+        [device getServiceRecordForUUID:
+                    [IOBluetoothSDPUUID
+                        uuid16:kBluetoothSDPUUID16ServiceClassPnPInformation]];
+
+    // IOBluetoothDevice instance is a Bluetooth Classic device if it has a PNP
+    // information service SDP entry.
+    if (pnp_information) {
+      ClassicDeviceAdded(device);
+    }
   }
 }
 
+void BluetoothAdapterMac::AddConnectedLowEnergyDevices() {
+  // Look for Device Information Service. BLE devices should implement it.
+  CBUUID* device_information_uuid = [CBUUID UUIDWithString:@"180A"];
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpartial-availability"

[jracle (use Gerrit), 2016/09/02 14:23:10]

Passing nil in following line causes -Wnonnull to show-up at compile-time.
Tryed to ignore it : crashed Chrome at run-time.
Seems that [retrieveConnectedPeripheralsWithServices:nil] crashed (didn't
debug).

+  // This list of devices contain both devices that are connected by other apps
+  // or by system. In that case, user will need to connect peripheral using
+  // CBCentralManager's connectPeripheral:options: method.
+  NSArray<CBPeripheral*>* connected_peripherals = [low_energy_central_manager_
+      retrieveConnectedPeripheralsWithServices:@[ device_information_uuid ]];
+#pragma clang diagnostic pop
+
+  for (CBPeripheral* peripheral in connected_peripherals) {
+    BluetoothLowEnergyDeviceMac* device_mac =
+        GetBluetoothLowEnergyDeviceMac(peripheral);
+
+    if (!device_mac) {
+      device_mac = new BluetoothLowEnergyDeviceMac(this, peripheral);
+      std::string device_address =
+          BluetoothLowEnergyDeviceMac::GetPeripheralHashAddress(peripheral);
+      devices_.add(device_address,
+                   std::unique_ptr<BluetoothDevice>(device_mac));
+      FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
+                        DeviceAdded(this, device_mac));
+    }
+  }
+}
+
 void BluetoothAdapterMac::CreateGattConnection(
     BluetoothLowEnergyDeviceMac* device_mac) {
   [low_energy_central_manager_ connectPeripheral:device_mac->peripheral_
                                          options:nil];
 }
 
 void BluetoothAdapterMac::DisconnectGatt(
     BluetoothLowEnergyDeviceMac* device_mac) {
   [low_energy_central_manager_
       cancelPeripheralConnection:device_mac->peripheral_];
@@ skipping 51 matching lines @@
   std::string device_address =
       BluetoothLowEnergyDeviceMac::GetPeripheralHashAddress(peripheral);
   DevicesMap::const_iterator iter = devices_.find(device_address);
   if (iter == devices_.end()) {
     return nil;
   }
   return static_cast<BluetoothLowEnergyDeviceMac*>(iter->second);
 }
 
 }  // namespace device