Simplified BluetoothAdapterMac.

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/IOBluetoothDeviceInquiry.h>
 #import <IOBluetooth/objc/IOBluetoothDevice.h>
 #import <IOBluetooth/objc/IOBluetoothHostController.h>
 
@@ skipping 81 matching lines @@
 
 BluetoothAdapterMac::BluetoothAdapterMac()
     : BluetoothAdapter(),
       powered_(false),
       discovery_status_(NOT_DISCOVERING),
       adapter_delegate_(
           [[BluetoothAdapterMacDelegate alloc] initWithAdapter:this]),
       device_inquiry_(
           [[IOBluetoothDeviceInquiry
               inquiryWithDelegate:adapter_delegate_] retain]),
+      recently_accessed_device_timestamp_(nil),
       weak_ptr_factory_(this) {
 }
 
 BluetoothAdapterMac::~BluetoothAdapterMac() {
   [device_inquiry_ release];
   [adapter_delegate_ release];
+  [recently_accessed_device_timestamp_ release];
 }
 
 void BluetoothAdapterMac::AddObserver(BluetoothAdapter::Observer* observer) {
   DCHECK(observer);
   observers_.AddObserver(observer);
 }
 
 void BluetoothAdapterMac::RemoveObserver(BluetoothAdapter::Observer* observer) {
   DCHECK(observer);
   observers_.RemoveObserver(observer);
@@ skipping 90 matching lines @@
   if (was_present != is_present) {
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       AdapterPresentChanged(this, is_present));
   }
   if (powered_ != powered) {
     powered_ = powered;
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       AdapterPoweredChanged(this, powered_));
   }
 
-  NSArray* paired_devices = [IOBluetoothDevice pairedDevices];
-  AddDevices(paired_devices);
-  RemoveUnpairedDevices(paired_devices);
+  IOBluetoothDevice*  recent_device =

[Mark Mentovai, 2013/04/09 20:57:03]

Extra space.

+      [[IOBluetoothDevice recentDevices:1] lastObject];
+  NSDate* access_timestamp = [recent_device recentAccessDate];
+  if (recently_accessed_device_timestamp_ == nil ||
+      access_timestamp == nil ||
+      [recently_accessed_device_timestamp_ compare:access_timestamp] ==
+          NSOrderedAscending) {
+    UpdateDevices([IOBluetoothDevice pairedDevices]);
+    [recently_accessed_device_timestamp_ release];
+    recently_accessed_device_timestamp_ = [access_timestamp copy];
+  }
 
   ui_task_runner_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&BluetoothAdapterMac::PollAdapter,
                  weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kPollIntervalMs));
 }
 
-void BluetoothAdapterMac::AddDevices(NSArray* devices) {
+void BluetoothAdapterMac::UpdateDevices(NSArray* devices) {
+  STLDeleteValues(&devices_);
   for (IOBluetoothDevice* device in devices) {
     std::string device_address =
         base::SysNSStringToUTF8([device addressString]);
-    DevicesMap::iterator found_device_iter = devices_.find(device_address);
-
-    if (found_device_iter == devices_.end()) {
-      devices_[device_address] = new BluetoothDeviceMac(device);
-      FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                        DeviceAdded(this, devices_[device_address]));
-      continue;
-    }
-    BluetoothDeviceMac* device_mac =
-        static_cast<BluetoothDeviceMac*>(found_device_iter->second);
-    if (device_mac->device_fingerprint() !=
-        BluetoothDeviceMac::ComputeDeviceFingerprint(device)) {
-      devices_[device_address] = new BluetoothDeviceMac(device);
-      FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                        DeviceChanged(this, devices_[device_address]));
-      delete device_mac;
-    }
+    devices_[device_address] = new BluetoothDeviceMac(device);
   }
 }
 
-void BluetoothAdapterMac::RemoveUnpairedDevices(NSArray* paired_devices) {
-  base::hash_set<std::string> paired_device_address_list;
-  for (IOBluetoothDevice* device in paired_devices) {
-    paired_device_address_list.insert(
-        base::SysNSStringToUTF8([device addressString]));
-  }
-
-  DevicesMap::iterator iter = devices_.begin();
-  while (iter != devices_.end()) {
-    DevicesMap::iterator device_iter = iter;
-    ++iter;
-
-    if (paired_device_address_list.find(device_iter->first) !=
-        paired_device_address_list.end())
-      continue;
-
-    if (device_iter->second->IsPaired()) {
-      FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                        DeviceRemoved(this, device_iter->second));
-      delete device_iter->second;
-      devices_.erase(device_iter);
-    }
-  }
-}
-
 void BluetoothAdapterMac::DeviceInquiryStarted(
     IOBluetoothDeviceInquiry* inquiry) {
   DCHECK(device_inquiry_ == inquiry);
   if (discovery_status_ == DISCOVERING)
     return;
 
   discovery_status_ = DISCOVERING;
   RunCallbacks(on_start_discovery_callbacks_, true);
   num_discovery_listeners_ = on_start_discovery_callbacks_.size();
   on_start_discovery_callbacks_.clear();
@@ skipping 72 matching lines @@
        iter != callback_list.end();
        ++iter) {
     if (success)
       ui_task_runner_->PostTask(FROM_HERE, iter->first);
     else
       ui_task_runner_->PostTask(FROM_HERE, iter->second);
   }
 }
 
 }  // namespace device