Make Chromoting browser tests pass again

remoting/webapp/crd/js/identity.js

 // Copyright (c) 2012 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
  * Wrapper class for Chrome's identity API.
  */
 
 'use strict';
@@ skipping 177 matching lines @@
 /**
  * Callback for the getAuthToken API.
  *
  * @param {boolean} interactive The value of the "interactive" parameter to
  *     getAuthToken.
  * @param {?string} token The auth token, or null if the request failed.
  * @private
  */
 remoting.Identity.prototype.onAuthComplete_ = function(interactive, token) {
   var authTokenDeferred = this.authTokenDeferred_;
-  if (authTokenDeferred == null) {
-    return;
-  }
-  this.authTokenDeferred_ = null;
 
   // Pass the token to the callback(s) if it was retrieved successfully.
   if (token) {
     authTokenDeferred.resolve(token);
+    this.authTokenDeferred_ = null;
     return;
   }
 
   // If not, pass an error back to the callback(s) if we've already prompted the
   // user for permission.
   if (interactive) {
     var error_message =
         chrome.runtime.lastError ? chrome.runtime.lastError.message
                                  : 'Unknown error.';
     console.error(error_message);
     authTokenDeferred.reject(remoting.Error.NOT_AUTHENTICATED);
+    this.authTokenDeferred_ = null;
     return;
   }
 
   // If there's no token, but we haven't yet prompted for permission, do so
   // now.
   var that = this;
   var showConsentDialog =
       (this.consentDialog_) ? this.consentDialog_.show() : Promise.resolve();
   showConsentDialog.then(function() {
     chrome.identity.getAuthToken(
         {'interactive': true}, that.onAuthComplete_.bind(that, true));
   });
 };
 
 /**
  * Returns whether the web app has authenticated with the Google services.
  *
  * @return {boolean}
  */
 remoting.Identity.prototype.isAuthenticated = function() {
   return remoting.identity.email_ !== '';
 };