ServiceWorker: Expose registration within ServiceWorkerGlobalScope [3/3]

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 45 matching lines @@
       iframe.contentWindow.addEventListener('unload', function() {
           resolve();
         });
     });
   iframe.src = '';
   iframe.remove();
   return saw_unload;
 }
 
 function normalizeURL(url) {
-  return new URL(url, document.location).toString().replace(/#.*$/, '');
+  return new URL(url, location).toString().replace(/#.*$/, '');

[falken, 2015/01/19 08:45:04]

nit: self.location to be clear it's global

[nhiroki, 2015/01/20 11:10:07]

Done.

 }
 
 function wait_for_update(test, registration) {
   if (!registration || registration.unregister == undefined) {
     return Promise.reject(new Error(
       'wait_for_update must be passed a ServiceWorkerRegistration'));
   }
 
   return new Promise(test.step_func(function(resolve) {
       registration.addEventListener('updatefound', test.step_func(function() {
@@ skipping 125 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);
           }));
     });
 }