Using the GATT connection address instead of cached remote_device().

components/proximity_auth/ble/bluetooth_low_energy_connection.cc

 // Copyright 2015 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 "components/proximity_auth/ble/bluetooth_low_energy_connection.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 532 matching lines @@
   std::vector<uint8> value(signal.begin(), signal.end());
   value.insert(value.end(), bytes.begin(), bytes.end());
   return WriteRequest(value, is_last_write_for_wire_message);
 }
 
 void BluetoothLowEnergyConnection::ClearWriteRequestsQueue() {
   while (!write_requests_queue_.empty())
     write_requests_queue_.pop();
 }
 
-const std::string& BluetoothLowEnergyConnection::GetRemoteDeviceAddress() {
-  return remote_device().bluetooth_address;
+std::string BluetoothLowEnergyConnection::GetRemoteDeviceAddress() {
+  // When the remote device is connected we should rely on the address given by
+  // |gatt_connection_|. As the device address may change if the device is
+  // paired. The address in |gatt_connection_| is automatically updated in this
+  // case.
+  return gatt_connection_ ? gatt_connection_->GetDeviceAddress()
+                          : remote_device().bluetooth_address;
 }
 
 BluetoothDevice* BluetoothLowEnergyConnection::GetRemoteDevice() {
   // It's not possible to simply use
   // |adapter_->GetDevice(GetRemoteDeviceAddress())| to find the device with MAC
   // address |GetRemoteDeviceAddress()|. For paired devices,
   // BluetoothAdapter::GetDevice(XXX) searches for the temporary MAC address
   // XXX, whereas |GetRemoteDeviceAddress()| is the real MAC address. This is a
   // bug in the way device::BluetoothAdapter is storing the devices (see
   // crbug.com/497841).
@@ skipping 47 matching lines @@
     const uint32 value) {
   std::vector<uint8> bytes(4, 0);
   bytes[0] = static_cast<uint8>(value);
   bytes[1] = static_cast<uint8>(value >> 8);
   bytes[2] = static_cast<uint8>(value >> 16);
   bytes[3] = static_cast<uint8>(value >> 24);
   return bytes;
 }
 
 }  // namespace proximity_auth