Fix race and remove unused features in cryptotoken extension

chrome/browser/resources/cryptotoken/usbsignhelper.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 Implements a sign helper using USB gnubbies.
  */
 'use strict';
 
 var CORRUPT_sign = false;
 
 /**
  * @param {!GnubbyFactory} factory Factory for gnubby instances
  * @param {Countdown} timer Timer after whose expiration the caller is no longer
  *     interested in the result of a sign request.
  * @param {function(number, boolean)} errorCb Called when a sign request fails
  *     with an error code and whether any gnubbies were found.
- * @param {function(SignHelperChallenge, string)} successCb Called with the
- *     signature produced by a successful sign request.
- * @param {(function(number, boolean)|undefined)} opt_progressCb Called with
- *     progress updates to the sign request.
+ * @param {function(SignHelperChallenge, string, string=)} successCb Called with
+ *     the signature produced by a successful sign request.
  * @param {string=} opt_logMsgUrl A URL to post log messages to.
  * @constructor
  * @implements {SignHelper}
  */
-function UsbSignHelper(factory, timer, errorCb, successCb, opt_progressCb,
-    opt_logMsgUrl) {
+function UsbSignHelper(factory, timer, errorCb, successCb, opt_logMsgUrl) {
   /** @private {!GnubbyFactory} */
   this.factory_ = factory;
   /** @private {Countdown} */
   this.timer_ = timer;
   /** @private {function(number, boolean)} */
   this.errorCb_ = errorCb;
-  /** @private {function(SignHelperChallenge, string)} */
+  /** @private {function(SignHelperChallenge, string, string=)} */
   this.successCb_ = successCb;
   /** @private {string|undefined} */
   this.logMsgUrl_ = opt_logMsgUrl;
 
   /** @private {Array.<SignHelperChallenge>} */
   this.pendingChallenges_ = [];
   /** @private {Array.<usbGnubby>} */
   this.waitingForTouchGnubbies_ = [];
 
   /** @private {boolean} */
@@ skipping 137 matching lines @@
 
   if (CORRUPT_sign) {
     CORRUPT_sign = false;
     info[info.length - 1] = info[info.length - 1] ^ 0xff;
   }
   var encodedChallenge = {};
   encodedChallenge['challengeHash'] = B64_encode(challenge['challengeHash']);
   encodedChallenge['appIdHash'] = B64_encode(challenge['appIdHash']);
   encodedChallenge['keyHandle'] = B64_encode(challenge['keyHandle']);
   this.successCb_(
-      /** @type {SignHelperChallenge} */ (encodedChallenge), B64_encode(info));
+      /** @type {SignHelperChallenge} */ (encodedChallenge), B64_encode(info),
+      'USB');
 };
 
 /**
  * Reports error to the caller.
  * @param {number} code error to report
  * @param {boolean} anyGnubbies If any gnubbies were found
  * @private
  */
 UsbSignHelper.prototype.notifyError_ = function(code, anyGnubbies) {
   if (this.notified_)
@@ skipping 119 matching lines @@
   this.gnubbyFactory_ = gnubbyFactory;
 }
 
 /**
  * @param {Countdown} timer Timer after whose expiration the caller is no longer
  *     interested in the result of a sign request.
  * @param {function(number, boolean)} errorCb Called when a sign request fails
  *     with an error code and whether any gnubbies were found.
  * @param {function(SignHelperChallenge, string)} successCb Called with the
  *     signature produced by a successful sign request.
- * @param {(function(number, boolean)|undefined)} opt_progressCb Called with
- *     progress updates to the sign request.
  * @param {string=} opt_logMsgUrl A URL to post log messages to.
  * @return {UsbSignHelper} the newly created helper.
  */
 UsbSignHelperFactory.prototype.createHelper =
-    function(timer, errorCb, successCb, opt_progressCb, opt_logMsgUrl) {
+    function(timer, errorCb, successCb, opt_logMsgUrl) {
   var helper =
       new UsbSignHelper(this.gnubbyFactory_, timer, errorCb, successCb,
-          opt_progressCb, opt_logMsgUrl);
+          opt_logMsgUrl);
   return helper;
 };