Ensure that Service Worker clients are always returned in MRU order (2)

Adds a layout test to ensure that client ordering is done properly.

Spec: https://slightlyoff.github.io/ServiceWorker/spec/service_worker/#clients-matchall-method

1. (Chromium) https://codereview.chromium.org/1285373002/
2. (Blink) This CL.

BUG=461411

Review URL: https://codereview.chromium.org/1286123004

git-svn-id: svn://svn.chromium.org/blink/trunk@200875 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/http/tests/serviceworker/clients-matchall-client-types.html

@@ -26,7 +26,6 @@ var expected_with_all = [
 function test_matchall(frame, expected, query_options) {
   // Make sure the frame gets focus.
   frame.focus();
-  expected.sort(function(a, b) { return a[2] > b[2] ? 1 : -1; });
   return new Promise(function(resolve, reject) {
     var channel = new MessageChannel();
     channel.port1.onmessage = function(e) {

third_party/WebKit/LayoutTests/http/tests/serviceworker/clients-matchall-include-uncontrolled.html

@@ -42,6 +42,7 @@ function test_matchall(frame, expected, query_options) {
   return new Promise(function(resolve, reject) {
     var channel = new MessageChannel();
     channel.port1.onmessage = function(e) {
+      e.data.sort(function(a, b) { return a[2] > b[2] ? 1 : -1; });
       assert_equals(e.data.length, expected.length);
       for (var i = 0; i < e.data.length; i++)
         assert_array_equals(e.data[i], expected[i]);

third_party/WebKit/LayoutTests/http/tests/serviceworker/clients-matchall.html

@@ -5,42 +5,58 @@
 <script src="resources/test-helpers.js"></script>
 <script>
 var scope = 'resources/blank.html?clients-matchAll';
-var t = async_test('Test Clients.matchAll()');
+var expectedFirst = [
+    /* visibilityState, focused, url, frameType */
+    ['visible', true, new URL(scope + '#1', location).toString(), 'nested'],
+    ['visible', false, new URL(scope + '#2', location).toString(), 'nested']
+];
+var expectedSecond = [
+    /* visibilityState, focused, url, frameType */
+    ['visible', true, new URL(scope + '#2', location).toString(), 'nested'],
+    ['visible', false, new URL(scope + '#1', location).toString(), 'nested']
+];
+
 var frame1, frame2;
-t.step(function() {
-    service_worker_unregister_and_register(
+var worker;
+promise_test(function(t) {
+    return service_worker_unregister_and_register(
         t, 'resources/clients-matchall-worker.js', scope)
       .then(function(registration) {
-          return wait_for_state(t, registration.installing, 'activated');
+          worker = registration.installing;
+          return wait_for_state(t, worker, 'activated');
         })
       .then(function() { return with_iframe(scope + '#1'); })
       .then(function(f) {
           frame1 = f;
-          f.focus();
           return with_iframe(scope + '#2');
         })
       .then(function(f) {
           frame2 = f;
+          return new Promise(function(resolve) {
+              frame1.focus();
               var channel = new MessageChannel();
-          channel.port1.onmessage = t.step_func(onMessage);
-          f.contentWindow.navigator.serviceWorker.controller.postMessage(
-              {port:channel.port2}, [channel.port2]);
+              channel.port1.onmessage = resolve;
+              worker.postMessage({port:channel.port2}, [channel.port2]);
+            });
         })
-      .catch(unreached_rejection(t));
+      .then(function(message) {
+          assert_equals(message.data.length, 2);
+          assert_array_equals(message.data[0], expectedFirst[0]);
+          assert_array_equals(message.data[1], expectedFirst[1]);
+          return new Promise(function(resolve) {
+              frame2.focus();
+              var channel = new MessageChannel();
+              channel.port1.onmessage = resolve;
+              worker.postMessage({port:channel.port2}, [channel.port2]);
             });
-
-var expected = [
-    /* visibilityState, focused, url, frameType */
-    ['visible', true, new URL(scope + '#1', location).toString(), 'nested'],
-    ['visible', false, new URL(scope + '#2', location).toString(), 'nested']
-];
-
-function onMessage(e) {
-  assert_equals(e.data.length, 2);
-  assert_array_equals(e.data[0], expected[0]);
-  assert_array_equals(e.data[1], expected[1]);
+        })
+      .then(function(message) {
+          assert_equals(message.data.length, 2);
+          assert_array_equals(message.data[0], expectedSecond[0]);
+          assert_array_equals(message.data[1], expectedSecond[1]);
           frame1.remove();
           frame2.remove();
-  service_worker_unregister_and_done(t, scope);
-}
+          return service_worker_unregister_and_done(t, scope);
+        })
+  }, 'Test Clients.matchAll()');
 </script>

third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/clients-matchall-worker.js

@@ -10,8 +10,6 @@ self.onmessage = function(e) {
                         client.url,
                         client.frameType]);
         });
-      // Sort by url
-      message.sort(function(a, b) { return a[2] > b[2] ? 1 : -1; });
       port.postMessage(message);
     });
 };