Revert "bluetooth: bluez: Fixed issue with missing notifications after reconnect."

Doesn't fix the original issue of notifications failing after reconnect
https://crbug.com/680099 correctly.

Introduces new issue:
startCharacteristicNotifications returns 'Operation failed' after disconnect
https://crbug.com/719581

This reverts commit db614933.
originally from https://codereview.chromium.org/2625013003/

TBR=ortuno@chromium.org,rkc@google.com,scheib@chromium.org,perja@opera.com
BUG=680099,719581

Review-Url: https://codereview.chromium.org/2888663002
Cr-Commit-Position: refs/heads/master@{#472290}

device/bluetooth/bluetooth_device.cc

@@ -485,11 +485,7 @@ void BluetoothDevice::DidFailToConnectGatt(ConnectErrorCode error) {
   create_gatt_connection_error_callbacks_.clear();
 }
 
-void BluetoothDevice::DidDisconnectGatt(bool notifyDeviceChanged) {
-  gatt_services_.clear();
-  device_uuids_.ClearServiceUUIDs();
-  SetGattServicesDiscoveryComplete(false);
-
+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());
@@ -499,8 +495,7 @@ void BluetoothDevice::DidDisconnectGatt(bool notifyDeviceChanged) {
     connection->InvalidateConnectionReference();
   }
   gatt_connections_.clear();
-  if (notifyDeviceChanged)
-    GetAdapter()->NotifyDeviceChanged(this);
+  GetAdapter()->NotifyDeviceChanged(this);
 }
 
 void BluetoothDevice::AddGattConnection(BluetoothGattConnection* connection) {

device/bluetooth/bluetooth_device.h

@@ -617,7 +617,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDevice {
   // DidDisconnectGatt.
   void DidConnectGatt();
   void DidFailToConnectGatt(ConnectErrorCode);
-  void DidDisconnectGatt(bool notifyDeviceChanged);
+  void DidDisconnectGatt();
 
   // Tracks BluetoothGattConnection instances that act as a reference count
   // keeping the GATT connection open. Instances call Add/RemoveGattConnection

device/bluetooth/bluetooth_device_android.cc

@@ -222,7 +222,10 @@ void BluetoothDeviceAndroid::OnConnectionStateChange(
   } else {
     // Otherwise an existing connection was terminated.
     RecordConnectionTerminatedResult(status);
-    DidDisconnectGatt(true /* notifyDeviceChanged */);
+    gatt_services_.clear();
+    device_uuids_.ClearServiceUUIDs();
+    SetGattServicesDiscoveryComplete(false);
+    DidDisconnectGatt();
   }
 }
 

device/bluetooth/bluetooth_low_energy_device_mac.mm

@@ -490,7 +490,7 @@ void BluetoothLowEnergyDeviceMac::DidDisconnectPeripheral(NSError* error) {
   //   2. When we cancel a pending connection request.
   if (create_gatt_connection_error_callbacks_.empty()) {
     // If there are no pending callbacks then the connection broke (#1).
-    DidDisconnectGatt(true /* notifyDeviceChanged */);
+    DidDisconnectGatt();
     return;
   }
   // Else we canceled the connection request (#2).

device/bluetooth/bluez/bluetooth_device_bluez.cc

@@ -951,9 +951,6 @@ void BluetoothDeviceBlueZ::OnSetTrusted(bool success) {
 
 void BluetoothDeviceBlueZ::OnDisconnect(const base::Closure& callback) {
   BLUETOOTH_LOG(EVENT) << object_path_.value() << ": Disconnected";
-  // Do not notify about changed device since this is already done by
-  // the dbus::PropertySet and the property change callback for BlueZ.
-  DidDisconnectGatt(false /* notifyDeviceChanged */);
   callback.Run();
 }