Handle change of BLE address after pairing

device/bluetooth/bluetooth_device.cc

 // Copyright (c) 2012 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_device.h"
 
 #include <string>
 
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
@@ skipping 185 matching lines @@
 
 bool BluetoothDevice::IsTrustable() const {
   // Sony PlayStation Dualshock3
   if ((GetVendorID() == 0x054c && GetProductID() == 0x0268 &&
        GetDeviceName() == "PLAYSTATION(R)3 Controller"))
     return true;
 
   return false;
 }
 
-void BluetoothDevice::CreateGattConnection(
+scoped_ptr<device::BluetoothGattConnection>
+BluetoothDevice::CreateGattConnection(
     const GattConnectionCallback& callback,
     const ConnectErrorCallback& error_callback) {
   create_gatt_connection_success_callbacks_.push_back(callback);
   create_gatt_connection_error_callbacks_.push_back(error_callback);
 
-  if (IsGattConnected())
-    return DidConnectGatt();
+  if (IsGattConnected()) {
+    DidConnectGatt();
+    return ExistingGattConnection().Pass();
+  }
 
-  CreateGattConnectionImpl();
+  return CreateGattConnectionImpl().Pass();
 }
 
 std::vector<BluetoothGattService*>
     BluetoothDevice::GetGattServices() const {
   std::vector<BluetoothGattService*> services;
   for (GattServiceMap::const_iterator iter = gatt_services_.begin();
        iter != gatt_services_.end(); ++iter)
     services.push_back(iter->second);
   return services;
 }
@@ skipping 56 matching lines @@
   base::DictionaryValue::Iterator iter(*services_data_);
   while (!iter.IsAtEnd()) {
     BluetoothUUID uuid(iter.key());
     uuids.push_back(uuid);
     iter.Advance();
   }
   return uuids;
 }
 
 void BluetoothDevice::DidConnectGatt() {
+  VLOG(1) << "BluetoothDevice::DidConnectGatt";
   for (const auto& callback : create_gatt_connection_success_callbacks_) {
-    callback.Run(
-        make_scoped_ptr(new BluetoothGattConnection(adapter_, GetAddress())));
+    callback.Run();
   }
   create_gatt_connection_success_callbacks_.clear();
   create_gatt_connection_error_callbacks_.clear();
 }
 
 void BluetoothDevice::DidFailToConnectGatt(ConnectErrorCode error) {
   for (const auto& error_callback : create_gatt_connection_error_callbacks_)
     error_callback.Run(error);
   create_gatt_connection_success_callbacks_.clear();
   create_gatt_connection_error_callbacks_.clear();
@@ skipping 37 matching lines @@
                       base::BinaryValue::CreateWithCopiedBuffer(buffer, size));
 }
 
 void BluetoothDevice::Pair(PairingDelegate* pairing_delegate,
                            const base::Closure& callback,
                            const ConnectErrorCallback& error_callback) {
   NOTREACHED();
 }
 
 }  // namespace device