bluetooth: mac: Initial BluetoothRemoteGattCharacteristicMac implementation

device/bluetooth/bluetooth_low_energy_device_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_device_mac.h"
 
 #import <CoreFoundation/CoreFoundation.h>
 #include <stddef.h>
 
 #include "base/mac/mac_util.h"
@@ skipping 240 matching lines @@
         GetBluetoothRemoteGattService(cb_service);
     if (!gatt_service) {
       gatt_service = new BluetoothRemoteGattServiceMac(this, cb_service,
                                                        true /* is_primary */);
       auto result_iter = gatt_services_.add(gatt_service->GetIdentifier(),
                                             base::WrapUnique(gatt_service));
       DCHECK(result_iter.second);
       adapter_->NotifyGattServiceAdded(gatt_service);
     }
   }
-  // TODO(http://crbug.com/609064): Services are fully discovered once all
-  // characteristics have been found.
-  SetGattServicesDiscoveryComplete(true);
-  adapter_->NotifyGattServicesDiscovered(this);
+  for (GattServiceMap::const_iterator it = gatt_services_.begin();
+       it != gatt_services_.end(); ++it) {
+    device::BluetoothRemoteGattService* gatt_service = it->second;
+    device::BluetoothRemoteGattServiceMac* gatt_service_mac =
+        static_cast<BluetoothRemoteGattServiceMac*>(gatt_service);
+    gatt_service_mac->DiscoverCharacteristics();
+  }
+}
+
+void BluetoothLowEnergyDeviceMac::DidDiscoverCharacteristics(
+    CBService* cb_service,
+    NSError* error) {
+  if (error) {
+    // TODO(http://crbug.com/609320): Need to pass the error.
+    // TODO(http://crbug.com/609844): Decide what to do if we fail to discover

[msarda, 2016/06/14 09:15:05]

Do not use we in comments.

[jlebel, 2016/06/15 16:16:36]

Done.

+    // a device services.
+    VLOG(1) << "Can't discover characteristics: "
+            << error.localizedDescription.UTF8String << " (" << error.domain
+            << ": " << error.code << ")";
+    return;
+  }
+  BluetoothRemoteGattServiceMac* gatt_service =
+      GetBluetoothRemoteGattService(cb_service);
+  DCHECK(gatt_service);
+  gatt_service->DidDiscoverCharacteristics();
+
+  // Notify when all services have been discovered.
+  bool discovery_complete = true;
+  for (GattServiceMap::const_iterator it = gatt_services_.begin();

[ortuno, 2016/06/13 20:51:19]

I think you could do:

bool discovery_complete = std::find_if_not(
  gatt_services_.begin(), gatt_services_.end(), [](BluetoothRemoteGattService*
service) {
    return
static_cast<BluetoothRemoteGattServiceMac*>(service)->IsDiscoveryComplete();
}) == gatt_services_.end();

[jlebel, 2016/06/15 16:16:36]

Done.

+       it != gatt_services_.end(); ++it) {
+    device::BluetoothRemoteGattService* gatt_service = it->second;

[ortuno, 2016/06/13 20:51:19]

Why do you need "device::" here?

[jlebel, 2016/06/15 16:16:36]

Done.

+    device::BluetoothRemoteGattServiceMac* gatt_service_mac =
+        static_cast<BluetoothRemoteGattServiceMac*>(gatt_service);
+    discovery_complete = gatt_service_mac->IsDiscoveryComplete();
+    if (!discovery_complete) {

[msarda, 2016/06/14 09:15:05]

I think this could just be:
if (!gatt_service_mac->IsDiscoveryComplete()) {
  return;
}

and you could remove the "discovery_complete" variable.

[jlebel, 2016/06/15 16:16:36]

Done.

+      break;
+    }
+  }
+  if (discovery_complete) {
+    SetGattServicesDiscoveryComplete(true);
+    adapter_->NotifyGattServicesDiscovered(this);
+  }
 }
 
 void BluetoothLowEnergyDeviceMac::DidModifyServices(
     NSArray* invalidatedServices) {
   for (CBService* cb_service in invalidatedServices) {
     BluetoothRemoteGattServiceMac* gatt_service =
         GetBluetoothRemoteGattService(cb_service);
     DCHECK(gatt_service);
     std::unique_ptr<BluetoothRemoteGattService> scoped_service =
         gatt_services_.take_and_erase(gatt_service->GetIdentifier());
@@ skipping 53 matching lines @@
   GattServiceMap gatt_services_swapped;
   gatt_services_swapped.swap(gatt_services_);
   gatt_services_swapped.clear();
   if (create_gatt_connection_error_callbacks_.empty()) {
     // TODO(http://crbug.com/585897): Need to pass the error.
     DidDisconnectGatt();
   } else {
     DidFailToConnectGatt(error_code);
   }
 }