bluetooth: Implement hardware filtering on macOS

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 <stddef.h>
 
@@ skipping 279 matching lines @@
 
   DVLOG(1) << "Added a discovery session";
   num_discovery_sessions_++;
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
                     observers_,
                     AdapterDiscoveringChanged(this, true));
   callback.Run();
 }
 
 void BluetoothAdapterMac::RemoveDiscoverySession(
     BluetoothDiscoveryFilter* discovery_filter,

[Jeffrey Yasskin, 2016/08/23 21:37:04]

If we're guaranteed this is never null, can this become a const
BluetoothDiscoveryFilter& for all adapters?

[ortuno, 2016/08/25 17:58:31]

Ah my bad. BluetoothDiscoveryFilter is not guaranteed to be there because of
StartDiscoverySession. (Which just calls
StartDiscoverySessionWithFilter(nullptr...).)

     const base::Closure& callback,
     const DiscoverySessionErrorCallback& error_callback) {
   DVLOG(1) << __func__;
 
+  DCHECK(discovery_filter);
+
+  BluetoothTransport transport = discovery_filter->GetTransport();
+
   if (num_discovery_sessions_ > 1) {
     // There are active sessions other than the one currently being removed.
     DCHECK(IsDiscovering());
     num_discovery_sessions_--;
+
+    std::set<BluetoothUUID> filter_uuids;
+    discovery_filter->GetUUIDs(filter_uuids);
+
+    if (IsLowEnergyAvailable() && (transport & BLUETOOTH_TRANSPORT_LE)) {
+      low_energy_discovery_manager_->RemoveDiscoveryUUIDs(
+          std::move(filter_uuids));
+    }
+
     callback.Run();
     return;
   }
 
   if (num_discovery_sessions_ == 0) {
     DVLOG(1) << "No active discovery sessions. Returning error.";
     error_callback.Run(UMABluetoothDiscoverySessionOutcome::NOT_ACTIVE);
     return;
   }
 
-  // Default to dual discovery if |discovery_filter| is NULL.
-  BluetoothTransport transport = BLUETOOTH_TRANSPORT_DUAL;
-  if (discovery_filter)
-    transport = discovery_filter->GetTransport();
-
   if (transport & BLUETOOTH_TRANSPORT_CLASSIC) {
     if (!classic_discovery_manager_->StopDiscovery()) {
       DVLOG(1) << "Failed to stop classic discovery";
       // TODO: Provide a more precise error here.
       error_callback.Run(UMABluetoothDiscoverySessionOutcome::UNKNOWN);
       return;
     }
   }
+
   if (transport & BLUETOOTH_TRANSPORT_LE) {
     if (IsLowEnergyAvailable())
       low_energy_discovery_manager_->StopDiscovery();
   }
 
   DVLOG(1) << "Discovery stopped";
   num_discovery_sessions_--;
   callback.Run();
 }
 
 void BluetoothAdapterMac::SetDiscoveryFilter(
     std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter,
     const base::Closure& callback,
     const DiscoverySessionErrorCallback& error_callback) {
   NOTIMPLEMENTED();
   error_callback.Run(UMABluetoothDiscoverySessionOutcome::NOT_IMPLEMENTED);
 }
 
 bool BluetoothAdapterMac::StartDiscovery(
     BluetoothDiscoveryFilter* discovery_filter) {

[Jeffrey Yasskin, 2016/08/23 21:37:04]

Similarly here, change the interface's signature if the argument can't be null.

-  // Default to dual discovery if |discovery_filter| is NULL.  IOBluetooth seems
-  // allow starting low energy and classic discovery at once.
-  BluetoothTransport transport = BLUETOOTH_TRANSPORT_DUAL;
-  if (discovery_filter)
-    transport = discovery_filter->GetTransport();
+  DCHECK(discovery_filter);
+  BluetoothTransport transport = discovery_filter->GetTransport();
 
   if ((transport & BLUETOOTH_TRANSPORT_CLASSIC) &&
       !classic_discovery_manager_->IsDiscovering()) {
     // TODO(krstnmnlsn): If a classic discovery session is already running then
     // we should update its filter. crbug.com/498056
     if (!classic_discovery_manager_->StartDiscovery()) {
       DVLOG(1) << "Failed to add a classic discovery session";
       return false;
     }
   }
   if (transport & BLUETOOTH_TRANSPORT_LE) {
     // Begin a low energy discovery session or update it if one is already
     // running.
-    if (IsLowEnergyAvailable())
-      low_energy_discovery_manager_->StartDiscovery(
-          BluetoothDevice::UUIDList());
+    if (IsLowEnergyAvailable()) {
+      std::set<BluetoothUUID> filter_uuids;
+      discovery_filter->GetUUIDs(filter_uuids);
+      low_energy_discovery_manager_->StartDiscovery(std::move(filter_uuids));
+    }
   }
   return true;
 }
 
 void BluetoothAdapterMac::Init() {
   ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
   PollAdapter();
 }
 
 void BluetoothAdapterMac::InitForTest(
@@ skipping 208 matching lines @@
   std::string device_address =
       BluetoothLowEnergyDeviceMac::GetPeripheralHashAddress(peripheral);
   DevicesMap::const_iterator iter = devices_.find(device_address);
   if (iter == devices_.end()) {
     return nil;
   }
   return static_cast<BluetoothLowEnergyDeviceMac*>(iter->second);
 }
 
 }  // namespace device