bluetooth: Implement acceptAllDevices

content/browser/bluetooth/bluetooth_device_chooser_controller.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.
 
 #include "content/browser/bluetooth/bluetooth_device_chooser_controller.h"
 
 #include <set>
 #include <string>
 #include <unordered_set>
 
@@ skipping 43 matching lines @@
     29;  // max length of device name in filter.
 
 // The duration of a Bluetooth Scan in seconds.
 constexpr int kScanDuration = 10;
 constexpr int kTestScanDuration = 0;
 
 void LogRequestDeviceOptions(
     const blink::mojom::WebBluetoothRequestDeviceOptionsPtr& options) {
   VLOG(1) << "requestDevice called with the following filters: ";
   int i = 0;
+  VLOG(1) << "acceptAllDevices: " << options->accept_all_devices;
+
+  if (options->filters.is_null())
+    return;
+
   for (const auto& filter : options->filters) {
     VLOG(1) << "Filter #" << ++i;
     if (!filter->name.is_null())
       VLOG(1) << "Name: " << filter->name;
 
     if (!filter->name_prefix.is_null())
       VLOG(1) << "Name Prefix: " << filter->name_prefix;
 
     if (!filter->services.is_null()) {
       VLOG(1) << "Services: ";
@@ skipping 20 matching lines @@
     return true;
   if (!filter->name_prefix.is_null() &&
       filter->name_prefix.size() > kMaxLengthForDeviceName)
     return true;
 
   return false;
 }
 
 bool HasEmptyOrInvalidFilter(
     const mojo::Array<blink::mojom::WebBluetoothScanFilterPtr>& filters) {
+  if (filters.is_null()) {
+    return true;
+  }
+
   return filters.empty()
              ? true
              : filters.end() != std::find_if(filters.begin(), filters.end(),
                                              IsEmptyOrInvalidFilter);
 }
 
+bool IsOptionsInvalid(
+    const blink::mojom::WebBluetoothRequestDeviceOptionsPtr& options) {
+  if ((!options->filters.is_null() && options->accept_all_devices) ||
+      (options->filters.is_null() && !options->accept_all_devices)) {

[scheib, 2016/11/22 21:22:44]

122 is redundant with 125,126 I think. Would this whole method be easier to read
as:

if (options->accept_all_devices)
  return !options->filters.is_null();
else
  return HasEmptyOrInvalidFilter(options->filters);

[ortuno, 2016/11/23 06:03:08]

Nice. Done.

+    return true;
+  }
+  if (!options->accept_all_devices) {
+    return HasEmptyOrInvalidFilter(options->filters);
+  }
+  return false;
+}
+
 bool MatchesFilter(const std::string* device_name,
                    const UUIDSet& device_uuids,
                    const blink::mojom::WebBluetoothScanFilterPtr& filter) {
   if (!filter->name.is_null()) {
     if (device_name == nullptr)
       return false;
     if (filter->name != *device_name)
       return false;
   }
 
@@ skipping 25 matching lines @@
     if (MatchesFilter(device_name, device_uuids, filter)) {
       return true;
     }
   }
   return false;
 }
 
 std::unique_ptr<device::BluetoothDiscoveryFilter> ComputeScanFilter(
     const mojo::Array<blink::mojom::WebBluetoothScanFilterPtr>& filters) {
   std::unordered_set<BluetoothUUID, device::BluetoothUUIDHash> services;
-  for (const auto& filter : filters) {
-    for (const base::Optional<BluetoothUUID>& service : filter->services) {
-      services.insert(service.value());
+  if (!filters.is_null()) {
+    for (const auto& filter : filters) {
+      for (const base::Optional<BluetoothUUID>& service : filter->services) {
+        services.insert(service.value());
+      }
     }
   }
+
   // There isn't much support for GATT over BR/EDR from neither platforms nor
   // devices so performing a Dual scan will find devices that the API is not
   // able to interact with. To avoid wasting power and confusing users with
   // devices they are not able to interact with, we only perform an LE Scan.
   auto discovery_filter = base::MakeUnique<device::BluetoothDiscoveryFilter>(
       device::BLUETOOTH_TRANSPORT_LE);
   for (const BluetoothUUID& service : services) {
     discovery_filter->AddUUID(service);
   }
   return discovery_filter;
@@ skipping 74 matching lines @@
     const ErrorCallback& error_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // GetDevice should only be called once.
   DCHECK(success_callback_.is_null());
   DCHECK(error_callback_.is_null());
 
   success_callback_ = success_callback;
   error_callback_ = error_callback;
 
-  // The renderer should never send empty filters.
-  if (HasEmptyOrInvalidFilter(options->filters)) {
+  // The renderer should never send invalid options.
+  if (IsOptionsInvalid(options)) {
     web_bluetooth_service_->CrashRendererAndClosePipe(
-        bad_message::BDH_EMPTY_OR_INVALID_FILTERS);
+        bad_message::BDH_INVALID_OPTIONS);
     return;
   }
   options_ = std::move(options);
   LogRequestDeviceOptions(options_);
 
   // Check blacklist to reject invalid filters and adjust optional_services.
-  if (BluetoothBlacklist::Get().IsExcluded(options_->filters)) {
+  if (!options_->filters.is_null() &&
+      BluetoothBlacklist::Get().IsExcluded(options_->filters)) {
     RecordRequestDeviceOutcome(
         UMARequestDeviceOutcome::BLACKLISTED_SERVICE_IN_FILTER);
     PostErrorCallback(
         blink::mojom::WebBluetoothResult::REQUEST_DEVICE_WITH_BLACKLISTED_UUID);
     return;
   }
   BluetoothBlacklist::Get().RemoveExcludedUUIDs(options_.get());
 
   const url::Origin requesting_origin =
       render_frame_host_->GetLastCommittedOrigin();
@@ skipping 80 matching lines @@
         BluetoothChooser::AdapterPresence::POWERED_OFF);
     return;
   }
 
   StartDeviceDiscovery();
 }
 
 void BluetoothDeviceChooserController::AddFilteredDevice(
     const device::BluetoothDevice& device) {
   base::Optional<std::string> device_name = device.GetName();
-  if (chooser_.get() &&
-      MatchesFilters(device_name ? &device_name.value() : nullptr,
-                     device.GetUUIDs(), options_->filters)) {
-    base::Optional<int8_t> rssi = device.GetInquiryRSSI();
-    chooser_->AddOrUpdateDevice(
-        device.GetAddress(), !!device.GetName() /* should_update_name */,
-        device.GetNameForDisplay(), device.IsGattConnected(),
-        web_bluetooth_service_->IsDevicePaired(device.GetAddress()),
-        rssi ? CalculateSignalStrengthLevel(rssi.value()) : -1);
+  if (chooser_.get()) {
+    if (options_->accept_all_devices ||
+        MatchesFilters(device_name ? &device_name.value() : nullptr,
+                       device.GetUUIDs(), options_->filters)) {
+      base::Optional<int8_t> rssi = device.GetInquiryRSSI();
+      chooser_->AddOrUpdateDevice(
+          device.GetAddress(), !!device.GetName() /* should_update_name */,
+          device.GetNameForDisplay(), device.IsGattConnected(),
+          web_bluetooth_service_->IsDevicePaired(device.GetAddress()),
+          rssi ? CalculateSignalStrengthLevel(rssi.value()) : -1);
+    }
   }
 }
 
 void BluetoothDeviceChooserController::AdapterPoweredChanged(bool powered) {
   if (!powered && discovery_session_.get()) {
     StopDiscoverySession(std::move(discovery_session_));
   }
 
   if (chooser_.get()) {
     chooser_->SetAdapterPresence(
@@ skipping 151 matching lines @@
 
 void BluetoothDeviceChooserController::PostErrorCallback(
     blink::mojom::WebBluetoothResult error) {
   if (!base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(error_callback_, error))) {
     LOG(WARNING) << "No TaskRunner.";
   }
 }
 
 }  // namespace content