Renaming BluetoothDeviceMac as BluetoothClassicDeviceMac

device/bluetooth/bluetooth_low_energy_device_mac.mm

 // Copyright 2015 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_low_energy_device_mac.h"
 
 #import <CoreFoundation/CoreFoundation.h>
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/sdk_forward_declarations.h"
@@ skipping 48 matching lines @@
   std::string uuid_c_string = base::SysNSStringToUTF8(uuidString);
   return device::BluetoothUUID(uuid_c_string);
 }
 
 }  // namespace
 
 BluetoothLowEnergyDeviceMac::BluetoothLowEnergyDeviceMac(
     CBPeripheral* peripheral,
     NSDictionary* advertisementData,
     int rssi) {
+  supports_low_energy_ = true;
+  supports_classic_ = false;
   Update(peripheral, advertisementData, rssi);
 }
 
 BluetoothLowEnergyDeviceMac::~BluetoothLowEnergyDeviceMac() {
 }
 
 void BluetoothLowEnergyDeviceMac::Update(CBPeripheral* peripheral,
                                          NSDictionary* advertisementData,
                                          int rssi) {
+  last_call_to_update_ = [NSDate date];
   peripheral_.reset([peripheral retain]);
   rssi_ = rssi;
   ClearServiceData();
   NSNumber* nbConnectable =
       [advertisementData objectForKey:CBAdvertisementDataIsConnectable];
   connectable_ = [nbConnectable boolValue];
   NSDictionary* serviceData =
       [advertisementData objectForKey:CBAdvertisementDataServiceDataKey];
   for (CBUUID* uuid in serviceData) {
     NSData* data = [serviceData objectForKey:uuid];
@@ skipping 33 matching lines @@
 
 int BluetoothLowEnergyDeviceMac::GetRSSI() const {
   return rssi_;
 }
 
 bool BluetoothLowEnergyDeviceMac::IsPaired() const {
   return false;
 }
 
 bool BluetoothLowEnergyDeviceMac::IsConnected() const {
+  // TODO(krstnmnlsn): Remove check once we move to OSX SDK >= 10.9.

[scheib, 2015/06/29 20:44:24]

This block seems out of place for this patch. Is it needed in this patch?

[krstnmnlsn, 2015/06/30 00:50:35]

Oh alright..

+  if ([peripheral_ respondsToSelector:@selector(state)]) {
+    return ([peripheral_ state] == CBPeripheralStateConnected);
+  }
   return [peripheral_ isConnected];
 }
 
 bool BluetoothLowEnergyDeviceMac::IsConnectable() const {
   return connectable_;
 }
 
 bool BluetoothLowEnergyDeviceMac::IsConnecting() const {
   return false;
 }
@@ skipping 78 matching lines @@
     const ConnectToServiceErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
 void BluetoothLowEnergyDeviceMac::CreateGattConnection(
     const GattConnectionCallback& callback,
     const ConnectErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
+NSDate* BluetoothLowEnergyDeviceMac::GetLastCallToUpdate() {
+  return last_call_to_update_;
+}
+
 std::string BluetoothLowEnergyDeviceMac::GetDeviceName() const {
   return base::SysNSStringToUTF8([peripheral_ name]);
 }
 
 std::string BluetoothLowEnergyDeviceMac::GetPeripheralIdentifier(
     CBPeripheral* peripheral) {
   // TODO(dvh): Remove this once we moved to OSX SDK >= 10.9.
   if ([peripheral respondsToSelector:@selector(identifier)]) {
     // When -[CBPeripheral identifier] is available.
     NSUUID* uuid = [peripheral identifier];
     NSString* uuidString = [uuid UUIDString];
     return base::SysNSStringToUTF8(uuidString);
   }
 
   base::ScopedCFTypeRef<CFStringRef> str(
       CFUUIDCreateString(NULL, [peripheral UUID]));
   return SysCFStringRefToUTF8(str);
 }