bluetooth: mac: Reject requestDevice promise if Mac version is <= 10.9

content/browser/bluetooth/web_bluetooth_service_impl.cc

 // Copyright 2016 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.
 
 // ID Not In Map Note:
 // A service, characteristic, or descriptor ID not in the corresponding
 // WebBluetoothServiceImpl map [service_id_to_device_address_,
 // characteristic_id_to_service_id_, descriptor_to_characteristic_] implies a
 // hostile renderer because a renderer obtains the corresponding ID from this
 // class and it will be added to the map at that time.
@@ skipping 322 matching lines @@
           this, base::Bind(&WebBluetoothServiceImpl::RequestDeviceImpl,
                            weak_ptr_factory_.GetWeakPtr(),
                            base::Passed(std::move(options)), callback));
       return;
     }
     RecordRequestDeviceOutcome(UMARequestDeviceOutcome::NO_BLUETOOTH_ADAPTER);
     callback.Run(blink::mojom::WebBluetoothError::NO_BLUETOOTH_ADAPTER,
                  nullptr /* device */);
     return;
   }
+  if (!BluetoothAdapterFactoryWrapper::Get().IsLowEnergyAvailable()) {

[ortuno, 2016/10/04 03:20:24]

Replace BluetoothAdapterFactoryWrapper::Get().IsBluetoothAdapterAvailable() with
this.

[François Beaufort, 2016/10/04 10:00:22]

Done.

+    RecordRequestDeviceOutcome(
+        UMARequestDeviceOutcome::BLUETOOTH_LOW_ENERGY_NOT_AVAILABLE);

[ortuno, 2016/10/04 03:20:24]

Use this errors rather than the NO_BLUETOOTH_ADAPTER one. This one is more
appropriate because IsBluetoothAdapterAvailable returns whether or not bluetooth
is supported.

[François Beaufort, 2016/10/04 10:00:22]

Done.

+    callback.Run(
+        blink::mojom::WebBluetoothError::BLUETOOTH_LOW_ENERGY_NOT_AVAILABLE,
+        nullptr /* device */);
+    return;
+  }
   RequestDeviceImpl(std::move(options), callback, GetAdapter());
 }
 
 void WebBluetoothServiceImpl::RemoteServerConnect(
     const WebBluetoothDeviceId& device_id,
     const RemoteServerConnectCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RecordWebBluetoothFunctionCall(UMAWebBluetoothFunction::CONNECT_GATT);
 
   const CacheQueryResult query_result = QueryCacheForDevice(device_id);
@@ skipping 648 matching lines @@
   characteristic_id_to_service_id_.clear();
   service_id_to_device_address_.clear();
   connected_devices_.reset(
       new FrameConnectedBluetoothDevices(render_frame_host_));
   allowed_devices_map_ = BluetoothAllowedDevicesMap();
   device_chooser_controller_.reset();
   BluetoothAdapterFactoryWrapper::Get().ReleaseAdapter(this);
 }
 
 }  // namespace content