Fix race and remove unused features in cryptotoken extension

chrome/browser/resources/cryptotoken/gnubbies.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 A class for managing all enumerated gnubby devices.
  */
 'use strict';
 
 /**
@@ skipping 171 matching lines @@
  * @private
  */
 Gnubbies.prototype.inactivityTimeout_ = function() {
   this.inactivityTimer = undefined;
   for (var namespace in this.openDevs_) {
     for (var dev in this.openDevs_[namespace]) {
       var deviceId = Number(dev);
       console.warn(namespace + ' device ' + deviceId +
           ' still open after inactivity, closing');
       this.openDevs_[namespace][deviceId].destroy();
-      this.removeOpenDevice({namespace: namespace, device: deviceId});
     }
   }
 };
 
 /**
  * Opens and adds a new client of the specified device.
  * @param {llGnubbyDeviceId} which Which device to open.
  * @param {*} who Client of the device.
  * @param {function(number, llGnubby=)} cb Called back with the result of
  *     opening the device.
  */
 Gnubbies.prototype.addClient = function(which, who, cb) {
   this.resetInactivityTimer();
 
   var self = this;
 
   function opened(gnubby, who, cb) {
     if (gnubby.closing) {
       // Device is closing or already closed.
       self.removeClient(gnubby, who);
-      if (cb) { cb(-llGnubby.GONE); }
+      if (cb) { cb(-llGnubby.NODEVICE); }
     } else {
       gnubby.registerClient(who);
       if (cb) { cb(-llGnubby.OK, gnubby); }
     }
   }
 
   function notifyOpenResult(rc) {
     if (self.pendingOpens_[which.namespace]) {
       while (self.pendingOpens_[which.namespace][which.device].length != 0) {
         var client = self.pendingOpens_[which.namespace][which.device].shift();
@@ skipping 44 matching lines @@
 
   if (this.openDevs_[which.namespace] &&
       this.openDevs_[which.namespace].hasOwnProperty(which.device)) {
     var gnubby = this.openDevs_[which.namespace][which.device];
     opened(gnubby, who, cb);
   } else {
     var opener = {who: who, cb: cb};
     if (!this.pendingOpens_.hasOwnProperty(which.namespace)) {
       this.pendingOpens_[which.namespace] = {};
     }
-    if (this.pendingOpens_[which.namespace].hasOwnProperty(which)) {
+    if (this.pendingOpens_[which.namespace].hasOwnProperty(which.device)) {
       this.pendingOpens_[which.namespace][which.device].push(opener);
     } else {
       this.pendingOpens_[which.namespace][which.device] = [opener];
       var openImpl = this.impl_[which.namespace].open;
       openImpl(this, which.device, dev, openCb);
     }
   }
 };
 
 /**
@@ skipping 15 matching lines @@
         if (whichDev && dev != whichDev) {
           console.warn('usbGnubby attached to more than one device!?');
         }
         if (!dev.deregisterClient(who)) {
           dev.destroy();
         }
       }
     }
   }
 };