bluetooth: Replace old advertised uuids

device/bluetooth/bluetooth_device.h

 // Copyright (c) 2012 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_BLUETOOTH_DEVICE_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 272 matching lines @@
   // we consider a call is ongoing if none of the callbacks passed to Connect()
   // were called after the corresponding call to Connect().
   virtual bool IsConnecting() const = 0;
 
   // Indicates whether the device can be trusted, based on device properties,
   // such as vendor and product id.
   bool IsTrustable() const;
 
   // Returns the set of UUIDs that this device supports. For classic Bluetooth
   // devices this data is collected from both the EIR data and SDP tables,
-  // for Low Energy devices this data is collected from AD and GATT primary
-  // services, for dual mode devices this may be collected from both./
-  virtual UUIDList GetUUIDs() const = 0;
+  // For non-connected Low Energy Devices this returns the latest advertised

[scheib, 2016/08/05 18:49:31]

optional:
* Use some bullets.
* There are a few cases described.
* I at least like bullets.

[ortuno, 2016/08/05 23:00:17]

Done.

+  // UUIDs. For Low Energy connected devices for which services have been
+  // discovered we return the UUIDs of the device's services. If the services
+  // have not been discovered yet we return an empty list.
+  // For dual mode devices this may be collected from both.
+  //
+  // Note: On ChromeOS and Linux, Bluez persists all services meaning if
+  // a device stops advertising a service this function will still return
+  // its UUID.
+  virtual UUIDList GetUUIDs() const;
 
   // The received signal strength, in dBm. This field is avaliable and valid
   // only during discovery. If not during discovery, or RSSI wasn't reported,
   // this method will return |kUnknownPower|.
   virtual int16_t GetInquiryRSSI() const = 0;
 
   // The transmitted power level. This field is avaliable only for LE devices
   // that include this field in AD. It is avaliable and valid only during
   // discovery. If not during discovery, or TxPower wasn't reported, this
   // method will return |kUnknownPower|.
@@ skipping 179 matching lines @@
 
   // Update the last time this device was seen.
   void UpdateTimestamp();
 
   // Return associated BluetoothAdapter.
   BluetoothAdapter* GetAdapter() { return adapter_; }
 
  protected:
   // BluetoothGattConnection is a friend to call Add/RemoveGattConnection.
   friend BluetoothGattConnection;
+  FRIEND_TEST_ALL_PREFIXES(BluetoothTest, GetUUIDs);
   FRIEND_TEST_ALL_PREFIXES(
       BluetoothTest,
       BluetoothGattConnection_DisconnectGatt_SimulateConnect);
   FRIEND_TEST_ALL_PREFIXES(
       BluetoothTest,
       BluetoothGattConnection_DisconnectGatt_SimulateDisconnect);
   FRIEND_TEST_ALL_PREFIXES(BluetoothTest,
                            BluetoothGattConnection_ErrorAfterConnection);
   FRIEND_TEST_ALL_PREFIXES(BluetoothTest,
                            BluetoothGattConnection_DisconnectGatt_Cleanup);
@@ skipping 53 matching lines @@
   std::set<BluetoothGattConnection*> gatt_connections_;
 
   // Mapping from the platform-specific GATT service identifiers to
   // BluetoothRemoteGattService objects.
   typedef base::ScopedPtrHashMap<std::string,
                                  std::unique_ptr<BluetoothRemoteGattService>>
       GattServiceMap;
   GattServiceMap gatt_services_;
   bool gatt_services_discovery_complete_;
 
+  std::unordered_set<BluetoothUUID, BluetoothUUIDHash> advertised_uuids_;

[scheib, 2016/08/05 18:49:31]

optional... we already have the code to gather all UUIDs from services once
discovered. I recommend changing this to just 'uuids_', and upon service
discovery complete gathering all uuids from services and storing here. GetUUIDs
then is then cheaper with the same amount of code -- but we expect it to be
called fairly often as client code tries to understand devices.

[ortuno, 2016/08/08 22:56:39]

Done. Forgot to mark this done the first time.

+
   // Mapping from service UUID represented as a std::string of a bluetooth
   // service to
   // the specific data. The data is stored as BinaryValue.
   std::unique_ptr<base::DictionaryValue> services_data_;
 
   // Timestamp for when an advertisement was last seen.
   base::Time last_update_time_;
 
  private:
   // Returns a localized string containing the device's bluetooth address and
   // a device type for display when |name_| is empty.
   base::string16 GetAddressWithLocalizedDeviceTypeName() const;
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_H_