Upstream service worker `client` tests to WPT

third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/clients-get.https.html

Index: third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/clients-get.https.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/clients-get.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/clients-get.https.html
index 85c70a2f1dc8df5d4ce85edff7e88bb38a020482..45da2b35eff06d35169b0191b3f30d5bb60b2a3f 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/clients-get.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/clients-get.https.html
@@ -2,69 +2,67 @@
 <title>Service Worker: Clients.get</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-var host_info = get_host_info();
-
 var scope = 'resources/clients-get-frame.html';
-var t = async_test('Test Clients.get()');
-var clientIds = [];
+var client_ids = [];
 var frame;
-t.step(function() {
-    service_worker_unregister_and_register(
+promise_test(function(t) {
+    return service_worker_unregister_and_register(
         t, 'resources/clients-get-worker.js', scope)
       .then(function(registration) {
+          add_completion_callback(function() { registration.unregister(); });
           return wait_for_state(t, registration.installing, 'activated');
         })
       .then(function() {
           return with_iframe(scope + '#1');
         })
       .then(function(frame1) {
+          add_completion_callback(function() { frame1.remove(); });

[falken, 2017/03/29 01:43:58]

Just FYI (you probably have already noticed): Chrome's test-helpers.js adds this
completion callback by default in with_iframe. Eventually I hope WPT
test-helpers.js can do this too, and we can remove a lot of these lines.

           frame1.focus();
           return wait_for_clientId();
         })
-      .then(function(clientId) {
-          clientIds.push(clientId);
+      .then(function(client_id) {
+          client_ids.push(client_id);
           return with_iframe(scope + '#2');
         })
       .then(function(frame2) {
           frame = frame2;
+          add_completion_callback(function() { frame2.remove(); });
           return wait_for_clientId();
         })
-      .then(function(clientId) {
-          clientIds.push(clientId);
+      .then(function(client_id) {
+          client_ids.push(client_id, 'invalid-id');
           var channel = new MessageChannel();
-          channel.port1.onmessage = t.step_func(on_message);
+          var saw_message = new Promise(function(resolve) {
+              channel.port1.onmessage = resolve;
+            });
           frame.contentWindow.navigator.serviceWorker.controller.postMessage(
-              {port:channel.port2, clientIds:clientIds,
-               message: 'get_client_ids'}, [channel.port2]);
+              {port: channel.port2, clientIds: client_ids}, [channel.port2]);
+          return saw_message;
         })
-      .catch(unreached_rejection(t));
-  });
+      .then(function(e) {
+          assert_equals(e.data.length, 3);
+          assert_array_equals(e.data[0], expected[0]);
+          assert_array_equals(e.data[1], expected[1]);
+          assert_equals(e.data[2], expected[2]);
+        });
+  }, 'Test Clients.get()');
 
 function wait_for_clientId() {
   return new Promise(function(resolve, reject) {
       function get_client_id(e) {
-        window.removeEventListener("message", get_client_id);
+        window.removeEventListener('message', get_client_id);
         resolve(e.data.clientId);
       }
-      window.addEventListener("message", get_client_id, false);
+      window.addEventListener('message', get_client_id, false);
     });
 }
 
 var expected = [
     /* visibilityState, focused, url, frameType */
-    ['visible', true, new URL(scope + '#1', location).toString(), 'nested'],
-    ['visible', false, new URL(scope + '#2', location).toString(), 'nested'],
+    ['visible', true, normalizeURL(scope) + '#1', 'nested'],
+    ['visible', false, normalizeURL(scope) + '#2', 'nested'],
     undefined
 ];
-
-function on_message(e) {
-  assert_equals(e.data.length, 3);
-  assert_array_equals(e.data[0], expected[0]);
-  assert_array_equals(e.data[1], expected[1]);
-  assert_equals(e.data[2], expected[2]);
-  service_worker_unregister_and_done(t, scope);
-}
 </script>