Modernize WPT: resource-timing and navigation-timing.https.html

As a part of the effort to understand the current behavior of the
resource timing, I changed the tests to use async/await for readability
with adding a few comments.

Bug: 1128786
Change-Id: I45daee67e52a13c98ad3f2010131d858a58781d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2413927
Commit-Queue: Makoto Shimazu <shimazu@chromium.org>
Auto-Submit: Makoto Shimazu <shimazu@chromium.org>
Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807845}

third_party/blink/web_tests/external/wpt/service-workers/service-worker/navigation-timing.https.html

@@ -32,81 +32,45 @@ function navigate_in_frame(frame, url) {
 
 const worker_url = 'resources/navigation-timing-worker.js';
 
-promise_test(t => {
+promise_test(async (t) => {
     const scope = 'resources/empty.html';
-    let frame;
+    const registration = await service_worker_unregister_and_register(t, worker_url, scope);
+    t.add_cleanup(() => registration.unregister());
+    await wait_for_state(t, registration.installing, 'activated');
+    const frame = await with_iframe(scope);
+    t.add_cleanup(() => frame.remove());
 
-    return service_worker_unregister_and_register(t, worker_url, scope)
-      .then(r => {
-        return wait_for_state(t, r.installing, 'activated');
-      })
-      .then(() => with_iframe(scope))
-      .then(f => {
-        frame = f;
-        return navigate_in_frame(frame, 'resources/empty.html');
-      })
-      .then(timing => {
+    const timing = await navigate_in_frame(frame, scope);
     assert_greater_than(timing.workerStart, 0);
     verify(timing);
-      })
-      .catch(unreached_rejection(t))
-      .then(() => {
-        if (frame)
-            frame.remove();
-        return service_worker_unregister(t, scope);
-      });
 }, 'Service worker controlled navigation timing');
 
-promise_test(t => {
+promise_test(async (t) => {
     const scope = 'resources/empty.html?network-fallback';
-    let frame;
+    const registration = await service_worker_unregister_and_register(t, worker_url, scope);
+    t.add_cleanup(() => registration.unregister());
+    await wait_for_state(t, registration.installing, 'activated');
+    const frame = await with_iframe(scope);
+    t.add_cleanup(() => frame.remove());
 
-    return service_worker_unregister_and_register(t, worker_url, scope)
-      .then(r => {
-        return wait_for_state(t, r.installing, 'activated');
-      })
-      .then(() => with_iframe(scope))
-      .then(f => {
-        frame = f;
-        return navigate_in_frame(frame, 'resources/empty.html?network-fallback');
-      })
-      .then(timing => {
+    const timing = await navigate_in_frame(frame, scope);
     verify(timing);
-      })
-      .catch(unreached_rejection(t))
-      .then(() => {
-        if (frame)
-            frame.remove();
-        return service_worker_unregister(t, scope);
-      });
 }, 'Service worker controlled navigation timing network fallback');
 
-promise_test(t => {
+promise_test(async (t) => {
     const scope = 'resources/redirect.py?Redirect=empty.html';
-    let frame;
+    const registration = await service_worker_unregister_and_register(t, worker_url, scope);
+    t.add_cleanup(() => registration.unregister());
+    await wait_for_state(t, registration.installing, 'activated');
+    const frame = await with_iframe(scope);
+    t.add_cleanup(() => frame.remove());
 
-    return service_worker_unregister_and_register(t, worker_url, scope)
-      .then(r => {
-        return wait_for_state(t, r.installing, 'activated');
-      })
-      .then(() => with_iframe(scope))
-      .then(f => {
-        frame = f;
-        return navigate_in_frame(frame, 'resources/redirect.py?Redirect=empty.html');
-      })
-      .then(timing => {
+    const timing = await navigate_in_frame(frame, scope);
     verify(timing);
     // Additional checks for redirected navigation.
     assert_true(timing.redirectStart <= timing.redirectEnd,
         'Expected redirectStart <= redirectEnd');
     assert_true(timing.redirectEnd <= timing.fetchStart,
         'Expected redirectEnd <= fetchStart');
-      })
-      .catch(unreached_rejection(t))
-      .then(() => {
-        if (frame)
-            frame.remove();
-        return service_worker_unregister(t, scope);
-      });
 }, 'Service worker controlled navigation timing redirect');
 </script>

third_party/blink/web_tests/external/wpt/service-workers/service-worker/resource-timing.sub.https.html

@@ -11,6 +11,15 @@ function crossOriginUrl(path) {
   return "https://{{hosts[alt][]}}:{{ports[https][0]}}" + base_path() + path;
 }
 
+// Verify existance of a PerformanceEntry and the order between the timings.
+//
+// |options| has these properties:
+// performance: Performance interface to verify existance of the entry.
+// resource: the path to the resource.
+// mode: 'cross-origin' to load the resource from third-party origin.
+// description: the description passed to each assertion.
+// should_no_performance_entry: no entry is expected to be recorded when it's
+//                              true.
 function verify(options) {
   const url = options.mode === 'cross-origin' ? crossOriginUrl(options.resource)
     : resourceUrl(options.resource);
@@ -21,12 +30,16 @@ function verify(options) {
     assert_equals(entryList.length, 0, options.description);
     return;
   }
+
   assert_equals(entryList.length, 1, options.description);
   const entry = entryList[0];
   assert_equals(entry.entryType, 'resource', options.description);
+
+  // workerStart is recorded between startTime and fetchStart.
   assert_greater_than(entry.workerStart, 0, options.description);
   assert_greater_than_equal(entry.workerStart, entry.startTime, options.description);
   assert_less_than_equal(entry.workerStart, entry.fetchStart, options.description);
+
   if (options.mode === 'cross-origin') {
     assert_equals(entry.responseStart, 0, options.description);
     assert_greater_than_equal(entry.responseEnd, entry.fetchStart, options.description);
@@ -34,8 +47,12 @@ function verify(options) {
     assert_greater_than_equal(entry.responseStart, entry.fetchStart, options.description);
     assert_greater_than_equal(entry.responseEnd, entry.responseStart, options.description);
   }
+
+  // responseEnd follows fetchStart.
   assert_greater_than(entry.responseEnd, entry.fetchStart, options.description);
+  // duration always has some value.
   assert_greater_than(entry.duration, 0, options.description);
+
   if (options.resource.indexOf('redirect.py') != -1) {
     assert_less_than_equal(entry.workerStart, entry.redirectStart,
       options.description);
@@ -44,20 +61,16 @@ function verify(options) {
   }
 }
 
-promise_test(function(t) {
+promise_test(async (t) => {
   const worker_url = 'resources/resource-timing-worker.js';
   const scope = 'resources/resource-timing-iframe.sub.html';
-    let registration;
 
-    return service_worker_unregister_and_register(t, worker_url, scope)
-      .then(function(r) {
-          registration = r;
-          return wait_for_state(t, r.installing, 'activated');
-        })
-      .then(function() {
-          return with_iframe(scope);
-        })
-      .then(function(frame) {
+  const registration = await service_worker_unregister_and_register(t, worker_url, scope);
+  t.add_cleanup(() => registration.unregister());
+  await wait_for_state(t, registration.installing, 'activated');
+  const frame = await with_iframe(scope);
+  t.add_cleanup(() => frame.remove());
+
   const performance = frame.contentWindow.performance;
   verify({
     performance: performance,
@@ -126,10 +139,6 @@ promise_test(function(t) {
     mode: 'same-origin',
     description: 'Resource untouched by the Service Worker.',
   });
-
-          frame.remove();
-          return registration.unregister();
-      });
 }, 'Controlled resource loads');
 
 test(() => {