PaymentHandler: Merge PaymentAppRequest and PaymentRequestEvent.

content/test/data/payments/payment_app.js

 // Copyright 2017 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.
 
+function sendResultToTest(data) {
+  clients.matchAll({includeUncontrolled: true}).then(clients => {
+    clients.forEach(client => {
+      if (client.url.indexOf('payment_app_invocation.html') != -1) {
+        client.postMessage(data);
+      }
+    });
+  });
+}
+
 self.addEventListener('paymentrequest', e => {
+  sendResultToTest(e.topLevelOrigin);
+  sendResultToTest(e.paymentRequestOrigin);
+  sendResultToTest(e.paymentRequestId);
+  sendResultToTest(JSON.stringify(e.methodData));
+  sendResultToTest(JSON.stringify(e.total));
+  sendResultToTest(JSON.stringify(e.modifiers));
+  sendResultToTest(e.instrumentKey);

[nhiroki, 2017/05/21 23:41:40]

sendResultToTest()s run async operations, so we may need to expand the lifetime
of this event (ie., e.waitUntil()) until they finish in order to prevent SW from
being terminated.

[zino, 2017/05/23 14:51:29]

Done.

+
   // 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 => {
     let payment_app_window = undefined;
     let window_ready = false;
 
     let maybeSendPaymentRequest = function() {
       if (payment_app_window && window_ready)
@@ skipping 11 matching lines @@
         resolve(e.data);
         return;
       }
     });
 
     // Open a window
     clients.openWindow('payment_app_window.html')
       .then(window_client => {
         payment_app_window = window_client;
         maybeSendPaymentRequest();
       })

[nhiroki, 2017/05/21 23:41:39]

ditto. This needs to extend the lifetime of the event.

[zino, 2017/05/23 14:51:29]

I think the lifetime will be extended by e.respondWith() until calling
maybeSendPaymentRequest().

   }));
 });