ServiceWorker cleanup: remove wait_for_activated(); just use wait_for_state()

LayoutTests/http/tests/serviceworker/uncontrolled-page.html

Index: LayoutTests/http/tests/serviceworker/uncontrolled-page.html
diff --git a/LayoutTests/http/tests/serviceworker/uncontrolled-page.html b/LayoutTests/http/tests/serviceworker/uncontrolled-page.html
index 13da906aafc80533d57c7d48c2ff85abfd95aa9e..11aa6cea7dc58f12c7bcf7bf7c3176c7e7df567f 100644
--- a/LayoutTests/http/tests/serviceworker/uncontrolled-page.html
+++ b/LayoutTests/http/tests/serviceworker/uncontrolled-page.html
@@ -22,7 +22,9 @@ var worker = 'resources/fail-on-fetch-worker.js';
 async_test(function(t) {
     var scope = 'resources/scope/uncontrolled-page/';
     service_worker_unregister_and_register(t, worker, scope)
-      .then(function(reg) { return wait_for_activated(t, reg, scope); })
+      .then(function(reg) {
+          return wait_for_state(t, reg.installing, 'activated');
+        })
       .then(function() {
           return fetch_url('/serviceworker/resources/simple.json');
         })
@@ -34,4 +36,4 @@ async_test(function(t) {
           assert_unreached(reason.message);
         }));
   }, 'Fetch events should not go through uncontrolled page.');
-</script>
+</script>