WPT: service worker: Loosen postmessage-to-client-message-queue.https.html.

Chrome flakily failed the test because it doesn't guarantee the order
between message and fetch event. That might violate the spec, but the
test doesn't need to test this. It's meant to test that the client
message queue isn't enabled until a certain time. We can test
that without requiring message/fetch ordering.

Loosen the test to just check that the messages arrive after
|earliest_dispatch|.

Bug: 926670
Change-Id: Ic291b25443358412936b4a5eeb24ee6f8efa6b71
Reviewed-on: https://chromium-review.googlesource.com/c/1469842
Auto-Submit: Matt Falkenhagen <falken@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#632030}

third_party/blink/web_tests/TestExpectations

@@ -3057,11 +3057,6 @@ crbug.com/893490 [ Mac ] external/wpt/css/css-text/white-space/control-chars-09E
 crbug.com/893490 [ Win ] external/wpt/css/css-text/white-space/control-chars-09E.html [ Failure ]
 crbug.com/893490 [ Mac ] external/wpt/css/css-text/white-space/control-chars-09F.html [ Failure ]
 
-crbug.com/926670 virtual/outofblink-cors-ns/external/wpt/service-workers/service-worker/postmessage-to-client-message-queue.https.html [ Pass Failure ]
-crbug.com/926670 external/wpt/service-workers/service-worker/postmessage-to-client-message-queue.https.html [ Pass Failure ]
-crbug.com/926670 virtual/outofblink-cors/external/wpt/service-workers/service-worker/postmessage-to-client-message-queue.https.html [ Pass Failure ]
-crbug.com/926670 virtual/disabled-service-worker-servicification/external/wpt/service-workers/service-worker/postmessage-to-client-message-queue.https.html [ Pass Failure ]
-
 # needs implementation of test_driver_internal.action_sequence
 crbug.com/893480 external/wpt/infrastructure/testdriver/actions/elementTiming.html [ Timeout ]
 crbug.com/893480 external/wpt/infrastructure/testdriver/actions/multiDevice.html [ Failure Timeout ]

third_party/blink/web_tests/external/wpt/service-workers/service-worker/postmessage-to-client-message-queue.https.html

@@ -141,12 +141,12 @@ function client_message_queue_enable_test(
     earliest_dispatch,
     description)
 {
-    function later_state(state1, state2) {
+    function assert_state_less_than_equal(state1, state2, explanation) {
         const states = ['init', 'install', 'start', 'finish', 'loaded'];
         const index1 = states.indexOf(state1);
         const index2 = states.indexOf(state2);
-        const max_index = Math.max(index1, index2);
-        return states[max_index];
+        if (index1 > index2)
+          assert_unreached(explanation);
     }
 
     client_message_queue_test('enable-client-message-queue.html', async t => {
@@ -161,12 +161,13 @@ function client_message_queue_enable_test(
 
         // Wait for all messages to get dispatched on the child's
         // ServiceWorkerContainer and then verify that each message
-        // was dispatched while the child was in the correct state.
+        // was dispatched after |earliest_dispatch|.
         const report = await t.frame.report;
         ['init', 'install', 'start'].forEach(state => {
-            const dispatch = later_state(state, earliest_dispatch);
-            assert_equals(report[state], dispatch,
-                          `Message sent in state '${state}' dispatched in state '${dispatch}'`);
+            const explanation = `Message sent in state '${state}' was dispatched in '${report[state]}', should be dispatched no earlier than '${earliest_dispatch}'`;
+            assert_state_less_than_equal(earliest_dispatch,
+                                         report[state],
+                                         explanation);
         });
     }, description);
 }