Print Preview: change getPreview to cr.sendWithPromise

chrome/test/data/webui/print_preview/native_layer_stub.js

Index: chrome/test/data/webui/print_preview/native_layer_stub.js
diff --git a/chrome/test/data/webui/print_preview/native_layer_stub.js b/chrome/test/data/webui/print_preview/native_layer_stub.js
index 495d22458ad9b86ca49de5b33263ef04addb4e81..e2baa90966a42071ad486081e9ce69de8a48eb9a 100644
--- a/chrome/test/data/webui/print_preview/native_layer_stub.js
+++ b/chrome/test/data/webui/print_preview/native_layer_stub.js
@@ -13,6 +13,7 @@ cr.define('print_preview', function() {
         'getInitialSettings',
         'getPrinters',
         'getExtensionPrinters',
+        'getPreview',
         'getPrivetPrinters',
         'getPrinterCapabilities',
         'print',
@@ -25,12 +26,6 @@ cr.define('print_preview', function() {
      */
     this.eventTarget_ = new cr.EventTarget();
 
-    /**
-     * @private {boolean} Whether the native layer has set the generate draft
-     *      parameter when requesting an updated preview.
-     */
-    this.generateDraft_ = false;
-
     /**
      * @private {!print_preview.NativeInitialSettings} The initial settings
      *     to be used for the response to a |getInitialSettings| call.
@@ -62,6 +57,11 @@ cr.define('print_preview', function() {
      * @private {boolean} Whether the printer setup request should be rejected.
      */
     this.shouldRejectPrinterSetup_ = false;
+
+    /**
+     * @private {string} The ID of a printer with a bad driver.
+     */
+    this.badPrinterId_ = '';
   }
 
   NativeLayerStub.prototype = {
@@ -85,6 +85,22 @@ cr.define('print_preview', function() {
       return Promise.resolve(true);
     },
 
+    /** @override */
+    getPreview: function(
+        destination, printTicketStore, documentInfo, generateDraft, requestId) {
+      this.methodCalled('getPreview', {
+        destination: destination,
+        printTicketStore: printTicketStore,
+        documentInfo: documentInfo,
+        generateDraft: generateDraft,
+        requestId: requestId,
+      });
+      if (destination.id == this.badPrinterId_) {

[dpapad, 2017/06/29 23:28:31]

Nit (optional):

return destination.id == this.badPrinterId_ ?
    Promise.reject('SETTINGS_INVALID') :
    Promise.resolve(requestId);


Also can we use print_preview.PreviewArea.EventType.SETTINGS_INVALID instead of
using the string literal?

[rbpotter, 2017/06/30 18:46:24]

Done.

+        return Promise.reject('SETTINGS_INVALID');
+      }
+      return Promise.resolve(requestId);
+    },
+
     /** @override */
     getPrivetPrinters: function() {
       this.methodCalled('getPrivetPrinters');
@@ -119,11 +135,6 @@ cr.define('print_preview', function() {
 
     /** Stubs for |print_preview.NativeLayer| methods that call C++ handlers. */
     previewReadyForTest: function() {},
-
-    startGetPreview: function(destination, printTicketStore, documentInfo,
-                              generateDraft, requestId) {
-      this.generateDraft_ = generateDraft;
-    },
     startHideDialog: function () {},
 
     /** @return {!cr.EventTarget} The native layer event target. */
@@ -134,9 +145,6 @@ cr.define('print_preview', function() {
       this.eventTarget_ = eventTarget;
     },
 
-    /** @return {boolean} Whether a new draft was requested for preview. */
-    generateDraft: function() { return this.generateDraft_; },
-
     /**
      * @param {!print_preview.NativeInitialSettings} settings The settings
      *     to return as a response to |getInitialSettings|.
@@ -174,6 +182,15 @@ cr.define('print_preview', function() {
       this.shouldRejectPrinterSetup_ = reject;
       this.setupPrinterResponse_ = response;
     },
+
+    /**
+     * @param {string} bad_id The printer ID that should cause an
+     *     SETTINGS_INVALID error in response to a preview request. Models a
+     *     bad printer driver.
+     */
+    setInvalidPrinterId: function(id) {
+      this.badPrinterId_ = id;
+    },
   };
 
   return {