Change getAccessToken and getExtensionPrinterAccess to sendWithPromise

chrome/browser/resources/print_preview/data/destination_store.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.define('print_preview', function() {
   'use strict';
 
   /**
    * A data store that stores destinations and dispatches events when the data
    * store changes.
@@ skipping 730 matching lines @@
               print_preview.DestinationOrigin.PRIVET)) {
         this.startLoadPrivetDestinations();
       }
       if (destinationMatch.matchOrigin(
               print_preview.DestinationOrigin.EXTENSION)) {
         this.startLoadExtensionDestinations();
       }
       if (destinationMatch.matchOrigin(
               print_preview.DestinationOrigin.COOKIES) ||
           destinationMatch.matchOrigin(
-              print_preview.DestinationOrigin.DEVICE) ||
-          destinationMatch.matchOrigin(
-              print_preview.DestinationOrigin.PROFILE)) {
+              print_preview.DestinationOrigin.DEVICE)) {
         this.startLoadCloudDestinations();
       }
     },
 
     /**
      * @param {?string} serializedDefaultDestinationSelectionRulesStr Serialized
      *     default destination selection rules.
      * @return {?print_preview.DestinationMatch} Creates rules matching
      *     previously selected destination.
      * @private
@@ skipping 22 matching lines @@
       var origins = [];
       if (isLocal) {
         origins.push(print_preview.DestinationOrigin.LOCAL);
         origins.push(print_preview.DestinationOrigin.PRIVET);
         origins.push(print_preview.DestinationOrigin.EXTENSION);
         origins.push(print_preview.DestinationOrigin.CROS);
       }
       if (isCloud) {
         origins.push(print_preview.DestinationOrigin.COOKIES);
         origins.push(print_preview.DestinationOrigin.DEVICE);
-        origins.push(print_preview.DestinationOrigin.PROFILE);
       }
 
       var idRegExp = null;
       try {
         if (matchRules.idPattern) {
           idRegExp = new RegExp(matchRules.idPattern || '.*');
         }
       } catch (e) {
         console.error('Failed to parse regexp for "id": ' + e);
       }
@@ skipping 178 matching lines @@
     /**
      * Attempts to resolve a provisional destination.
      * @param {!print_preview.Destination} destination Provisional destination
      *     that should be resolved.
      */
     resolveProvisionalDestination: function(destination) {
       assert(
           destination.provisionalType ==
               print_preview.DestinationProvisionalType.NEEDS_USB_PERMISSION,
           'Provisional type cannot be resolved.');
-      this.nativeLayer_.grantExtensionPrinterAccess(destination.id);
+      this.nativeLayer_.grantExtensionPrinterAccess(destination.id).then(
+          function(destinationInfo) {
+            /**
+             * Removes the destination from the store and replaces it with a
+             * destination created from the resolved destination properties, if
+             * any are reported. Then sends a PROVISIONAL_DESTINATION_RESOLVED
+             * event.
+             * @param {!print_preview.ProvisionalDestinationInfo}

[dpapad, 2017/06/20 01:36:21]

The @param comment should still be before the "function() {".

[rbpotter, 2017/06/20 02:47:54]

Done.

+             *     destinationInfo Information about the resolved printer.
+             */
+            this.removeProvisionalDestination_(destination.id);
+            var parsedDestination =
+                print_preview.ExtensionDestinationParser.parse(destinationInfo);
+            this.insertIntoStore_(parsedDestination);
+            this.dispatchProvisionalDestinationResolvedEvent_(
+                destination.id, parsedDestination);
+          }.bind(this),
+          function() {
+            /**
+             * The provisional destination is removed from the store and a
+             * PROVISIONAL_DESTINATION_RESOLVED event is dispatched with a null
+             * destination.
+             */
+            this.removeProvisionalDestination_(destination.id);
+            this.dispatchProvisionalDestinationResolvedEvent_(destination.id,
+                                                              null);
+          }.bind(this));
     },
 
     /**
      * Selects 'Save to PDF' destination (since it always exists).
      * @private
      */
     selectPdfDestination_: function() {
       var saveToPdfKey = this.getDestinationKey_(
           print_preview.DestinationOrigin.LOCAL,
           print_preview.Destination.GooglePromotedId.SAVE_AS_PDF, '');
@@ skipping 108 matching lines @@
     /**
      * Wait for a privet device to be registered.
      */
     waitForRegister: function(id) {
       this.nativeLayer_.getPrivetPrinters().then(
           this.endPrivetPrinterSearch_.bind(this));
       this.waitForRegisterDestination_ = id;
     },
 
     /**
-     * Event handler for {@code
-     * print_preview.NativeLayer.EventType.PROVISIONAL_DESTINATION_RESOLVED}.
-     * Currently assumes the provisional destination is an extension
-     * destination.
-     * Called when a provisional destination resolvement attempt finishes.
-     * The provisional destination is removed from the store and replaced with
-     * a destination created from the resolved destination properties, if any
-     * are reported.
-     * Emits {@code DestinationStore.EventType.PROVISIONAL_DESTINATION_RESOLVED}
-     * event.
-     * @param {!Event} evt The event containing the provisional destination ID
-     *     and resolved destination description. If the destination was not
-     *     successfully resolved, the description will not be set.
+     * Removes the provisional destination with ID |provisionalId| from
+     * |destinationMap_| and |destinations_|.
+     * @param{string} provisionalId The provisional destination ID.
      * @private
      */
-    handleProvisionalDestinationResolved_: function(evt) {
-      var provisionalDestinationIndex = -1;
-      var provisionalDestination = null;
-      for (var i = 0; i < this.destinations_.length; ++i) {
-        if (evt.provisionalId == this.destinations_[i].id) {
-          provisionalDestinationIndex = i;
-          provisionalDestination = this.destinations_[i];
-          break;
-        }
-      }
+    removeProvisionalDestination_: function(provisionalId) {
+      this.destinations_ = this.destinations_.filter(
+          function(el) {
+            if (el.id == provisionalId) {
+              delete this.destinationMap_[this.getKey_(el)];
+              return false;
+            }
+            return true;
+          }, this);
+    },
 
-      if (!provisionalDestination)
-        return;
-
-      this.destinations_.splice(provisionalDestinationIndex, 1);
-      delete this.destinationMap_[this.getKey_(provisionalDestination)];
-
-      var destination = evt.destination ?
-          print_preview.ExtensionDestinationParser.parse(evt.destination) :
-          null;
-
-      if (destination)
-        this.insertIntoStore_(destination);
-
+    /**
+     * Dispatches the PROVISIONAL_DESTINATION_RESOLVED event for id
+     * |provisionalId| and destination |destination|.
+     * @param {string} provisionalId The ID of the destination that was
+     *     resolved.
+     * @param {?print_preview.Destination} destination Information about the
+     *     destination if it was resolved successfully.
+     */
+    dispatchProvisionalDestinationResolvedEvent_: function(provisionalId,
+                                                           destination) {
       var event = new Event(
           DestinationStore.EventType.PROVISIONAL_DESTINATION_RESOLVED);
-      event.provisionalId = evt.provisionalId;
+      event.provisionalId = provisionalId;
       event.destination = destination;
       this.dispatchEvent(event);
     },
 
     /**
      * Inserts {@code destination} to the data store and dispatches a
      * DESTINATIONS_INSERTED event.
      * @param {!print_preview.Destination} destination Print destination to
      *     insert.
      * @private
@@ skipping 138 matching lines @@
     /**
      * Binds handlers to events.
      * @private
      */
     addEventListeners_: function() {
       var nativeLayerEventTarget = this.nativeLayer_.getEventTarget();
       this.tracker_.add(
           nativeLayerEventTarget,
           print_preview.NativeLayer.EventType.DESTINATIONS_RELOAD,
           this.onDestinationsReload_.bind(this));
-      this.tracker_.add(
-          nativeLayerEventTarget,
-          print_preview.NativeLayer.EventType.PROVISIONAL_DESTINATION_RESOLVED,
-          this.handleProvisionalDestinationResolved_.bind(this));
     },
 
     /**
      * Creates a local PDF print destination.
      * @private
      */
     createLocalPdfPrintDestination_: function() {
       // TODO(alekseys): Create PDF printer in the native code and send its
       // capabilities back with other local printers.
       if (this.pdfPrinterEnabled_) {
@@ skipping 295 matching lines @@
      */
     getKey_: function(destination) {
       return this.getDestinationKey_(
           destination.origin, destination.id, destination.account);
     }
   };
 
   // Export
   return {DestinationStore: DestinationStore};
 });