Print Preview: Change getPrinterCapabilities to cr.sendWithPromise

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

Index: chrome/test/data/webui/print_preview/print_preview_destination_search_test.js
diff --git a/chrome/test/data/webui/print_preview/print_preview_destination_search_test.js b/chrome/test/data/webui/print_preview/print_preview_destination_search_test.js
index eb665cafc1272d5e9a4250bac6bd0905f1e6dde1..afc44d6edb9abd3aa556b988c57d04164372cd3a 100644
--- a/chrome/test/data/webui/print_preview/print_preview_destination_search_test.js
+++ b/chrome/test/data/webui/print_preview/print_preview_destination_search_test.js
@@ -102,31 +102,6 @@ TEST_F('PrintPreviewDestinationSearchTest', 'Select', function() {
       });
     };
 
-    function mockSetupCall(destId, nativeLayerMock) {
-      assert (!cr.isChromeOS);
-      nativeLayerMock.setDestinationToWatch(destId);
-      var resolver = new PromiseResolver();
-
-      resolver.promise.then(
-          function(result) {
-            // Simulate the native layer dispatching capabilities.
-            var capsSetEvent =
-                new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
-            capsSetEvent.settingsInfo = result;
-            destinationStore_.onLocalDestinationCapabilitiesSet_(capsSetEvent);
-            expectTrue(nativeLayerMock.didGetCapabilitiesOnce(destId));
-          }.bind(this),
-          function() {
-            var failEvent = new Event(
-                print_preview.NativeLayer.EventType.GET_CAPABILITIES_FAIL);
-            failEvent.destinationId = destId;
-            destinationStore_.onGetCapabilitiesFail_(failEvent);
-            expectTrue(nativeLayerMock.didGetCapabilitiesOnce(destId));

[rbpotter, 2017/06/09 10:24:23]

I do not think we need this only-called-once check now that the local
destinations have the same TestBrowserProxy setup and callback checks
as the CrOS destinations. However, I can add it back again if desired.

[dpapad, 2017/06/09 17:59:11]

+1 on removing it.

-          }.bind(this));
-
-      return resolver;
-    };
-
     function requestSetup(destId, destinationSearch) {
       var origin = cr.isChromeOS ? print_preview.DestinationOrigin.CROS :
                                    print_preview.DestinationOrigin.LOCAL;
@@ -176,16 +151,15 @@ TEST_F('PrintPreviewDestinationSearchTest', 'Select', function() {
       if (cr.isChromeOS) {
         nativeLayer_.setSetupPrinterResponse(true, { printerId: destId,
                                                      success: false,});
-        requestSetup(destId, destinationSearch_);
-        return nativeLayer_.whenCalled('setupPrinter').then(
-            function(actualDestId) {
-              assertEquals(destId, actualDestId);
-            });
       } else {
-        var resolver = mockSetupCall(destId, nativeLayer_);
-        requestSetup(destId, destinationSearch_);
-        resolver.reject(destId);
+        nativeLayer_.setLocalDestinationCapabilities(getCaps(), true);
       }
+      requestSetup(destId, destinationSearch_);
+      var callback = cr.isChromeOS ? 'setupPrinter' : 'getPrinterCapabilities';
+      return nativeLayer_.whenCalled(callback).then(
+          function(actualDestId) {
+            assertEquals(destId, actualDestId);
+          });
     });
 
     test('ReceiveSuccessfulSetup', function() {
@@ -197,32 +171,21 @@ TEST_F('PrintPreviewDestinationSearchTest', 'Select', function() {
       };
       if (cr.isChromeOS)
         nativeLayer_.setSetupPrinterResponse(false, response);
+      else
+        nativeLayer_.setLocalDestinationCapabilities(getCaps());
 
       var waiter = waitForEvent(
           destinationStore_,
           print_preview.DestinationStore.EventType.DESTINATION_SELECT);
-      if (cr.isChromeOS) {
-        requestSetup(destId, destinationSearch_);
-        return Promise.all([
-            nativeLayer_.whenCalled('setupPrinter'), waiter
-        ]).then(function(results) {
-          assertEquals(destId, results[0]);
-
-          // after setup succeeds and event arrives, the destination should
-          // be selected.
-          assertNotEquals(null, destinationStore_.selectedDestination);
-          assertEquals(destId, destinationStore_.selectedDestination.id);
-        });
-      } else { //!cr.isChromeOS
-        var resolver = mockSetupCall(destId, nativeLayer_);
-        requestSetup(destId, destinationSearch_);
-        resolver.resolve(response);
-        return waiter.then(function() {
-          // after setup succeeds, the destination should be selected.
-          assertNotEquals(null, destinationStore_.selectedDestination);
-          assertEquals(destId, destinationStore_.selectedDestination.id);
-        });
-      }
+      requestSetup(destId, destinationSearch_);
+      var callback = cr.isChromeOS ? 'setupPrinter' : 'getPrinterCapabilities';
+      return Promise.all([nativeLayer_.whenCalled(callback), waiter]).then(
+          function(results) {
+            assertEquals(destId, results[0]);
+            // after setup succeeds, the destination should be selected.
+            assertNotEquals(null, destinationStore_.selectedDestination);
+            assertEquals(destId, destinationStore_.selectedDestination.id);
+          });
     });
 
     if (cr.isChromeOS) {