Fix race and remove unused features in cryptotoken extension

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';
 
 /**
  * Handles an enroll request.
  * @param {!EnrollHelperFactory} factory Factory to create an enroll helper.
  * @param {MessageSender} sender The sender of the message.
  * @param {Object} request The web page's enroll request.
- * @param {boolean} enforceAppIdValid Whether to enforce that the appId in the
- *     request matches the sender's origin.
  * @param {Function} sendResponse Called back with the result of the enroll.
  * @param {boolean} toleratesMultipleResponses Whether the sendResponse
  *     callback can be called more than once, e.g. for progress updates.
  * @return {Closeable} A handler object to be closed when the browser channel
  *     closes.
  */
-function handleEnrollRequest(factory, sender, request, enforceAppIdValid,
-    sendResponse, toleratesMultipleResponses) {
+function handleEnrollRequest(factory, sender, request, sendResponse,
+    toleratesMultipleResponses) {
   var sentResponse = false;
   function sendResponseOnce(r) {
     if (enroller) {
       enroller.close();
       enroller = null;
     }
     if (!sentResponse) {
       sentResponse = true;
       try {
         // If the page has gone away or the connection has otherwise gone,
@@ skipping 76 matching lines @@
       if (request['requestId']) {
         response['requestId'] = request['requestId'];
       }
       sendResponse(response);
     }
   }
 
   var timer = new CountdownTimer(timeoutMillis);
   var enroller = new Enroller(factory, timer, origin, sendErrorResponse,
       sendSuccessResponse, sendNotification, sender.tlsChannelId, logMsgUrl);
-  enroller.doEnroll(enrollChallenges, signData, enforceAppIdValid);
+  enroller.doEnroll(enrollChallenges, signData);
   return /** @type {Closeable} */ (enroller);
 }
 
 /**
  * Returns whether the request appears to be a valid enroll request.
  * @param {Object} request the request.
  * @return {boolean} whether the request appears valid.
  */
 function isValidEnrollRequest(request) {
   if (!request.hasOwnProperty('enrollChallenges'))
@@ skipping 92 matching lines @@
 /**
  * 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.<Object>} enrollChallenges A set of enroll challenges
  * @param {Array.<Object>} signChallenges A set of sign challenges for existing
  *     enrollments for this user and appId
- * @param {boolean} enforceAppIdValid Whether to enforce that appId is valid
  */
-Enroller.prototype.doEnroll =
-    function(enrollChallenges, signChallenges, enforceAppIdValid) {
+Enroller.prototype.doEnroll = function(enrollChallenges, signChallenges) {
   this.setEnrollChallenges_(enrollChallenges);
   this.setSignChallenges_(signChallenges);
 
-  if (!enforceAppIdValid) {
-    // If not enforcing app id validity, begin enrolling right away.
-    this.helper_.doEnroll(this.encodedEnrollChallenges_,
-        this.encodedSignChallenges_);
-  }
-  // Whether or not enforcing app id validity, begin fetching/checking the
-  // app ids.
+  // Begin fetching/checking the app ids.
   var enrollAppIds = [];
   for (var i = 0; i < enrollChallenges.length; i++) {
     enrollAppIds.push(enrollChallenges[i]['appId']);
   }
   var self = this;
   this.checkAppIds_(enrollAppIds, signChallenges, function(result) {
-    if (!enforceAppIdValid) {
-      // Nothing to do, move along.
-      return;
-    }
     if (result) {
       self.helper_.doEnroll(self.encodedEnrollChallenges_,
           self.encodedSignChallenges_);
     } else {
       self.notifyError_(GnubbyCodeTypes.BAD_APP_ID);
     }
   });
 };
 
 /**
@@ skipping 293 matching lines @@
  * @param {number} code Status code
  * @param {boolean} anyGnubbies If any gnubbies were found
  * @private
  */
 Enroller.prototype.helperProgress_ = function(code, anyGnubbies) {
   var reportedError = Enroller.mapError_(code, anyGnubbies);
   console.log(UTIL_fmt('helper notified ' + code.toString(16) +
       ', returning ' + reportedError));
   this.notifyProgress_(reportedError);
 };