Remove outdated devices from Android device chooser

device/bluetooth/bluetooth_adapter_mac.mm

 // 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_mac.h"
 
 #import <IOBluetooth/objc/IOBluetoothDevice.h>
 #import <IOBluetooth/objc/IOBluetoothHostController.h>
 #include <stddef.h>
 
@@ skipping 23 matching lines @@
 namespace {
 
 // The frequency with which to poll the adapter for updates.
 const int kPollIntervalMs = 500;
 
 }  // namespace
 
 namespace device {
 
 // static
-const NSTimeInterval BluetoothAdapterMac::kDiscoveryTimeoutSec =
-    180;  // 3 minutes
-
-// static
 base::WeakPtr<BluetoothAdapter> BluetoothAdapter::CreateAdapter(
     const InitCallback& init_callback) {
   return BluetoothAdapterMac::CreateAdapter();
 }
 
 // static
 base::WeakPtr<BluetoothAdapterMac> BluetoothAdapterMac::CreateAdapter() {
   BluetoothAdapterMac* adapter = new BluetoothAdapterMac();
   adapter->Init();
   return adapter->weak_ptr_factory_.GetWeakPtr();
@@ skipping 451 matching lines @@
   VLOG(2) << "LowEnergyDeviceUpdated";
   device_mac->Update(advertisement_data, rssi);
   // TODO(scheib): Call DeviceChanged only if UUIDs change. crbug.com/547106
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                     DeviceChanged(this, device_mac));
 }
 
 // TODO(krstnmnlsn): Implement. crbug.com/511025
 void BluetoothAdapterMac::LowEnergyCentralManagerUpdatedState() {}
 
-void BluetoothAdapterMac::RemoveTimedOutDevices() {
-  // Notify observers if any previously seen devices are no longer available,
-  // i.e. if they are no longer paired, connected, nor recently discovered via
-  // an inquiry.
-  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())
-      continue;
-
-    NSDate* last_update_time =
-        static_cast<BluetoothDeviceMac*>(device)->GetLastUpdateTime();
-    if (last_update_time &&
-        -[last_update_time timeIntervalSinceNow] < kDiscoveryTimeoutSec)
-      continue;
-
-    FOR_EACH_OBSERVER(
-        BluetoothAdapter::Observer, observers_, DeviceRemoved(this, device));
-    removed_devices.insert(it->first);
-    // The device will be erased from the map in the loop immediately below.
-  }
-  for (const std::string& device_address : removed_devices) {
-    size_t num_removed = devices_.erase(device_address);
-    DCHECK_EQ(num_removed, 1U);
-  }
-}
-
 void BluetoothAdapterMac::AddPairedDevices() {
   // Add any new paired devices.
   for (IOBluetoothDevice* device in [IOBluetoothDevice pairedDevices]) {
     ClassicDeviceAdded(device);
   }
 }
 
 void BluetoothAdapterMac::CreateGattConnection(
     BluetoothLowEnergyDeviceMac* device_mac) {
   [low_energy_central_manager_ connectPeripheral:device_mac->peripheral_
@@ skipping 54 matching lines @@
   std::string device_address =
       BluetoothLowEnergyDeviceMac::GetPeripheralHashAddress(peripheral);
   DevicesMap::const_iterator iter = devices_.find(device_address);
   if (iter == devices_.end()) {
     return nil;
   }
   return static_cast<BluetoothLowEnergyDeviceMac*>(iter->second);
 }
 
 }  // namespace device