ServiceWorker: Clean up fetch-event.html

LayoutTests/http/tests/serviceworker/resources/test-helpers.js

 // Adapter for testharness.js-style tests with Service Workers
 
 // Can only be used with a worker that installs successfully, since it
 // first registers to acquire a ServiceWorkerRegistration object to
 // unregister.
 // FIXME: Use getRegistration() when implemented.
 function service_worker_unregister_and_register(test, url, scope) {
   if (!scope || scope.length == 0)
     return Promise.reject(new Error('tests must define a scope'));
 
@@ skipping 64 matching lines @@
 
 function wait_for_state(test, worker, state) {
     return new Promise(test.step_func(function(resolve) {
         worker.addEventListener('statechange', test.step_func(function() {
             if (worker.state === state)
                 resolve(state);
         }));
     }));
 }
 
+function wait_for_activated(test, registration) {
+  var expected_state = 'activated';
+  if (registration.active) {
+    if (registration.active.state === expected_state)
+      return Promise.resolve(registration.active);
+    else
+      return wait_for_state(test, registration.active, expected_state);
+  }
+  if (registration.waiting)
+    return wait_for_state(test, registration.waiting, expected_state);
+  if (registration.installing)
+    return wait_for_state(test, registration.installing, expected_state);
+  return Promise.reject(
+      new Error('registration must have at least one version'));
+}
+
 (function() {
   function fetch_tests_from_worker(worker) {
     return new Promise(function(resolve, reject) {
         var messageChannel = new MessageChannel();
         messageChannel.port1.addEventListener('message', function(message) {
             if (message.data.type == 'complete') {
               synthesize_tests(message.data.tests, message.data.status);
               resolve();
             }
           });
@@ skipping 64 matching lines @@
         HTTPS_ORIGIN: 'https://' + ORIGINAL_HOST + ':' + HTTPS_PORT,
         HTTP_REMOTE_ORIGIN: 'http://' + REMOTE_HOST + ':' + HTTP_PORT,
         HTTPS_REMOTE_ORIGIN: 'https://' + REMOTE_HOST + ':' + HTTPS_PORT,
         UNAUTHENTICATED_ORIGIN: 'http://' + UNAUTHENTICATED_HOST + ':' + HTTP_PORT
     };
 }
 
 function base_path() {
     return location.pathname.replace(/\/[^\/]*$/, '/');
 }