bluetooth: Better disconnected error messages for characteristic retrieval.

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`.";
+}

[dcheng, 2017/03/07 08:19:36]

Super minor nit:
Add // namespace
And a new line before (to match) or remove the newline before (again, to match)

[ortuno, 2017/03/07 22:24:00]

Done.

+
 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;
+  }
+
+  return DOMException::create(
+      NetworkError,
+      String::format(kGATTServerNotConnectedBase, operationString));
+}
+
+// static
 DOMException* BluetoothError::createDOMException(
     BluetoothErrorCode error,
     const String& detailedMessage) {
   switch (error) {
     case BluetoothErrorCode::InvalidService:
     case BluetoothErrorCode::InvalidCharacteristic:
     case BluetoothErrorCode::InvalidDescriptor:
       return DOMException::create(InvalidStateError, detailedMessage);
     case BluetoothErrorCode::ServiceNotFound:
     case BluetoothErrorCode::CharacteristicNotFound:
@@ skipping 68 matching lines @@
                 "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.");
-      MAP_ERROR(GATT_SERVER_DISCONNECTED_WHILE_RETRIEVING_CHARACTERISTICS,
-                NetworkError,
-                "GATT Server disconnected while retrieving characteristics.");
-      MAP_ERROR(
-          GATT_SERVER_NOT_CONNECTED_CANNOT_RETRIEVE_CHARACTERISTICS,
-          NetworkError,
-          "GATT Server is disconnected. Cannot retrieve characteristics.");
 
       // 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