Remove outdated devices from Android device chooser

device/bluetooth/bluetooth_adapter.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_adapter.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 347 matching lines @@
       }
       continue;
     }
 
     result = BluetoothDiscoveryFilter::Merge(result.get(), curr_filter);
   }
 
   return result;
 }
 
+void BluetoothAdapter::RemoveTimedOutDevices() {
+  for (DevicesMap::iterator it = devices_.begin(); it != devices_.end();) {
+    BluetoothDevice* device = it->second;
+    if (device->IsPaired() || device->IsConnected() ||
+        device->IsGattConnected()) {
+      ++it;
+      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) {
+      ++it;
+      continue;
+    }
+    DevicesMap::iterator next = it;
+    next++;
+    std::unique_ptr<BluetoothDevice> removed_device =
+        devices_.take_and_erase(it);
+    it = next;

[ortuno, 2016/06/23 15:42:59]

Any special reason why you manually copy and increase the iterator? We just put
the ++it in the for loop in a couple of places[1][2][3] and I would like to know
if this is a pattern we should follow there as well. If not then I would prefer
the existing pattern already to be consistent throughout the code base.

[1]
https://cs.chromium.org/chromium/src/device/bluetooth/bluetooth_adapter_win.c...
[2]
https://cs.chromium.org/chromium/src/device/bluetooth/bluez/bluetooth_adapter...
[3]
https://cs.chromium.org/chromium/src/device/bluetooth/bluez/bluetooth_adapter...

[ortuno, 2016/06/23 17:57:33]

Discussed this with scheib. I see why this is the correct approach and we should
fix other instances of the broken pattern. No need for you to do anything.

+
+    FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
+                      DeviceRemoved(this, removed_device.get()));
+  }
+}
+
 // static
 void BluetoothAdapter::RecordBluetoothDiscoverySessionStartOutcome(
     UMABluetoothDiscoverySessionOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION(
       "Bluetooth.DiscoverySession.Start.Outcome", static_cast<int>(outcome),
       static_cast<int>(UMABluetoothDiscoverySessionOutcome::COUNT));
 }
 
 // static
 void BluetoothAdapter::RecordBluetoothDiscoverySessionStopOutcome(
     UMABluetoothDiscoverySessionOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION(
       "Bluetooth.DiscoverySession.Stop.Outcome", static_cast<int>(outcome),
       static_cast<int>(UMABluetoothDiscoverySessionOutcome::COUNT));
 }
 
+// static
+const base::TimeDelta BluetoothAdapter::timeoutSec =
+    base::TimeDelta::FromSeconds(180);
+
 }  // namespace device