bluetooth: Remove queuing of GetCharacteristicsCallbacks

device/bluetooth/device.cc

 // Copyright 2016 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 <utility>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "device/bluetooth/device.h"
@@ skipping 82 matching lines @@
   // safe.
   pending_services_requests_.push_back(
       base::Bind(&Device::GetServicesImpl, base::Unretained(this), callback));
 }
 
 void Device::GetCharacteristics(const std::string& service_id,
                                 const GetCharacteristicsCallback& callback) {
   device::BluetoothDevice* device = adapter_->GetDevice(GetAddress());
   DCHECK(device);
 
-  if (device->IsGattServicesDiscoveryComplete()) {
-    GetCharacteristicsImpl(service_id, callback);
+  device::BluetoothRemoteGattService* service =
+      device->GetGattService(service_id);
+  if (service == nullptr) {
+    callback.Run(base::nullopt);
     return;
   }
 
-  // pending_services_requests_ is owned by Device, so base::Unretained is
-  // safe.
-  pending_services_requests_.push_back(
-      base::Bind(&Device::GetCharacteristicsImpl, base::Unretained(this),
-                 service_id, callback));
+  std::vector<mojom::CharacteristicInfoPtr> characteristics;
+
+  for (const auto* characteristic : service->GetCharacteristics()) {
+    mojom::CharacteristicInfoPtr characteristic_info =
+        mojom::CharacteristicInfo::New();
+
+    characteristic_info->id = characteristic->GetIdentifier();
+    characteristic_info->uuid = characteristic->GetUUID();
+    characteristic_info->properties = characteristic->GetProperties();
+
+    characteristics.push_back(std::move(characteristic_info));
+  }
+
+  callback.Run(std::move(characteristics));
 }
 
 Device::Device(scoped_refptr<device::BluetoothAdapter> adapter,
                std::unique_ptr<device::BluetoothGattConnection> connection)
     : adapter_(std::move(adapter)), connection_(std::move(connection)) {
   adapter_->AddObserver(this);
 }
 
 void Device::GetServicesImpl(const GetServicesCallback& callback) {
   device::BluetoothDevice* device = adapter_->GetDevice(GetAddress());
@@ skipping 13 matching lines @@
     const device::BluetoothRemoteGattService& service) {
   mojom::ServiceInfoPtr service_info = mojom::ServiceInfo::New();
 
   service_info->id = service.GetIdentifier();
   service_info->uuid = service.GetUUID();
   service_info->is_primary = service.IsPrimary();
 
   return service_info;
 }
 
-void Device::GetCharacteristicsImpl(
-    const std::string& service_id,
-    const GetCharacteristicsCallback& callback) {
-  device::BluetoothDevice* device = adapter_->GetDevice(GetAddress());
-  DCHECK(device);
-  device::BluetoothRemoteGattService* service =
-      device->GetGattService(service_id);
-  DCHECK(service);
-
-  std::vector<mojom::CharacteristicInfoPtr> characteristics;
-
-  for (const auto* characteristic : service->GetCharacteristics()) {
-    mojom::CharacteristicInfoPtr characteristic_info =
-        mojom::CharacteristicInfo::New();
-
-    characteristic_info->id = characteristic->GetIdentifier();
-    characteristic_info->uuid = characteristic->GetUUID();
-    characteristic_info->properties = characteristic->GetProperties();
-
-    characteristics.push_back(std::move(characteristic_info));
-  }
-
-  callback.Run(std::move(characteristics));
-}
-
 const std::string& Device::GetAddress() {
   return connection_->GetDeviceAddress();
 }
 
 }  // namespace bluetooth