Shorten Closure template notation from Array.<*> to Array<*>.

chrome/browser/resources/cryptotoken/enroller.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 Handles web page requests for gnubby enrollment.
  */
 
 'use strict';
 
@@ skipping 197 matching lines @@
 /**
  * @typedef {{
  *   version: (string|undefined),
  *   challenge: string,
  *   appId: string
  * }}
  */
 var EnrollChallenge;
 
 /**
- * @param {Array.<EnrollChallenge>} enrollChallenges The enroll challenges to
+ * @param {Array<EnrollChallenge>} enrollChallenges The enroll challenges to
  *     validate.
  * @param {boolean} appIdRequired Whether the appId property is required on
  *     each challenge.
  * @return {boolean} Whether the given array of challenges is a valid enroll
  *     challenges array.
  */
 function isValidEnrollChallengeArray(enrollChallenges, appIdRequired) {
   var seenVersions = {};
   for (var i = 0; i < enrollChallenges.length; i++) {
     var enrollChallenge = enrollChallenges[i];
@@ skipping 17 matching lines @@
       // The challenge is required.
       return false;
     }
   }
   return true;
 }
 
 /**
  * Finds the enroll challenge of the given version in the enroll challlenge
  * array.
- * @param {Array.<EnrollChallenge>} enrollChallenges The enroll challenges to
+ * @param {Array<EnrollChallenge>} enrollChallenges The enroll challenges to
  *     search.
  * @param {string} version Version to search for.
  * @return {?EnrollChallenge} The enroll challenge with the given versions, or
  *     null if it isn't found.
  */
 function findEnrollChallengeOfVersion(enrollChallenges, version) {
   for (var i = 0; i < enrollChallenges.length; i++) {
     if (enrollChallenges[i]['version'] == version) {
       return enrollChallenges[i];
     }
@@ skipping 33 matching lines @@
 /**
  * Gets the expanded sign challenges from an enroll request, potentially by
  * modifying the request to contain a challenge value where one was omitted.
  * (For enrolling, the server isn't interested in the value of a signature,
  * only whether the presented key handle is already enrolled.)
  * @param {Object} request The request.
  * @param {string} signChallengesName The name of the sign challenges value in
  *     the request.
  * @param {string=} opt_registeredKeysName The name of the registered keys
  *     value in the request.
- * @return {Array.<SignChallenge>}
+ * @return {Array<SignChallenge>}
  */
 function getSignRequestsFromEnrollRequest(request, signChallengesName,
     opt_registeredKeysName) {
   var signChallenges;
   if (opt_registeredKeysName &&
       request.hasOwnProperty(opt_registeredKeysName)) {
     signChallenges = request[opt_registeredKeysName];
   } else {
     signChallenges = request[signChallengesName];
   }
@@ skipping 28 matching lines @@
   /** @private {function(U2fError)} */
   this.errorCb_ = errorCb;
   /** @private {function(string, string, (string|undefined))} */
   this.successCb_ = successCb;
   /** @private {string|undefined} */
   this.logMsgUrl_ = opt_logMsgUrl;
 
   /** @private {boolean} */
   this.done_ = false;
 
-  /** @private {Object.<string, string>} */
+  /** @private {Object<string, string>} */
   this.browserData_ = {};
-  /** @private {Array.<EnrollHelperChallenge>} */
+  /** @private {Array<EnrollHelperChallenge>} */
   this.encodedEnrollChallenges_ = [];
-  /** @private {Array.<SignHelperChallenge>} */
+  /** @private {Array<SignHelperChallenge>} */
   this.encodedSignChallenges_ = [];
   // Allow http appIds for http origins. (Broken, but the caller deserves
   // what they get.)
   /** @private {boolean} */
   this.allowHttp_ =
       this.sender_.origin ? this.sender_.origin.indexOf('http://') == 0 : false;
   /** @private {Closeable} */
   this.handler_ = null;
 }
 
 /**
  * Default timeout value in case the caller never provides a valid timeout.
  */
 Enroller.DEFAULT_TIMEOUT_MILLIS = 30 * 1000;
 
 /**
  * Performs an enroll request with the given enroll and sign challenges.
- * @param {Array.<EnrollChallenge>} enrollChallenges A set of enroll challenges.
- * @param {Array.<SignChallenge>} signChallenges A set of sign challenges for
+ * @param {Array<EnrollChallenge>} enrollChallenges A set of enroll challenges.
+ * @param {Array<SignChallenge>} signChallenges A set of sign challenges for
  *     existing enrollments for this user and appId.
  * @param {string=} opt_appId The app id for the entire request.
  */
 Enroller.prototype.doEnroll = function(enrollChallenges, signChallenges,
     opt_appId) {
-  /** @private {Array.<EnrollChallenge>} */
+  /** @private {Array<EnrollChallenge>} */
   this.enrollChallenges_ = enrollChallenges;
-  /** @private {Array.<SignChallenge>} */
+  /** @private {Array<SignChallenge>} */
   this.signChallenges_ = signChallenges;
   /** @private {(string|undefined)} */
   this.appId_ = opt_appId;
   var self = this;
   getTabIdWhenPossible(this.sender_).then(function() {
     if (self.done_) return;
     self.approveOrigin_();
   }, function() {
     self.close();
     self.notifyError_({errorCode: ErrorCodes.BAD_REQUEST});
@@ skipping 123 matching lines @@
   if (!appId) {
     // Sanity check. (Other code should fail if it's not set.)
     console.warn(UTIL_fmt('No appId?'));
   }
   encodedChallenge['appIdHash'] = B64_encode(sha256HashOfString(appId));
   return /** @type {EnrollHelperChallenge} */ (encodedChallenge);
 };
 
 /**
  * Encodes the given enroll challenges using this enroller's state.
- * @param {Array.<EnrollChallenge>} enrollChallenges The enroll challenges.
+ * @param {Array<EnrollChallenge>} enrollChallenges The enroll challenges.
  * @param {string=} opt_appId The app id for the entire request.
- * @return {!Array.<EnrollHelperChallenge>} The encoded enroll challenges.
+ * @return {!Array<EnrollHelperChallenge>} The encoded enroll challenges.
  * @private
  */
 Enroller.prototype.encodeEnrollChallenges_ = function(enrollChallenges,
     opt_appId) {
   var challenges = [];
   for (var i = 0; i < enrollChallenges.length; i++) {
     var enrollChallenge = enrollChallenges[i];
     var version = enrollChallenge.version;
     if (!version) {
       // Version is implicitly V1 if not specified.
@@ skipping 22 matching lines @@
       challenges.push(
           Enroller.encodeEnrollChallenge_(enrollChallenge, opt_appId));
     }
   }
   return challenges;
 };
 
 /**
  * Checks the app ids associated with this enroll request, and calls a callback
  * with the result of the check.
- * @param {!Array.<string>} enrollAppIds The app ids in the enroll challenge
+ * @param {!Array<string>} enrollAppIds The app ids in the enroll challenge
  *     portion of the enroll request.
  * @param {function(boolean)} cb Called with the result of the check.
  * @private
  */
 Enroller.prototype.checkAppIds_ = function(enrollAppIds, cb) {
   var appIds =
       UTIL_unionArrays(enrollAppIds, getDistinctAppIds(this.signChallenges_));
   FACTORY_REGISTRY.getOriginChecker()
       .canClaimAppIds(this.sender_.origin, appIds)
       .then(this.originChecked_.bind(this, appIds, cb));
 };
 
 /**
  * Called with the result of checking the origin. When the origin is allowed
  * to claim the app ids, begins checking whether the app ids also list the
  * origin.
- * @param {!Array.<string>} appIds The app ids.
+ * @param {!Array<string>} appIds The app ids.
  * @param {function(boolean)} cb Called with the result of the check.
  * @param {boolean} result Whether the origin could claim the app ids.
  * @private
  */
 Enroller.prototype.originChecked_ = function(appIds, cb, result) {
   if (!result) {
     this.notifyError_({errorCode: ErrorCodes.BAD_REQUEST});
     return;
   }
   /** @private {!AppIdChecker} */
@@ skipping 63 matching lines @@
       // For U2F_V2, the challenge sent to the gnubby is modified to be the hash
       // of the browser data. Include the browser data.
       browserData = this.browserData_[reply.version];
     }
 
     this.notifySuccess_(/** @type {string} */ (reply.version),
                         /** @type {string} */ (reply.enrollData),
                         browserData);
   }
 };