bluetooth: mac: Improve classic device discovery and update

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 104 matching lines @@
 BluetoothDevice* BluetoothAdapter::GetDevice(const std::string& address) {
   return const_cast<BluetoothDevice *>(
       const_cast<const BluetoothAdapter *>(this)->GetDevice(address));
 }
 
 const BluetoothDevice* BluetoothAdapter::GetDevice(
     const std::string& address) const {
   std::string canonicalized_address =
       BluetoothDevice::CanonicalizeAddress(address);
   if (canonicalized_address.empty())
-    return NULL;
+    return nullptr;
 
   DevicesMap::const_iterator iter = devices_.find(canonicalized_address);
   if (iter != devices_.end())
     return iter->second;
 
-  return NULL;
+  return nullptr;
 }
 
 void BluetoothAdapter::AddPairingDelegate(
     BluetoothDevice::PairingDelegate* pairing_delegate,
     PairingDelegatePriority priority) {
   // Remove the delegate, if it already exists, before inserting to allow a
   // change of priority.
   RemovePairingDelegate(pairing_delegate);
 
   // Find the first point with a lower priority, or the end of the list.
@@ skipping 234 matching lines @@
     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()
+    VLOG(3) << "device: " << device->GetAddress()
             << ", last_update: " << last_update_time
             << ", exp: " << device_expired;
 
     if (!device_expired) {
       ++it;
       continue;
     }
+
+    VLOG(1) << "Removing device: " << device->GetAddress();
     DevicesMap::iterator next = it;
     next++;
     std::unique_ptr<BluetoothDevice> removed_device =
         devices_.take_and_erase(it);
     it = next;
 
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       DeviceRemoved(this, removed_device.get()));
   }
 }
@@ skipping 12 matching lines @@
   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