Add support for origin trials in workers.

third_party/WebKit/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 131 matching lines @@
         }));
     }));
 }
 
 // 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
+//   document URL and the script URL. This allows 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.
 function service_worker_test(url, description) {
   // If the document URL is https://example.com/document and the script URL is
   // https://example.com/script/worker.js, then the scope would be
-  // https://example.com/script/scope/document.
-  var scope = new URL('scope' + window.location.pathname,
+  // https://example.com/script/scope/document/script/worker.js.
+  var document_path = window.location.pathname;
+  var script_path = new URL(url, window.location).pathname;
+  var scope = new URL('scope' + document_path + script_path,
                       new URL(url, window.location)).toString();
   promise_test(function(test) {
       return service_worker_unregister_and_register(test, url, scope)
         .then(function(registration) {
             add_completion_callback(function() {
                 registration.unregister();
               });
             return wait_for_update(test, registration)
               .then(function(worker) {
                   return fetch_tests_from_worker(worker);
@@ skipping 26 matching lines @@
 
 function login(test, local, remote) {
   var suffix = (local.indexOf("https") != -1) ? "s": "";
   return test_login(test, local, 'username1' + suffix, 'password1' + suffix,
                     'cookie1')
     .then(function() {
         return test_login(test, remote, 'username2' + suffix,
                           'password2' + suffix, 'cookie2');
       });
 }