Adding Hashed Address to BluetoothLowEnergyDeviceMac

device/bluetooth/bluetooth_adapter_mac.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_BLUETOOTH_ADAPTER_MAC_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_MAC_H_
 
 #include <IOKit/IOReturn.h>
 
 #include <string>
@@ skipping 65 matching lines @@
       const BluetoothAudioSink::ErrorCallback& error_callback) override;
   void RegisterAdvertisement(
       scoped_ptr<BluetoothAdvertisement::Data> advertisement_data,
       const CreateAdvertisementCallback& callback,
       const CreateAdvertisementErrorCallback& error_callback) override;
 
   // BluetoothDiscoveryManagerMac::Observer overrides:
   void ClassicDeviceFound(IOBluetoothDevice* device) override;
   void ClassicDiscoveryStopped(bool unexpected) override;
 
-  // BluetoothLowEnergyDiscoveryManagerMac::Observer override:
-  void LowEnergyDeviceUpdated(CBPeripheral* peripheral,
-                              NSDictionary* advertisementData,
-                              int rssi) override;
-
   // Registers that a new |device| has connected to the local host.
   void DeviceConnected(IOBluetoothDevice* device);
 
  protected:
   // BluetoothAdapter override:
   void RemovePairingDelegateInternal(
       device::BluetoothDevice::PairingDelegate* pairing_delegate) override;
 
  private:
   friend class BluetoothAdapterMacTest;
@@ skipping 17 matching lines @@
   bool StartDiscovery(BluetoothDiscoveryFilter* discovery_filter);
 
   void Init();
   void InitForTest(scoped_refptr<base::SequencedTaskRunner> ui_task_runner);
   void PollAdapter();
 
   // Registers that a new |device| has replied to an Inquiry, is paired, or has
   // connected to the local host.
   void ClassicDeviceAdded(IOBluetoothDevice* device);
 
-  // Updates |devices_| to include the currently paired devices, as well as any
-  // connected, but unpaired, devices. Notifies observers if any previously
-  // paired or connected devices are no longer present.
-  void UpdateDevices();
+  // BluetoothLowEnergyDiscoveryManagerMac::Observer override:
+  void LowEnergyDeviceUpdated(CBPeripheral* peripheral,
+                              NSDictionary* advertisementData,
+                              int rssi) override;
+
+  // Removes from |devices_| any previously paired, connected or seen devices
+  // which are no longer present. Notifies observers.
+  void RemoveTimedOutDevices();
+
+  // Updates |devices_| to include the currently paired devices and notifies
+  // observers.
+  void AddPairedDevices();
 
   std::string address_;
   std::string name_;
   bool powered_;
 
   int num_discovery_sessions_;
 
   // Discovery manager for Bluetooth Classic.
   scoped_ptr<BluetoothDiscoveryManagerMac> classic_discovery_manager_;
 
   // Discovery manager for Bluetooth Low Energy.
   scoped_ptr<BluetoothLowEnergyDiscoveryManagerMac>
       low_energy_discovery_manager_;
 
   scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
 
+  // The length of time that must elapse since the last Inquiry response (on
+  // Classic devices) or call to BluetoothLowEnergyDevice::Update() (on Low
+  // Energy) before a discovered device is considered to be no longer available.
+  const static NSTimeInterval kDiscoveryTimeoutSec;

[armansito, 2015/07/07 19:07:21]

Move this above member variable declarations, per style guide.

[krstnmnlsn, 2015/07/07 21:58:01]

Done.

+
   base::WeakPtrFactory<BluetoothAdapterMac> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterMac);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_MAC_H_