bluetooth: show better error messages for services, characteristics and descriptors

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

 // Copyright 2014 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/BluetoothError.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 
 namespace blink {
 
-DOMException* BluetoothError::take(ScriptPromiseResolver*,
+DOMException* BluetoothError::take(ScriptPromiseResolver* resolver,
                                    mojom::blink::WebBluetoothResult error) {
+  return take(resolver, error, String());
+}
+
+DOMException* BluetoothError::take(ScriptPromiseResolver* resolver,
+                                   mojom::blink::WebBluetoothResult error,
+                                   String detailedMessage) {
   switch (error) {
     case mojom::blink::WebBluetoothResult::SUCCESS:
       ASSERT_NOT_REACHED();
       return DOMException::create(UnknownError);
-#define MAP_ERROR(enumeration, name, message)         \
-  case mojom::blink::WebBluetoothResult::enumeration: \
-    return DOMException::create(name, message)
+#define MAP_ERROR(enumeration, name, message)             \
+  case mojom::blink::WebBluetoothResult::enumeration:     \
+    if (detailedMessage.isEmpty()) {                      \
+      return DOMException::create(name, message);         \
+    } else {                                              \
+      return DOMException::create(name, detailedMessage); \
+    }
 
       // InvalidModificationErrors:
       MAP_ERROR(GATT_INVALID_ATTRIBUTE_LENGTH, InvalidModificationError,
                 "GATT Error: invalid attribute length.");
 
       // InvalidStateErrors:
       MAP_ERROR(SERVICE_NO_LONGER_EXISTS, InvalidStateError,
                 "GATT Service no longer exists.");
       MAP_ERROR(CHARACTERISTIC_NO_LONGER_EXISTS, InvalidStateError,
                 "GATT Characteristic no longer exists.");
@@ skipping 113 matching lines @@
                 "No window to show the requestDevice() dialog.");
 
 #undef MAP_ERROR
   }
 
   ASSERT_NOT_REACHED();
   return DOMException::create(UnknownError);
 }
 
 }  // namespace blink