PaymentApp: Implement respondWith() in PaymentRequestEvent. (content side)

content/test/data/payments/payment_app.js

Index: content/test/data/payments/payment_app.js
diff --git a/content/test/data/payments/payment_app.js b/content/test/data/payments/payment_app.js
index a3b40e7055ae1e9dba9a6c6f55e5184b76d2918b..8d6068bf7a65239f8b2f4d0bcd784a1977e89bc7 100644
--- a/content/test/data/payments/payment_app.js
+++ b/content/test/data/payments/payment_app.js
@@ -24,19 +24,22 @@ function getMessageFromPaymentAppWindow() {
 self.addEventListener('paymentrequest', e => {
   var payment_app_window;
 
-  // SW ------------------ openWindow() -----------------> payment_app_window
-  // SW <---- postMessage('payment_app_window_ready') ---- payment_app_window
-  // SW ------- postMessage('payment_app_request') ------> payment_app_window
-  // SW <------ postMessage('payment_app_response') ------ payment_app_window
-  e.waitUntil(clients.openWindow('payment_app_window.html')
-                  .then(window_client => {
-                    payment_app_window = window_client;
-                    return getMessageFromPaymentAppWindow();
-                  })
-                  .then(message => {
-                    sendResultToTest(message);
-                    payment_app_window.postMessage('payment_app_request');
-                    return getMessageFromPaymentAppWindow();
-                  })
-                  .then(message => { sendResultToTest(message); }));
+  // SW -------------------- openWindow() ------------------> payment_app_window
+  // SW <----- postMessage('payment_app_window_ready') ------ payment_app_window
+  // SW -------- postMessage('payment_app_request') --------> payment_app_window
+  // SW <-- postMessage({methodName: 'test', details: {}}) -- payment_app_window
+  e.respondWith(new Promise(resolve => {
+    clients.openWindow('payment_app_window.html')
+        .then(window_client => {
+          payment_app_window = window_client;
+          return getMessageFromPaymentAppWindow();
+        })
+        .then(message => {
+          payment_app_window.postMessage('payment_app_request');
+          return getMessageFromPaymentAppWindow();
+        })
+        .then(message => {
+          resolve(message);
+        });
+  }));
 });