Clean up HasEmptyOrInvalidFilter naming

The conditions have been phrased positively to understand better in
future.

Bug: 919870
Change-Id: Ib76393bf7dff667bcdca9abc50d5f2b26ddf5569
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1985638Reviewed-by: Reilly Grant <reillyg@chromium.org>
Commit-Queue: Md. Hasanur Rashid <hasanur.r@samsung.com>
Cr-Commit-Position: refs/heads/master@{#728405}

content/browser/bluetooth/bluetooth_device_chooser_controller.cc

@@ -148,7 +148,7 @@ bool MatchesFilters(
     const UUIDSet& device_uuids,
     const base::Optional<
         std::vector<blink::mojom::WebBluetoothLeScanFilterPtr>>& filters) {
-  DCHECK(!HasEmptyOrInvalidFilter(filters));
+  DCHECK(HasValidFilter(filters));
   for (const auto& filter : filters.value()) {
     if (MatchesFilter(device_name, device_uuids, filter)) {
       return true;

content/browser/bluetooth/web_bluetooth_service_impl.cc

@@ -129,57 +129,54 @@ blink::mojom::WebBluetoothResult TranslateGATTErrorAndRecord(
 // the maximum device name length is 248 bytes (UTF-8 encoded).
 constexpr size_t kMaxLengthForDeviceName = 248;
 
-bool IsEmptyOrInvalidFilter(
-    const blink::mojom::WebBluetoothLeScanFilterPtr& filter) {
+bool IsValidFilter(const blink::mojom::WebBluetoothLeScanFilterPtr& filter) {
   // At least one member needs to be present.
   if (!filter->name && !filter->name_prefix && !filter->services)
-    return true;
+    return false;
 
   // The renderer will never send a |name| or a |name_prefix| longer than
   // kMaxLengthForDeviceName.
   if (filter->name && filter->name->size() > kMaxLengthForDeviceName)
-    return true;
+    return false;
 
   if (filter->name_prefix &&
       filter->name_prefix->size() > kMaxLengthForDeviceName)
-    return true;
+    return false;
 
   // The |name_prefix| should not be empty
   if (filter->name_prefix && filter->name_prefix->empty())
-    return true;
+    return false;
 
-  return false;
+  return true;
 }
 
-bool IsRequestDeviceOptionsInvalid(
+bool IsValidRequestDeviceOptions(
     const blink::mojom::WebBluetoothRequestDeviceOptionsPtr& options) {
   if (options->accept_all_devices)
-    return options->filters.has_value();
+    return !options->filters.has_value();
 
-  return HasEmptyOrInvalidFilter(options->filters);
+  return HasValidFilter(options->filters);
 }
 
-bool IsRequestScanOptionsInvalid(
+bool IsValidRequestScanOptions(
     const blink::mojom::WebBluetoothRequestLEScanOptionsPtr& options) {
   if (options->accept_all_advertisements)
-    return options->filters.has_value();
+    return !options->filters.has_value();
 
-  return HasEmptyOrInvalidFilter(options->filters);
+  return HasValidFilter(options->filters);
 }
 
 }  // namespace
 
-bool HasEmptyOrInvalidFilter(
+bool HasValidFilter(
     const base::Optional<
         std::vector<blink::mojom::WebBluetoothLeScanFilterPtr>>& filters) {
   if (!filters) {
-    return true;
+    return false;
   }
 
-  return filters->empty()
-             ? true
-             : filters->end() != std::find_if(filters->begin(), filters->end(),
-                                              IsEmptyOrInvalidFilter);
+  return !filters->empty() &&
+         std::all_of(filters->begin(), filters->end(), IsValidFilter);
 }
 
 // Struct that holds the result of a cache query.
@@ -1247,7 +1244,7 @@ void WebBluetoothServiceImpl::RequestScanningStartImpl(
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // The renderer should never send invalid options.
-  if (IsRequestScanOptionsInvalid(options)) {
+  if (!IsValidRequestScanOptions(options)) {
     CrashRendererAndClosePipe(bad_message::BDH_INVALID_OPTIONS);
     return;
   }
@@ -1363,7 +1360,7 @@ void WebBluetoothServiceImpl::RequestDeviceImpl(
     RequestDeviceCallback callback,
     scoped_refptr<device::BluetoothAdapter> adapter) {
   // The renderer should never send invalid options.
-  if (IsRequestDeviceOptionsInvalid(options)) {
+  if (!IsValidRequestDeviceOptions(options)) {
     CrashRendererAndClosePipe(bad_message::BDH_INVALID_OPTIONS);
     return;
   }

content/browser/bluetooth/web_bluetooth_service_impl.h

@@ -44,7 +44,7 @@ struct GATTNotifySessionAndCharacteristicClient;
 class RenderFrameHost;
 class RenderProcessHost;
 
-bool HasEmptyOrInvalidFilter(
+bool HasValidFilter(
     const base::Optional<
         std::vector<blink::mojom::WebBluetoothLeScanFilterPtr>>& filters);