Change getAccessToken and getExtensionPrinterAccess to sendWithPromise

chrome/browser/resources/print_preview/cloud_print_interface.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.
 
 cr.exportPath('cloudprint');
 
 /**
  * Event types dispatched by the cloudprint interface.
  * @enum {string}
  */
@@ skipping 82 matching lines @@
      * @private
      */
     this.requestQueue_ = [];
 
     /**
      * Outstanding cloud destination search requests.
      * @type {!Array<!cloudprint.CloudPrintRequest>}
      * @private
      */
     this.outstandingCloudSearchRequests_ = [];
-
-    /**
-     * Event tracker used to keep track of native layer events.
-     * @type {!EventTracker}
-     * @private
-     */
-    this.tracker_ = new EventTracker();
-
-    this.addEventListeners_();
   }
 
   /**
    * Content type header value for a URL encoded HTTP request.
    * @type {string}
    * @const
    * @private
    */
   CloudPrintInterface.URL_ENCODED_CONTENT_TYPE_ =
       'application/x-www-form-urlencoded';
@@ skipping 212 matching lines @@
       this.sendOrQueueRequest_(this.buildRequest_(
           'GET',
           'printer',
           params,
           origin,
           account || '',
           this.onPrinterDone_.bind(this, printerId)));
     },
 
     /**
-     * Adds event listeners to relevant events.
-     * @private
-     */
-    addEventListeners_: function() {
-      this.tracker_.add(
-          this.nativeLayer_.getEventTarget(),
-          print_preview.NativeLayer.EventType.ACCESS_TOKEN_READY,
-          this.onAccessTokenReady_.bind(this));
-    },
-
-    /**
      * Builds request to the Google Cloud Print API.
      * @param {string} method HTTP method of the request.
      * @param {string} action Google Cloud Print action to perform.
      * @param {Array<!HttpParam>} params HTTP parameters to include in the
      *     request.
      * @param {!print_preview.DestinationOrigin} origin Origin for destination.
      * @param {?string} account Account the request is sent for. Can be
      *     {@code null} or empty string if the request is not cookie bound or
      *     is sent on behalf of the primary user.
      * @param {function(!cloudprint.CloudPrintRequest)} callback Callback to
@@ skipping 58 matching lines @@
      * Sends a request to the Google Cloud Print API or queues if it needs to
      *     wait OAuth2 access token.
      * @param {!cloudprint.CloudPrintRequest} request Request to send or queue.
      * @private
      */
     sendOrQueueRequest_: function(request) {
       if (request.origin == print_preview.DestinationOrigin.COOKIES) {
         return this.sendRequest_(request);
       } else {
         this.requestQueue_.push(request);
-        this.nativeLayer_.startGetAccessToken(request.origin);
+        this.nativeLayer_.getAccessToken(request.origin).then(
+            this.onAccessTokenReady_.bind(this, request.origin));
       }
     },
 
     /**
      * Sends a request to the Google Cloud Print API.
      * @param {!cloudprint.CloudPrintRequest} request Request to send.
      * @private
      */
     sendRequest_: function(request) {
       request.xhr.onreadystatechange =
@@ skipping 53 matching lines @@
             if (origins.indexOf(request.origin) >= 0) {
               request.xhr.abort();
               return false;
             }
             return true;
           });
     },
 
     /**
      * Called when a native layer receives access token.
-     * @param {Event} event Contains the authentication type and access token.
+     * @param {!print_preview.DestinationOrigin} authType The authentication
+     *     type.
+     * @param {!print_preview.AccessTokenResponse} response Contains the access
+     *     token and an indicator of whether the token request is complete (if
+     *     not, another request for this authentication type was already in
+     *     progress).
      * @private
      */
-    onAccessTokenReady_: function(event) {
+    onAccessTokenReady_: function(authType, response) {
+      if (!response.completed)
+        return;
       // TODO(vitalybuka): remove when other Origins implemented.
-      assert(event.authType == print_preview.DestinationOrigin.DEVICE);
+      assert(authType == print_preview.DestinationOrigin.DEVICE);
       this.requestQueue_ = this.requestQueue_.filter(function(request) {
         assert(request.origin == print_preview.DestinationOrigin.DEVICE);
-        if (request.origin != event.authType) {
+        if (request.origin != authType) {
           return true;
         }
-        if (event.accessToken) {
+        if (response.accessToken) {
           request.xhr.setRequestHeader('Authorization',
-                                       'Bearer ' + event.accessToken);
+                                       'Bearer ' + response.accessToken);
           this.sendRequest_(request);
         } else {  // No valid token.
           // Without abort status does not exist.
           request.xhr.abort();
           request.callback(request);
         }
         return false;
       }, this);
     },
 
@@ skipping 290 matching lines @@
      */
     this.value = value;
   }
 
   // Export
   return {
     CloudPrintInterface: CloudPrintInterface,
     CloudPrintRequest: CloudPrintRequest
   };
 });