Handle change of BLE address after pairing

device/bluetooth/test/mock_bluetooth_device.h

Index: device/bluetooth/test/mock_bluetooth_device.h
diff --git a/device/bluetooth/test/mock_bluetooth_device.h b/device/bluetooth/test/mock_bluetooth_device.h
index fed356d63656a1123762b525dd809a379b34557b..54a3f033a8752fc8fb7a8196ce57de0def0236f4 100644
--- a/device/bluetooth/test/mock_bluetooth_device.h
+++ b/device/bluetooth/test/mock_bluetooth_device.h
@@ -11,6 +11,7 @@
 #include "base/strings/string16.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_uuid.h"
+#include "device/bluetooth/test/mock_bluetooth_gatt_connection.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -78,15 +79,23 @@ class MockBluetoothDevice : public BluetoothDevice {
                void(const BluetoothUUID& uuid,
                     const ConnectToServiceCallback& callback,
                     const ConnectToServiceErrorCallback& error_callback));
-  MOCK_METHOD2(CreateGattConnection,
-               void(const GattConnectionCallback& callback,
-                    const ConnectErrorCallback& error_callback));
+  MOCK_METHOD2(CreateGattConnectionRaw,
+               device::MockBluetoothGattConnection*(
+                   const GattConnectionCallback& callback,
+                   const ConnectErrorCallback& error_callback));
 
   MOCK_CONST_METHOD0(GetGattServices, std::vector<BluetoothGattService*>());
   MOCK_CONST_METHOD1(GetGattService, BluetoothGattService*(const std::string&));
-  MOCK_METHOD0(CreateGattConnectionImpl, void());
+  MOCK_METHOD0(CreateGattConnectionImplRaw,
+               device::MockBluetoothGattConnection*());
   MOCK_METHOD0(DisconnectGatt, void());
 
+  scoped_ptr<device::BluetoothGattConnection> CreateGattConnection(
+      const GattConnectionCallback& callback,
+      const ConnectErrorCallback& error_callback);
+
+  scoped_ptr<device::BluetoothGattConnection> CreateGattConnectionImpl();
+
   // BluetoothDevice manages the lifetime of its BluetoothGATTServices.
   // This method takes ownership of the MockBluetoothGATTServices. This is only
   // for convenience as far as testing is concerned, and it's possible to write