bluetooth: Refactor how we update based on Advertising Data

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 43 matching lines @@
   uint16_t GetVendorID() const override;
   uint16_t GetProductID() const override;
   uint16_t GetDeviceID() const override;
   uint16_t GetAppearance() const override;
   base::Optional<std::string> GetName() const override;
   bool IsPaired() const override;
   bool IsConnected() const override;
   bool IsGattConnected() const override;
   bool IsConnectable() const override;
   bool IsConnecting() const override;
-  UUIDList GetUUIDs() const override;
+  UUIDSet GetUUIDs() const override;
   base::Optional<int8_t> GetInquiryRSSI() const override;
   base::Optional<int8_t> GetInquiryTxPower() const override;
   bool ExpectingPinCode() const override;
   bool ExpectingPasskey() const override;
   bool ExpectingConfirmation() const override;
   void GetConnectionInfo(const ConnectionInfoCallback& callback) override;
   void Connect(device::BluetoothDevice::PairingDelegate* pairing_delegate,
                const base::Closure& callback,
                const ConnectErrorCallback& error_callback) override;
   void SetPinCode(const std::string& pincode) override;
@@ skipping 138 matching lines @@
   // Called by dbus:: on failure of the D-Bus method call to unpair the device;
   // there is no matching completion call since this object is deleted in the
   // process of unpairing.
   void OnForgetError(const ErrorCallback& error_callback,
                      const std::string& error_name,
                      const std::string& error_message);
 
   // The dbus object path of the device object.
   dbus::ObjectPath object_path_;
 
+  BluetoothDevice::UUIDSet uuids_;

[Jeffrey Yasskin, 2016/08/19 22:08:10]

I think you don't use this in the .cc file.

[ortuno, 2016/08/23 00:38:04]

Ah right. This was leftover for when I was trying to return a reference.

+
   // 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*>
@@ skipping 12 matching lines @@
   // 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_