bluetooth: web: Include the UUID in the error message.

third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp

 // Copyright 2015 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 "modules/bluetooth/BluetoothRemoteGATTServer.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
@@ skipping 95 matching lines @@
   webbluetooth->disconnect(device()->id());
 }
 
 // Class that allows us to resolve the promise with a single service or
 // with a vector owning the services.
 class GetPrimaryServicesCallback
     : public WebBluetoothGetPrimaryServicesCallbacks {
  public:
   GetPrimaryServicesCallback(
       BluetoothDevice* device,
+      String servicesUUID,
       mojom::blink::WebBluetoothGATTQueryQuantity quantity,
       ScriptPromiseResolver* resolver)
-      : m_device(device), m_quantity(quantity), m_resolver(resolver) {
+      : m_device(device),
+        m_servicesUUID(servicesUUID),
+        m_quantity(quantity),
+        m_resolver(resolver) {
     // We always check that the device is connected before constructing this
     // object.
     CHECK(m_device->gatt()->connected());
     m_device->gatt()->AddToActiveAlgorithms(m_resolver.get());
   }
 
   void onSuccess(
       const WebVector<WebBluetoothRemoteGATTService*>& webServices) override {
     if (!m_resolver->getExecutionContext() ||
         m_resolver->getExecutionContext()->isContextDestroyed())
@@ skipping 30 matching lines @@
     if (!m_resolver->getExecutionContext() ||
         m_resolver->getExecutionContext()->isContextDestroyed())
       return;
 
     if (!m_device->gatt()->RemoveFromActiveAlgorithms(m_resolver.get())) {
       m_resolver->reject(
           DOMException::create(NetworkError, kGATTServerDisconnected));
       return;
     }
 
-    m_resolver->reject(BluetoothError::take(m_resolver, error));
+    if (!m_servicesUUID.isEmpty() &&
+        BluetoothError::isSameError(
+            error, mojom::blink::WebBluetoothResult::SERVICE_NOT_FOUND)) {
+      m_resolver->reject(BluetoothError::take(
+          m_resolver, error,
+          "No Services matching UUID " + m_servicesUUID + " found in Device."));
+    } else {
+      m_resolver->reject(BluetoothError::take(m_resolver, error));
+    }
   }
 
  private:
   Persistent<BluetoothDevice> m_device;
+  const String m_servicesUUID;
   mojom::blink::WebBluetoothGATTQueryQuantity m_quantity;
   const Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 ScriptPromise BluetoothRemoteGATTServer::getPrimaryService(
     ScriptState* scriptState,
     const StringOrUnsignedLong& service,
     ExceptionState& exceptionState) {
   String serviceUUID = BluetoothUUID::getService(service, exceptionState);
   if (exceptionState.hadException())
@@ skipping 34 matching lines @@
         DOMException::create(NetworkError, kGATTServerNotConnected));
   }
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   WebBluetooth* webbluetooth =
       BluetoothSupplement::fromScriptState(scriptState);
   webbluetooth->getPrimaryServices(
       device()->id(), static_cast<int32_t>(quantity), servicesUUID,
-      new GetPrimaryServicesCallback(device(), quantity, resolver));
+      new GetPrimaryServicesCallback(device(), servicesUUID, quantity,
+                                     resolver));
 
   return promise;
 }
 
 }  // namespace blink