bluetooth: Better disconnected error messages for GATT operations.

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 {
 
 const char kGATTServerNotConnectedBase[] =
     "GATT Server is disconnected. "
     "Cannot %s. (Re)connect first with `device.gatt.connect`.";
 }
 
 namespace blink {
 
 // static
 DOMException* BluetoothError::createNotConnectedException(
     BluetoothOperation operation) {
   const char* operationString = nullptr;
   switch (operation) {
     case BluetoothOperation::ServicesRetrieval:
       operationString = "retrieve services";
       break;
     case BluetoothOperation::CharacteristicsRetrieval:
       operationString = "retrieve characteristics";
       break;
+    case BluetoothOperation::GATT:
+      operationString = "perform GATT operations";
+      break;
   }
 
   return DOMException::create(
       NetworkError,
       String::format(kGATTServerNotConnectedBase, operationString));
 }
 
 // static
 DOMException* BluetoothError::createDOMException(
     BluetoothErrorCode error,
@@ skipping 72 matching lines @@
                 "Unsupported device.");
       MAP_ERROR(CONNECT_WRITE_NOT_PERMITTED, NetworkError,
                 "GATT write operation is not permitted.");
       MAP_ERROR(DEVICE_NO_LONGER_IN_RANGE, NetworkError,
                 "Bluetooth Device is no longer in range.");
       MAP_ERROR(GATT_NOT_PAIRED, NetworkError, "GATT Error: Not paired.");
       MAP_ERROR(GATT_OPERATION_IN_PROGRESS, NetworkError,
                 "GATT operation already in progress.");
       MAP_ERROR(UNTRANSLATED_CONNECT_ERROR_CODE, NetworkError,
                 "Unknown ConnectErrorCode.");
-      MAP_ERROR(GATT_SERVER_NOT_CONNECTED, NetworkError,
-                "GATT Server is disconnected. Cannot perform GATT operations.");
-      MAP_ERROR(GATT_SERVER_DISCONNECTED, NetworkError,
-                "GATT Server disconnected while performing a GATT operation.");
 
       // NotFoundErrors:
       MAP_ERROR(WEB_BLUETOOTH_NOT_SUPPORTED, NotFoundError,
                 "Web Bluetooth is not supported on this platform. For a list "
                 "of supported platforms see: https://goo.gl/J6ASzs");
       MAP_ERROR(NO_BLUETOOTH_ADAPTER, NotFoundError,
                 "Bluetooth adapter not available.");
       MAP_ERROR(CHOSEN_DEVICE_VANISHED, NotFoundError,
                 "User selected a device that doesn't exist anymore.");
       MAP_ERROR(CHOOSER_CANCELLED, NotFoundError,
@@ skipping 55 matching lines @@
                 "requestDevice() called from cross-origin iframe.");
 
 #undef MAP_ERROR
   }
 
   NOTREACHED();
   return DOMException::create(UnknownError);
 }
 
 }  // namespace blink