Call BluetoothGatt#close() after disconnecting

device/bluetooth/bluetooth_device_unittest.cc

Index: device/bluetooth/bluetooth_device_unittest.cc
diff --git a/device/bluetooth/bluetooth_device_unittest.cc b/device/bluetooth/bluetooth_device_unittest.cc
index 4fc30e4e0d3d46c8746d3d1b2648a57988e57c29..e9cedec503b963248282e92ce4e9e1c5edc733ea 100644
--- a/device/bluetooth/bluetooth_device_unittest.cc
+++ b/device/bluetooth/bluetooth_device_unittest.cc
@@ -183,9 +183,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection) {
   EXPECT_EQ(0, gatt_disconnection_attempts_);
 
   // Delete device, connection objects should all be disconnected.
-  gatt_disconnection_attempts_ = 0;
   DeleteDevice(device);
-  EXPECT_EQ(1, gatt_disconnection_attempts_);

[tommyt, 2016/01/29 15:02:12]

The destruction of the device no longer calls disconnect function. Instead it
calls close(), which does ensure that connections are disconnected.

[ortuno, 2016/01/29 16:23:53]

@scheib: Should we add another member to BluetoothTest to keep track of calls to
close()? Seems like something we should test but it's an implementation detail
specific to Android.

[scheib, 2016/01/29 21:50:58]

Yes we should test this, and I think we can do it in just the Android testing
code. See fakes comment.

[tommyt, 2016/02/01 14:37:13]

I've resurrected this code and added some test code that increases the
disconnection attempts variable on close as well as on disconnect. I've also
added code that tests that all connections are properly closed.

   EXPECT_FALSE(gatt_connections_[0]->IsConnected());
   EXPECT_FALSE(gatt_connections_[1]->IsConnected());