Invoke GattDiscoveryCompleteForService by observing ServicesResolved property

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>
@@ skipping 20 matching lines @@
 
 // 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;
   std::string GetAddress() const override;
   VendorIDSource GetVendorIDSource() const override;
   uint16_t GetVendorID() const override;
   uint16_t GetProductID() const override;
   uint16_t GetDeviceID() const override;
   uint16_t GetAppearance() const override;
@@ skipping 66 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::BluetoothGattServiceClient::Observer overrides.
+  // 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 and |DevicePropertyChanged()| to  initialize the

[rkc, 2016/05/17 18:38:50]

Fix comment. We don't call this from DevicePropertyChanged.

[scheib, 2016/05/17 19:24:47]

Still, this is only called by the constructor, not DevicePropertyChanged.

Single space after 'to'.

[Miao, 2016/05/18 03:26:58]

Done.

+  // map of GATT services associated with this device and to invoke
+  // NotifyGattDiscoveryComplete() with each cached service.
+  void InitializeGattServiceMap();
+
   // 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 58 matching lines @@
   int num_connecting_calls_;
 
   // True if the connection monitor has been started, tracking the connection
   // RSSI and TX power.
   bool connection_monitor_started_;
 
   // 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_