Notify the BluetoothAdapter::Observer when a bluetooth peripheral disconnects on Android and Mac.

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 <memory>
 #include <string>
 
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_gatt_connection.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
 #include "grit/bluetooth_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace device {
 
 BluetoothDevice::BluetoothDevice(BluetoothAdapter* adapter)
     : adapter_(adapter),
       gatt_services_discovery_complete_(false),
       services_data_(new base::DictionaryValue()) {}
 
 BluetoothDevice::~BluetoothDevice() {
-  DidDisconnectGatt();
+  for (BluetoothGattConnection* connection : gatt_connections_) {
+    connection->InvalidateConnectionReference();
+  }
 }
 
 BluetoothDevice::ConnectionInfo::ConnectionInfo()
     : rssi(kUnknownPower),
       transmit_power(kUnknownPower),
       max_transmit_power(kUnknownPower) {}
 
 BluetoothDevice::ConnectionInfo::ConnectionInfo(
     int rssi, int transmit_power, int max_transmit_power)
     : rssi(rssi),
@@ skipping 288 matching lines @@
   return uuids;
 }
 
 void BluetoothDevice::DidConnectGatt() {
   for (const auto& callback : create_gatt_connection_success_callbacks_) {
     callback.Run(
         base::WrapUnique(new BluetoothGattConnection(adapter_, GetAddress())));
   }
   create_gatt_connection_success_callbacks_.clear();
   create_gatt_connection_error_callbacks_.clear();
+  GetAdapter()->NotifyDeviceChanged(this);
 }
 
 void BluetoothDevice::DidFailToConnectGatt(ConnectErrorCode error) {
   // Connection request should only be made if there are no active
   // connections.
   DCHECK(gatt_connections_.empty());
 
   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();
 }
 
 void BluetoothDevice::DidDisconnectGatt() {
   // Pending calls to connect GATT are not expected, if they were then
   // DidFailToConnectGatt should have been called.
   DCHECK(create_gatt_connection_error_callbacks_.empty());
 
   // Invalidate all BluetoothGattConnection objects.
   for (BluetoothGattConnection* connection : gatt_connections_) {
     connection->InvalidateConnectionReference();
   }
   gatt_connections_.clear();
+  GetAdapter()->NotifyDeviceChanged(this);
 }
 
 void BluetoothDevice::AddGattConnection(BluetoothGattConnection* connection) {
   auto result = gatt_connections_.insert(connection);
   DCHECK(result.second);  // Check insert happened; there was no duplicate.
 }
 
 void BluetoothDevice::RemoveGattConnection(
     BluetoothGattConnection* connection) {
   size_t erased_count = gatt_connections_.erase(connection);
@@ skipping 10 matching lines @@
                       base::BinaryValue::CreateWithCopiedBuffer(buffer, size));
 }
 
 void BluetoothDevice::Pair(PairingDelegate* pairing_delegate,
                            const base::Closure& callback,
                            const ConnectErrorCallback& error_callback) {
   NOTREACHED();
 }
 
 }  // namespace device