bluetooth: Update the map of GATT services when services resolve

device/bluetooth/bluez/bluetooth_device_bluez.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_
 #define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_common.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_export.h"
-#include "device/bluetooth/dbus/bluetooth_device_client.h"
 #include "device/bluetooth/dbus/bluetooth_gatt_service_client.h"
 
 namespace device {
 class BluetoothSocketThread;
 }  // namespace device
 
 namespace bluez {
 
 class BluetoothAdapterBlueZ;
 class BluetoothPairingBlueZ;
 class BluetoothServiceRecordBlueZ;
 
 // The BluetoothDeviceBlueZ class implements BluetoothDevice for platforms using
 // BlueZ.
 //
 // This class is not thread-safe, but is only called from the UI thread.
 //
 // A socket thread is used to create sockets but posts all callbacks on the UI
 // thread.
 class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceBlueZ
     : public device::BluetoothDevice,
-      public bluez::BluetoothDeviceClient::Observer,
       public bluez::BluetoothGattServiceClient::Observer {
  public:
   // BluetoothDevice override
   uint32_t GetBluetoothClass() const override;
   device::BluetoothTransport GetType() const override;
   std::string GetAddress() const override;
   VendorIDSource GetVendorIDSource() const override;
   uint16_t GetVendorID() const override;
   uint16_t GetProductID() const override;
   uint16_t GetDeviceID() const override;
@@ skipping 72 matching lines @@
  private:
   friend class BluetoothAdapterBlueZ;
 
   BluetoothDeviceBlueZ(
       BluetoothAdapterBlueZ* adapter,
       const dbus::ObjectPath& object_path,
       scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
       scoped_refptr<device::BluetoothSocketThread> socket_thread);
   ~BluetoothDeviceBlueZ() override;
 
-  // bluez::BluetoothDeviceClient::Observer overrides
-  void DevicePropertyChanged(const dbus::ObjectPath& object_path,
-                             const std::string& property_name) override;
-
   // bluez::BluetoothGattServiceClient::Observer overrides
   void GattServiceAdded(const dbus::ObjectPath& object_path) override;
   void GattServiceRemoved(const dbus::ObjectPath& object_path) override;
 
   // Called by the constructor to initialize the map of GATT services associated
   // with this device and to invoke NotifyGattDiscoveryComplete() with each
   // cached service.
-  void InitializeGattServiceMap();
+  void InitializeGattServicesMap();
+
+  // Called once all services have been discovered. Invokes
+  // NotifyGattDiscoveryComplete() for services for which we haven't notified
+  // before e.g. if a services is exposed during construction but services
+  // haven't been resolved yet..
+  void UpdateGattServices(const dbus::ObjectPath& object_path);

[vudentz, 2016/07/04 11:04:03]

Looks like I missed the introduction of this method, well if that is doing most
part of what InitializeGattServicesMap g perhaps we should call it directly
instead of having duplicated code.

[ortuno, 2016/07/06 21:31:46]

Good catch. Done.

 
   // Called by dbus:: on completion of the D-Bus method call to get the
   // connection attributes of the current connection to the device.
   void OnGetConnInfo(const ConnectionInfoCallback& callback,
                      int16_t rssi,
                      int16_t transmit_power,
                      int16_t max_transmit_power);
   void OnGetConnInfoError(const ConnectionInfoCallback& callback,
                           const std::string& error_name,
                           const std::string& error_message);
@@ skipping 55 matching lines @@
   // The dbus object path of the device object.
   dbus::ObjectPath object_path_;
 
   // Number of ongoing calls to Connect().
   int num_connecting_calls_;
 
   // True if the connection monitor has been started, tracking the connection
   // RSSI and TX power.
   bool connection_monitor_started_;
 
+  // Keeps track of all services for which we've called
+  // NotifyGattDiscoveryComplete().
+  std::unordered_set<device::BluetoothRemoteGattService*>
+      discovery_complete_notified_;
+
   // UI thread task runner and socket thread object used to create sockets.
   scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
   scoped_refptr<device::BluetoothSocketThread> socket_thread_;
 
-  // This vector temporarily caches the newly added services for later
-  // notification of discovery complete. Once DevicePropertyChange is invoked
-  // with a toggle of ServicesResolved property, the
-  // NotifyGattDiscoveryComplete() will be called with each service once.
-  std::vector<device::BluetoothRemoteGattService*>
-      newly_discovered_gatt_services_;
 
   // During pairing this is set to an object that we don't own, but on which
   // we can make method calls to request, display or confirm PIN Codes and
   // Passkeys. Generally it is the object that owns this one.
   std::unique_ptr<BluetoothPairingBlueZ> pairing_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothDeviceBlueZ> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceBlueZ);
 };
 
 }  // namespace bluez
 
 #endif  // DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_