Adding Hashed Address to BluetoothLowEnergyDeviceMac

device/bluetooth/bluetooth_adapter_mac.mm

 // 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.
 
 #include "device/bluetooth/bluetooth_adapter_mac.h"
 
 #import <IOBluetooth/objc/IOBluetoothDevice.h>
 #import <IOBluetooth/objc/IOBluetoothHostController.h>
 
 #include <string>
@@ skipping 13 matching lines @@
 #include "device/bluetooth/bluetooth_classic_device_mac.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/bluetooth_socket_mac.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
 namespace {
 
 // The frequency with which to poll the adapter for updates.
 const int kPollIntervalMs = 500;
 
-// The length of time that must elapse since the last Inquiry response before a
-// discovered Classic device is considered to be no longer available.
-const NSTimeInterval kDiscoveryTimeoutSec = 3 * 60;  // 3 minutes
-
 }  // namespace
 
 namespace device {
 
+const NSTimeInterval BluetoothAdapterMac::kDiscoveryTimeoutSec =
+    3 * 60;  // 3 minutes
+
 // static
 base::WeakPtr<BluetoothAdapter> BluetoothAdapter::CreateAdapter(
     const InitCallback& init_callback) {
   return BluetoothAdapterMac::CreateAdapter();
 }
 
 // static
 base::WeakPtr<BluetoothAdapter> BluetoothAdapterMac::CreateAdapter() {
   BluetoothAdapterMac* adapter = new BluetoothAdapterMac();
   adapter->Init();
@@ skipping 237 matching lines @@
 }
 
 void BluetoothAdapterMac::Init() {
   ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
   PollAdapter();
 }
 
 void BluetoothAdapterMac::InitForTest(
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner) {
   ui_task_runner_ = ui_task_runner;
-  PollAdapter();
 }
 
 void BluetoothAdapterMac::PollAdapter() {
   // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/461181
   // is fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "461181 BluetoothAdapterMac::PollAdapter::Start"));
   bool was_present = IsPresent();
   std::string address;
@@ skipping 42 matching lines @@
   if (powered_ != powered) {
     powered_ = powered;
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       AdapterPoweredChanged(this, powered_));
   }
 
   // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/461181
   // is fixed.
   tracked_objects::ScopedTracker tracking_profile5(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "461181 BluetoothAdapterMac::PollAdapter::UpdateDevices"));
-  UpdateDevices();
+          "461181 BluetoothAdapterMac::PollAdapter::RemoveTimedOutDevices"));
+  RemoveTimedOutDevices();
+
+  // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/461181
+  // is fixed.
+  tracked_objects::ScopedTracker tracking_profile6(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION(
+          "461181 BluetoothAdapterMac::PollAdapter::AddPairedDevices"));
+  AddPairedDevices();
 
   ui_task_runner_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&BluetoothAdapterMac::PollAdapter,
                  weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kPollIntervalMs));
 }
 
 void BluetoothAdapterMac::ClassicDeviceAdded(IOBluetoothDevice* device) {
   std::string device_address =
       BluetoothClassicDeviceMac::GetDeviceAddress(device);
 
   // Only notify observers once per device.
   if (devices_.count(device_address))
     return;
 
   devices_[device_address] = new BluetoothClassicDeviceMac(device);
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
                     observers_,
                     DeviceAdded(this, devices_[device_address]));
 }
 
-// TODO(krstnmnlsn): This method to be implemented as soon as UpdateDevices can
-// handle instances of LowEnergyBluetoothDevice in |devices_|. crbug.com/498009
+// TODO(krstnmnlsn): Implement method.

[scheib, 2015/07/01 17:29:44]

Have an issue number. The previous comment is probably fine.

[krstnmnlsn, 2015/07/02 00:25:30]

Sure.  I removed the comment because as of this change itself there is no longer
anything blocking implementation of this method (and so I thought the
comment/issue might be confusing).

 void BluetoothAdapterMac::LowEnergyDeviceUpdated(
     CBPeripheral* peripheral,
     NSDictionary* advertisementData,
     int rssi) {
 }
 
-void BluetoothAdapterMac::UpdateDevices() {
+void BluetoothAdapterMac::RemoveTimedOutDevices() {
   // Notify observers if any previously seen devices are no longer available,
   // i.e. if they are no longer paired, connected, nor recently discovered via
   // an inquiry.
   std::set<std::string> removed_devices;
   for (DevicesMap::iterator it = devices_.begin(); it != devices_.end(); ++it) {
     BluetoothDevice* device = it->second;
     if (device->IsPaired() || device->IsConnected())
       continue;
 
     NSDate* last_update_time =
         static_cast<BluetoothDeviceMac*>(device)->GetLastUpdateTime();
     if (last_update_time &&
         -[last_update_time timeIntervalSinceNow] < kDiscoveryTimeoutSec)
       continue;
 
     FOR_EACH_OBSERVER(
         BluetoothAdapter::Observer, observers_, DeviceRemoved(this, device));
     delete device;
     removed_devices.insert(it->first);
     // The device will be erased from the map in the loop immediately below.
   }
   for (const std::string& device_address : removed_devices) {
     size_t num_removed = devices_.erase(device_address);
     DCHECK_EQ(num_removed, 1U);
   }
+}
 
+void BluetoothAdapterMac::AddPairedDevices() {
   // Add any new paired devices.
   for (IOBluetoothDevice* device in [IOBluetoothDevice pairedDevices]) {
     ClassicDeviceAdded(device);
   }
 }
 
 }  // namespace device