Remove outdated devices from Android device chooser

device/bluetooth/bluetooth_adapter.cc

Index: device/bluetooth/bluetooth_adapter.cc
diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc
index 09127f981cb48ec266570c74a803285da6f33141..1aee6eab1af26e1cc45b0dd0239410725cbe533e 100644
--- a/device/bluetooth/bluetooth_adapter.cc
+++ b/device/bluetooth/bluetooth_adapter.cc
@@ -365,6 +365,37 @@ BluetoothAdapter::GetMergedDiscoveryFilterHelper(
   return result;
 }
 
+void BluetoothAdapter::RemoveTimedOutDevices() {
+  std::set<std::string> removed_devices;
+  for (DevicesMap::const_iterator it = devices_.begin(); it != devices_.end();
+       ++it) {
+    BluetoothDevice* device = it->second;
+
+    if (device->IsPaired() || device->IsConnected())

[ortuno, 2016/06/14 15:29:33]

Also need device->IsGattConnected()

[perja, 2016/06/15 13:03:40]

Acknowledged.

+      continue;
+
+    base::Time last_update_time = device->GetLastUpdateTime();
+
+    bool device_expired =
+        (base::Time::NowFromSystemTime() - last_update_time) > timeoutSec;
+    VLOG(1) << "device: " << device->GetAddress()
+            << ", last_update: " << last_update_time
+            << ", exp: " << device_expired;
+
+    if (!device_expired)
+      continue;
+    removed_devices.insert(it->first);
+
+    FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
+                      DeviceRemoved(this, device));
+  }
+
+  for (const std::string& device_address : removed_devices) {
+    size_t num_removed = devices_.erase(device_address);
+    DCHECK_EQ(num_removed, 1U);
+  }
+}
+
 // static
 void BluetoothAdapter::RecordBluetoothDiscoverySessionStartOutcome(
     UMABluetoothDiscoverySessionOutcome outcome) {
@@ -381,4 +412,8 @@ void BluetoothAdapter::RecordBluetoothDiscoverySessionStopOutcome(
       static_cast<int>(UMABluetoothDiscoverySessionOutcome::COUNT));
 }
 
+// static
+const base::TimeDelta BluetoothAdapter::timeoutSec =
+    base::TimeDelta::FromSeconds(180);
+
 }  // namespace device