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

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

 // Adapter for testharness.js-style tests with Service Workers
 
 function service_worker_unregister_and_register(test, url, scope) {
   if (!scope || scope.length == 0)
     return Promise.reject(new Error('tests must define a scope'));
 
   var options = { scope: scope };
   return service_worker_unregister(test, scope)
     .then(function() {
         return navigator.serviceWorker.register(url, options);
@@ skipping 115 matching lines @@
   }
 
   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)
-    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'));
-}
-
 // Declare a test that runs entirely in the ServiceWorkerGlobalScope. The |url|
 // is the service worker script URL. This function:
 // - Instantiates a new test with the description specified in |description|.
 //   The test will succeed if the specified service worker can be successfully
 //   registered and installed.
 // - Creates a new ServiceWorker registration with a scope unique to the current
 //   document URL. Note that this doesn't allow more than one
 //   service_worker_test() to be run from the same document.
 // - Waits for the new worker to begin installing.
 // - Imports tests results from tests running inside the ServiceWorker.
@@ skipping 56 matching lines @@
             channel.port1.onmessage = test.step_func(function() {
                 unload_iframe(frame).catch(function() {});
                 resolve();
               });
             frame.contentWindow.postMessage(
               {username: username, password: password, cookie: cookie},
               [channel.port2], origin);
           }));
     });
 }