Tidy up service discovery state for bluez on disconnect

device/bluetooth/bluetooth_adapter_bluez.cc

 // Copyright 2013 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_adapter_bluez.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 475 matching lines @@
   if (property_name == properties->paired.name() &&
       properties->paired.value() && !properties->trusted.value()) {
     device_bluez->SetTrusted();
   }
 
   // UMA connection counting
   if (property_name == properties->connected.name()) {
     // PlayStation joystick tries to reconnect after disconnection from USB.
     // If it is still not trusted, set it, so it becomes available on the
     // list of known devices.
-    if (properties->connected.value() && device_bluez->IsTrustable() &&
-        !properties->trusted.value())
-      device_bluez->SetTrusted();
+    if (properties->connected.value()) {
+      if (device_bluez->IsTrustable() && !properties->trusted.value())
+        device_bluez->SetTrusted();
+    } else {
+      device_bluez->SetGattServicesDiscoveryComplete(false);
+    }
 
     int count = 0;
 
     for (DevicesMap::const_iterator iter = devices_.begin();
          iter != devices_.end(); ++iter) {
       if (iter->second->IsPaired() && iter->second->IsConnected())
         ++count;
     }
 
     UMA_HISTOGRAM_COUNTS_100("Bluetooth.ConnectedDeviceCount", count);
@@ skipping 996 matching lines @@
 
     // If the queued request resulted in a pending call, then let it
     // asynchonously process the remaining queued requests once the pending
     // call returns.
     if (discovery_request_pending_)
       return;
   }
 }
 
 }  // namespace bluez