Notify the BluetoothAdapter::Observer when a bluetooth peripheral disconnects

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 454 matching lines @@
   StartLowEnergyDiscoverySession();
   BluetoothDevice* device = SimulateLowEnergyDevice(3);
   EXPECT_FALSE(device->IsConnected());
 
   // Connect to the device
   ResetEventCounts();
   device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),
                                GetConnectErrorCallback(Call::NOT_EXPECTED));
   TestBluetoothAdapterObserver observer(adapter_);
   SimulateGattConnection(device);
+  EXPECT_EQ(1, observer.device_changed_count());

[scheib, 2016/05/24 23:34:34]

These additions are fine, but I sought a simpler test where they may be cleaner.
I didn't find one. I think a test specifically for measuring
device_changed_count at the right times is reasonable, instead of growing these
tests.

[Jeffrey Yasskin, 2016/05/25 00:08:12]

Done.

   EXPECT_TRUE(device->IsConnected());
 
   // Discover services
   std::vector<std::string> services;
   services.push_back("00000000-0000-1000-8000-00805f9b34fb");
   services.push_back("00000001-0000-1000-8000-00805f9b34fb");
   SimulateGattServicesDiscovered(device, services);
   EXPECT_TRUE(device->IsGattServicesDiscoveryComplete());
   EXPECT_EQ(2u, device->GetGattServices().size());
   EXPECT_EQ(1, observer.gatt_services_discovered_count());
 
   // Disconnect from the device
   device->DisconnectGatt();
   SimulateGattDisconnection(device);
+  EXPECT_EQ(2, observer.device_changed_count());
   EXPECT_FALSE(device->IsConnected());
   EXPECT_FALSE(device->IsGattServicesDiscoveryComplete());
   EXPECT_EQ(0u, device->GetGattServices().size());
 
   // Verify that the device can be connected to again
   device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),
                                GetConnectErrorCallback(Call::NOT_EXPECTED));
   SimulateGattConnection(device);
+  EXPECT_EQ(3, observer.device_changed_count());
   EXPECT_TRUE(device->IsConnected());
 
   // Verify that service discovery can be done again
   std::vector<std::string> services2;
   services2.push_back("00000002-0000-1000-8000-00805f9b34fb");
   SimulateGattServicesDiscovered(device, services2);
   EXPECT_TRUE(device->IsGattServicesDiscoveryComplete());
   EXPECT_EQ(1u, device->GetGattServices().size());
   EXPECT_EQ(2, observer.gatt_services_discovered_count());
 }
@@ skipping 38 matching lines @@
     return;
   }
   InitWithFakeAdapter();
   StartLowEnergyDiscoverySession();
   BluetoothDevice* device = SimulateLowEnergyDevice(3);
   device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),
                                GetConnectErrorCallback(Call::NOT_EXPECTED));
   TestBluetoothAdapterObserver observer(adapter_);
   ResetEventCounts();
   SimulateGattConnection(device);
+  EXPECT_EQ(1, observer.device_changed_count());
   EXPECT_EQ(1, gatt_discovery_attempts_);
 
   std::vector<std::string> services;
   services.push_back("00000000-0000-1000-8000-00805f9b34fb");
   services.push_back("00000001-0000-1000-8000-00805f9b34fb");
   SimulateGattServicesDiscovered(device, services);
 
   EXPECT_EQ(1, observer.gatt_services_discovered_count());
   EXPECT_EQ(2, observer.gatt_service_added_count());
+
+  SimulateGattDisconnection(device);
+  EXPECT_EQ(2, observer.device_changed_count());
 }
 #endif  // defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_MACOSX)
 
 #if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_MACOSX)
 TEST_F(BluetoothTest, GetGattServices_and_GetGattService) {
   if (!PlatformSupportsLowEnergy()) {
     LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
     return;
   }
   InitWithFakeAdapter();
@@ skipping 37 matching lines @@
   ResetEventCounts();
   SimulateGattConnection(device);
   EXPECT_EQ(1, gatt_discovery_attempts_);
 
   SimulateGattServicesDiscoveryError(device);
   EXPECT_EQ(0u, device->GetGattServices().size());
 }
 #endif  // defined(OS_ANDROID) || defined(OS_MACOSX)
 
 }  // namespace device