Migrate some tests to use ServiceWorkerRegistration.unregister()

LayoutTests/http/tests/serviceworker/unregister.html

Index: LayoutTests/http/tests/serviceworker/unregister.html
diff --git a/LayoutTests/http/tests/serviceworker/unregister.html b/LayoutTests/http/tests/serviceworker/unregister.html
index 1aa8417543a7ff4ce558e81de1f925aba341e567..e87c12be9aa1a2a9dd6cef3b36c118538df3ae60 100644
--- a/LayoutTests/http/tests/serviceworker/unregister.html
+++ b/LayoutTests/http/tests/serviceworker/unregister.html
@@ -4,65 +4,72 @@
 <script src="resources/test-helpers.js"></script>
 <script>
 async_test(function(t) {
-  navigator.serviceWorker.unregister('http://example.com/')
-    .then(function() {
-      assert_unreached('unregistering out of origin should fail');
-    }, function(reason) {
-      assert_equals(reason.name, 'SecurityError',
-                    'unregistering out of origin scope should fail');
-      t.done();
-    })
-    .catch(unreached_rejection(t));
-}, 'Unregistering out of origin');
+    navigator.serviceWorker.unregister('http://example.com/')
+      .then(function() {
+        assert_unreached('unregistering out of origin should fail');
+      }, function(reason) {
+        assert_equals(reason.name, 'SecurityError',
+                      'unregistering out of origin scope should fail');
+        t.done();
+      })
+      .catch(unreached_rejection(t));
+  }, 'Unregistering out of origin');
 
 async_test(function(t) {
-  navigator.serviceWorker.unregister('/nothing-here/')
-    .then(function(value) {
-      assert_equals(value, undefined,
-                    'unregistering with no existing registration should ' +
-                    'succeed with no value');
-      t.done();
-    })
-    .catch(unreached_rejection(t));
-}, 'Unregistering with no existing registration');
+    var scope = 'scope/unregister-twice';
+    var registration;
+    navigator.serviceWorker.register('resources/empty-worker.js',
+                                     {scope: scope})
+      .then(function(r) {
+          registration = r;
+          return registration.unregister();
+        })
+      .then(function() {
+          return registration.unregister();
+        })
+      .then(function(value) {
+          assert_equals(value, undefined,
+                        'unregistering twice should succeed with no value');
+          t.done();
+        })
+      .catch(unreached_rejection(t));
+  }, 'Unregister twice');
 
 async_test(function(t) {
-  var scope = '/register-then-unregister/';
-  navigator.serviceWorker.register(
-    'resources/empty-worker.js', {scope: scope})
-    .then(function(worker) {
-      return navigator.serviceWorker.unregister(scope);
-    })
-    .then(function(value) {
-      assert_equals(value, undefined,
-                    'successful unregistration should succeed with no value');
-      t.done();
-    })
-    .catch(unreached_rejection(t));
-}, 'Register then unregister');
+    var scope = 'scope/successful-unregister/';
+    navigator.serviceWorker.register('resources/empty-worker.js', {scope: scope})
+      .then(function(registration) {
+          return registration.unregister();
+        })
+      .then(function(value) {
+          assert_equals(value, undefined,
+                        'successful unregistration should succeed with no value');
+          t.done();
+        })
+      .catch(unreached_rejection(t));
+  }, 'Register then unregister');
 
 async_test(function(t) {
-  var state_promise;
-  service_worker_unregister_and_register(t, 'resources/empty-worker.js')
-    .then(function(registration) {
-      return wait_for_update(t, registration);
-    })
-    .then(function(sw) {
-      state_promise = wait_for_state(t, sw, 'redundant');
-      return navigator.serviceWorker.unregister();
-    })
-    .then(function(value) {
-      assert_equals(value, undefined,
-                    'unregister with default scope should succeed');
-      return state_promise;
-    })
-    .then(function(state) {
-      assert_equals(state, 'redundant',
-                    'service worker registered with default scope should be ' +
-                    'unregstered');
-      t.done();
-    })
-    .catch(unreached_rejection(t));
-}, 'Unregistering with default scope');
-
+    var state_promise;
+    service_worker_unregister_and_register(t, 'resources/empty-worker.js')
+      .then(function(registration) {
+          return wait_for_update(t, registration);
+        })
+      .then(function(sw) {
+          state_promise = wait_for_state(t, sw, 'redundant');
+          return navigator.serviceWorker.unregister();
+        })
+      .then(function(value) {
+          assert_equals(value, undefined,
+                        'unregister with default scope should succeed');
+          return state_promise;
+        })
+      .then(function(state) {
+          assert_equals(state, 'redundant',
+                        'service worker registered with default scope ' +
+                        'should be unregistered');
+          t.done();
+        })
+      .catch(unreached_rejection(t));
+  }, 'Unregistering with default scope');
 </script>