Tidy up service discovery state for bluez on disconnect

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 <string>
 
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
@@ skipping 200 matching lines @@
   create_gatt_connection_error_callbacks_.push_back(error_callback);
 
   if (IsGattConnected())
     return DidConnectGatt();
 
   CreateGattConnectionImpl();
 }
 
 void BluetoothDevice::SetGattServicesDiscoveryComplete(bool complete) {
   gatt_services_discovery_complete_ = complete;
+  if (!complete)
+    gatt_services_.clear();

[ortuno, 2016/01/19 17:55:45]

We shouldn't be deleting the services on all platforms. armansito can confirm
but I believe bluez should be deleting the services upon disconnection. If it's
not then it's a bug in bluez.

[tommyt, 2016/01/20 07:54:08]

Done.

 }
 
 bool BluetoothDevice::IsGattServicesDiscoveryComplete() const {
   return gatt_services_discovery_complete_;
 }
 
 std::vector<BluetoothGattService*>
     BluetoothDevice::GetGattServices() const {
   std::vector<BluetoothGattService*> services;
   for (const auto& iter : gatt_services_)
@@ skipping 116 matching lines @@
                       base::BinaryValue::CreateWithCopiedBuffer(buffer, size));
 }
 
 void BluetoothDevice::Pair(PairingDelegate* pairing_delegate,
                            const base::Closure& callback,
                            const ConnectErrorCallback& error_callback) {
   NOTREACHED();
 }
 
 }  // namespace device