Handle change of BLE address after pairing

device/bluetooth/bluetooth_adapter_chromeos.cc

 // 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_chromeos.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 423 matching lines @@
     const dbus::ObjectPath& object_path,
     const std::string& property_name) {
   BluetoothDeviceChromeOS* device_chromeos = GetDeviceWithPath(object_path);
   if (!device_chromeos)
     return;
 
   BluetoothDeviceClient::Properties* properties =
       DBusThreadManager::Get()->GetBluetoothDeviceClient()->
           GetProperties(object_path);
 
+  if (property_name == properties->address.name()) {
+    for (DevicesMap::const_iterator iter = devices_.begin();
+         iter != devices_.end(); ++iter) {

[armansito, 2015/09/25 18:42:30]

nit: for (const auto& iter : devices_)

[jpawlowski1, 2015/09/25 19:25:45]

I need iterator, want to call erase() with iterator. But would use auto type for
it

+      if (iter->second->GetAddress() == device_chromeos->GetAddress()) {
+        std::string old_address = iter->first;
+        VLOG(1) << "Device changed address, old: " << old_address
+                << " new: " << device_chromeos->GetAddress();
+        devices_.erase(iter);
+
+        DCHECK(devices_.find(device_chromeos->GetAddress()) == devices_.end());
+        devices_[device_chromeos->GetAddress()] = device_chromeos;
+        NotifyDeviceAddressChanged(device_chromeos, old_address);
+        break;
+      }
+    }
+  }
+
   if (property_name == properties->bluetooth_class.name() ||
       property_name == properties->address.name() ||
       property_name == properties->alias.name() ||
       property_name == properties->paired.name() ||
       property_name == properties->trusted.name() ||
       property_name == properties->connected.name() ||
       property_name == properties->uuids.name() ||
       property_name == properties->rssi.name() ||
       property_name == properties->tx_power.name()) {
     NotifyDeviceChanged(device_chromeos);
@@ skipping 408 matching lines @@
 
 void BluetoothAdapterChromeOS::NotifyDeviceChanged(
     BluetoothDeviceChromeOS* device) {
   DCHECK(device);
   DCHECK(device->adapter_ == this);
 
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                     DeviceChanged(this, device));
 }
 
+void BluetoothAdapterChromeOS::NotifyDeviceAddressChanged(
+    BluetoothDeviceChromeOS* device,
+    const std::string& old_address) {
+  DCHECK(device->adapter_ == this);
+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
+                    DeviceAddressChanged(this, device, old_address));
+}
+
 void BluetoothAdapterChromeOS::NotifyGattServiceAdded(
     BluetoothRemoteGattServiceChromeOS* service) {
   DCHECK_EQ(service->GetAdapter(), this);
   DCHECK_EQ(
       static_cast<BluetoothDeviceChromeOS*>(service->GetDevice())->adapter_,
       this);
 
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
                     observers_,
                     GattServiceAdded(this, service->GetDevice(), service));
@@ skipping 583 matching lines @@
 
     // If the queued request resulted in a pending call, then let it
     // asynchonously process the remaining queued requests once the pending
     // call returns.
     if (discovery_request_pending_)
       return;
   }
 }
 
 }  // namespace chromeos