Improved error reporting in cryptotoken

chrome/browser/resources/cryptotoken/webrequest.js

 // 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.
 
 /**
  * @fileoverview Does common handling for requests coming from web pages and
  * routes them to the provided handler.
  */
 
 /**
@@ skipping 210 matching lines @@
       return forSign ? GnubbyCodeTypes.NONE_PLUGGED_ENROLLED :
           GnubbyCodeTypes.ALREADY_ENROLLED;
 
     case ErrorCodes.TIMEOUT:
       return GnubbyCodeTypes.WAIT_TOUCH;
   }
   return GnubbyCodeTypes.UNKNOWN_ERROR;
 }
 
 /**
- * Maps a helper's error code from the DeviceStatusCodes namespace to the
- * ErrorCodes namespace.
+ * Maps a helper's error code from the DeviceStatusCodes namespace to a
+ * U2fError.
  * @param {number} code Error code from DeviceStatusCodes namespace.
- * @return {ErrorCodes} A ErrorCodes error code.
+ * @return {U2fError} An error.
  */
-function mapDeviceStatusCodeToErrorCode(code) {
-  var reportedError = ErrorCodes.OTHER_ERROR;
+function mapDeviceStatusCodeToU2fError(code) {
   switch (code) {
     case DeviceStatusCodes.WRONG_DATA_STATUS:
-      reportedError = ErrorCodes.DEVICE_INELIGIBLE;
-      break;
+      return {errorCode: ErrorCodes.DEVICE_INELIGIBLE};
 
     case DeviceStatusCodes.TIMEOUT_STATUS:
     case DeviceStatusCodes.WAIT_TOUCH_STATUS:
-      reportedError = ErrorCodes.TIMEOUT;
-      break;
+      return {errorCode: ErrorCodes.TIMEOUT};
+
+    default:
+      var reportedError = {
+        errorCode: ErrorCodes.OTHER_ERROR,
+        errorMessage: 'device status code: ' + code.toString(16)
+      };
+      return reportedError;
   }
-  return reportedError;
 }
 
 /**
  * Sends a response, using the given sentinel to ensure at most one response is
  * sent. Also closes the closeable, if it's given.
  * @param {boolean} sentResponse Whether a response has already been sent.
  * @param {?Closeable} closeable A thing to close.
  * @param {*} response The response to send.
  * @param {Function} sendResponse A function to send the response.
  */
@@ skipping 159 matching lines @@
     'type': 'sign_helper_request',
     'signData': challenges,
     'timeout': opt_timeoutSeconds || 0,
     'timeoutSeconds': opt_timeoutSeconds || 0
   };
   if (opt_logMsgUrl !== undefined) {
     request.logMsgUrl = opt_logMsgUrl;
   }
   return request;
 }