ServiceWorker: support Response.{status,statusText,headers} [blink] (2/3)

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

Index: LayoutTests/http/tests/serviceworker/resources/test-helpers.js
diff --git a/LayoutTests/http/tests/serviceworker/resources/test-helpers.js b/LayoutTests/http/tests/serviceworker/resources/test-helpers.js
index 0e50c41598a0cbfc395f8ec4c0d3acd76947d5a5..425f41a1900f2091f27555e37909fd0787b49907 100644
--- a/LayoutTests/http/tests/serviceworker/resources/test-helpers.js
+++ b/LayoutTests/http/tests/serviceworker/resources/test-helpers.js
@@ -3,19 +3,18 @@
 function service_worker_test(url, description) {
     var t = async_test(description);
     t.step(function() {
+        var scope = 'nonexistent';
+        service_worker_unregister_and_register(t, url, scope, onRegistered);
 
-        navigator.serviceWorker.register(url, {scope:'nonexistent'}).then(
-            t.step_func(function(worker) {
-                var messageChannel = new MessageChannel();
-                messageChannel.port1.onmessage = t.step_func(onMessage);
-                worker.postMessage({port:messageChannel.port2}, [messageChannel.port2]);
-            }),
-            unreached_rejection(t, 'Registration should succeed, but failed')
-        );
+        function onRegistered(worker) {
+            var messageChannel = new MessageChannel();
+            messageChannel.port1.onmessage = t.step_func(onMessage);
+            worker.postMessage({port:messageChannel.port2}, [messageChannel.port2]);
+        }
 
         function onMessage(e) {
             assert_equals(e.data, 'pass');
-            t.done();
+            service_worker_unregister_and_done(t, scope);
         }
     });
 }