Call BluetoothGatt#close() after disconnecting

device/bluetooth/bluetooth_device_unittest.cc

 // Copyright 2014 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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 165 matching lines @@
 
   // Disconnect & Delete connection objects. Device stays connected.
   gatt_connections_[0]->Disconnect();  // Disconnect first.
   gatt_connections_.pop_back();        // Delete last.
   EXPECT_FALSE(gatt_connections_[0]->IsConnected());
   EXPECT_TRUE(gatt_connections_[1]->IsConnected());
   EXPECT_TRUE(device->IsGattConnected());
   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());
 
   // Test GetDeviceAddress after device deleted.
   EXPECT_EQ(device_address, gatt_connections_[0]->GetDeviceAddress());
   EXPECT_EQ(device_address, gatt_connections_[1]->GetDeviceAddress());
 }
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)
@@ skipping 329 matching lines @@
   ResetEventCounts();
   SimulateGattConnection(device);
   EXPECT_EQ(1, gatt_discovery_attempts_);
 
   SimulateGattServicesDiscoveryError(device);
   EXPECT_EQ(0u, device->GetGattServices().size());
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace device