bluetooth: windows: Mark characteristic discovered

Currently characteristics are not getting marked discovered.  This
change fixes that.

At the moment, this does not bubble up a services discovered event, so
a test for this will be made in a subsequent change.
https://chromium-review.googlesource.com/c/chromium/src/+/730653/

BUG=507419

Change-Id: Ie6a510ee2ae6d97e34760822fe7b01f65e28337d
Reviewed-on: https://chromium-review.googlesource.com/735983
Commit-Queue: Conley Owens <cco3@chromium.org>
Reviewed-by: Vincent Scheib <scheib@chromium.org>
Reviewed-by: Matt Reynolds <mattreynolds@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517677}

device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc

@@ -27,6 +27,7 @@ BluetoothRemoteGattCharacteristicWin::BluetoothRemoteGattCharacteristicWin(
       characteristic_added_notified_(false),
       characteristic_value_read_or_write_in_progress_(false),
       gatt_event_handle_(nullptr),
+      discovery_pending_count_(0),
       weak_ptr_factory_(this) {
   DCHECK(ui_task_runner_->RunsTasksInCurrentSequence());
   DCHECK(parent_service_);
@@ -205,6 +206,7 @@ void BluetoothRemoteGattCharacteristicWin::WriteRemoteCharacteristic(
 void BluetoothRemoteGattCharacteristicWin::Update() {
   DCHECK(ui_task_runner_->RunsTasksInCurrentSequence());
 
+  ++discovery_pending_count_;
   task_manager_->PostGetGattIncludedDescriptors(
       parent_service_->GetServicePath(), characteristic_info_.get(),
       base::Bind(&BluetoothRemoteGattCharacteristicWin::
@@ -251,6 +253,10 @@ void BluetoothRemoteGattCharacteristicWin::OnGetIncludedDescriptorsCallback(
     characteristic_added_notified_ = true;
     parent_service_->GetWinAdapter()->NotifyGattCharacteristicAdded(this);
   }
+
+  // Report discovery complete.
+  if (--discovery_pending_count_ == 0)
+    parent_service_->GattCharacteristicDiscoveryComplete(this);
 }
 
 void BluetoothRemoteGattCharacteristicWin::UpdateIncludedDescriptors(

device/bluetooth/bluetooth_remote_gatt_characteristic_win.h

@@ -130,6 +130,10 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicWin
   // GATT event handle returned by GattEventRegistrationCallback.
   PVOID gatt_event_handle_;
 
+  // Counts the number of asynchronous operations that are discovering
+  // descriptors.
+  int discovery_pending_count_;
+
   base::WeakPtrFactory<BluetoothRemoteGattCharacteristicWin> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattCharacteristicWin);
 };

device/bluetooth/bluetooth_remote_gatt_service_unittest.cc

@@ -21,7 +21,7 @@ namespace device {
 
 #if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)
 class BluetoothRemoteGattServiceTest : public BluetoothTest {};
-#endif
+#endif  // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN)
 
 // Android is excluded because it fires a single discovery event per device.
 #if defined(OS_WIN) || defined(OS_MACOSX)