Renaming BluetoothDeviceMac as BluetoothClassicDeviceMac

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 <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/location.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "device/bluetooth/bluetooth_device_mac.h"
+#include "device/bluetooth/bluetooth_classic_device_mac.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/bluetooth_socket_mac.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
 namespace {
 
 // The frequency with which to poll the adapter for updates.
 const int kPollIntervalMs = 500;
 
 // The length of time that must elapse since the last Inquiry response before a
@@ skipping 129 matching lines @@
   }
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
                     observers_,
                     AdapterDiscoveringChanged(this, false));
 }
 
 void BluetoothAdapterMac::DeviceConnected(IOBluetoothDevice* device) {
   // TODO(isherman): Investigate whether this method can be replaced with a call
   // to +registerForConnectNotifications:selector:.
   DVLOG(1) << "Adapter registered a new connection from device with address: "
-           << BluetoothDeviceMac::GetDeviceAddress(device);
+           << BluetoothClassicDeviceMac::GetDeviceAddress(device);
   ClassicDeviceAdded(device);
 }
 
 void BluetoothAdapterMac::RemovePairingDelegateInternal(
     BluetoothDevice::PairingDelegate* pairing_delegate) {
 }
 
 void BluetoothAdapterMac::AddDiscoverySession(
     BluetoothDiscoveryFilter* discovery_filter,
     const base::Closure& callback,
@@ skipping 178 matching lines @@
   UpdateDevices();
 
   ui_task_runner_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&BluetoothAdapterMac::PollAdapter,
                  weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kPollIntervalMs));
 }
 
 void BluetoothAdapterMac::ClassicDeviceAdded(IOBluetoothDevice* device) {
-  std::string device_address = BluetoothDeviceMac::GetDeviceAddress(device);
+  std::string device_address =
+      BluetoothClassicDeviceMac::GetDeviceAddress(device);
 
   // Only notify observers once per device.
   if (devices_.count(device_address))
     return;
 
-  devices_[device_address] = new BluetoothDeviceMac(device);
+  devices_[device_address] = new BluetoothClassicDeviceMac(device);
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
                     observers_,
                     DeviceAdded(this, devices_[device_address]));
 }
 
 // TODO(krstnmnlsn): This method to be implemented as soon as UpdateDevices can
 // handle instances of LowEnergyBluetoothDevice in |devices_|. crbug.com/498009
 void BluetoothAdapterMac::LowEnergyDeviceUpdated(
     CBPeripheral* peripheral,
     NSDictionary* advertisementData,
     int rssi) {
 }
 
-// TODO(krstnmnlsn): This method assumes all BluetoothDevices in devices_ are
-// instances of BluetoothDeviceMac.  Add support for low energy devices.
-// crbug.com/498009
 void BluetoothAdapterMac::UpdateDevices() {
   // 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::iterator it = devices_.begin(); it != devices_.end(); ++it) {
     BluetoothDevice* device = it->second;
     if (device->IsPaired() || device->IsConnected())
       continue;
 
-    NSDate* last_inquiry_update =
-        static_cast<BluetoothDeviceMac*>(device)->GetLastInquiryUpdate();
-    if (last_inquiry_update &&
-        -[last_inquiry_update timeIntervalSinceNow] < kDiscoveryTimeoutSec)
+    // The device must support exactly one of Classic or Low Energy because this
+    // indicates to us its class. Run time type checking is required here as
+    // BluetoothDevice does not currently support giving timing information (it

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

Drop reference to ChromeOS. How about just
"Device objects in list are either BluetoothClassicDeviceMac or
BluetoothLowEnergyDeviceMac."

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

Done. See https://codereview.chromium.org/1211013005/.

+    // was unnecessary on ChromeOS).
+    DCHECK((device->SupportsClassic() || device->SupportsLowEnergy()) &&
+           !(device->SupportsClassic() && device->SupportsLowEnergy()));
+    NSDate* last_update = [NSDate dateWithTimeIntervalSince1970:0];
+    if (device->SupportsClassic()) {
+      last_update = static_cast<BluetoothClassicDeviceMac*>(device)
+                        ->GetLastInquiryUpdate();
+    }
+    if (device->SupportsLowEnergy()) {
+      last_update = static_cast<BluetoothLowEnergyDeviceMac*>(device)
+                        ->GetLastCallToUpdate();
+    }
+
+    if (last_update &&
+        -[last_update timeIntervalSinceNow] < kDiscoveryTimeoutSec)
       continue;
 
     FOR_EACH_OBSERVER(
         BluetoothAdapter::Observer, observers_, DeviceRemoved(this, device));
     delete 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);
   }
 
   // Add any new paired devices.
   for (IOBluetoothDevice* device in [IOBluetoothDevice pairedDevices]) {
     ClassicDeviceAdded(device);
   }
 }
 
 }  // namespace device