bluetooth: mac: Improve classic device discovery and update

device/bluetooth/bluetooth_classic_device_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_classic_device_mac.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/hash.h"
@@ skipping 44 matching lines @@
   uuid_str.insert(18, "-");
   uuid_str.insert(23, "-");
   return BluetoothUUID(uuid_str);
 }
 
 }  // namespace
 
 BluetoothClassicDeviceMac::BluetoothClassicDeviceMac(
     BluetoothAdapterMac* adapter,
     IOBluetoothDevice* device)
-    : BluetoothDeviceMac(adapter), device_([device retain]) {}
+    : BluetoothDeviceMac(adapter), device_([device retain]) {
+  UpdateTimestamp();
+}
 
 BluetoothClassicDeviceMac::~BluetoothClassicDeviceMac() {
 }
 
 uint32_t BluetoothClassicDeviceMac::GetBluetoothClass() const {
   return [device_ classOfDevice];
 }
 
 void BluetoothClassicDeviceMac::CreateGattConnectionImpl() {
   // Classic devices do not support GATT connection.
@@ skipping 172 matching lines @@
 }
 
 void BluetoothClassicDeviceMac::CreateGattConnection(
     const GattConnectionCallback& callback,
     const ConnectErrorCallback& error_callback) {
   // TODO(armansito): Implement.
   error_callback.Run(ERROR_UNSUPPORTED_DEVICE);
 }
 
 base::Time BluetoothClassicDeviceMac::GetLastUpdateTime() const {
-  return base::Time::FromDoubleT(
-      [[device_ getLastInquiryUpdate] timeIntervalSince1970]);
+  // Even when a device is discovered during an inquiry procedure this returns
+  // nil so we implement out own last_update_time_ which gets updated whenever
+  // the device is found.
+  NSDate* inquiry_update = [device_ getLastInquiryUpdate];
+  if (inquiry_update != nil) {
+    return base::Time::FromDoubleT([inquiry_update timeIntervalSince1970]);
+  }
+  return last_update_time_;
 }
 
 int BluetoothClassicDeviceMac::GetHostTransmitPower(
     BluetoothHCITransmitPowerLevelType power_level_type) const {
   IOBluetoothHostController* controller =
       [IOBluetoothHostController defaultController];
 
   // Bail if the undocumented API is unavailable on this machine.
   SEL selector = @selector(BluetoothHCIReadTransmitPowerLevel:
                                                        inType:
@@ skipping 12 matching lines @@
   return power_level;
 }
 
 // static
 std::string BluetoothClassicDeviceMac::GetDeviceAddress(
     IOBluetoothDevice* device) {
   return CanonicalizeAddress(base::SysNSStringToUTF8([device addressString]));
 }
 
 }  // namespace device