Move promise_test and assert_promise_rejects out of worker-test-harness.

LayoutTests/http/tests/serviceworker/resources/worker-test-harness.js

 /*
  * worker-test-harness should be considered a temporary polyfill around
  * testharness.js for supporting Service Worker based tests. It should not be
  * necessary once the test harness is able to drive worker based tests natively.
  * See https://github.com/w3c/testharness.js/pull/82 for status of effort to
  * update upstream testharness.js. Once the upstreaming is complete, tests that
  * reference worker-test-harness should be updated to directly import
  * testharness.js.
  */
 
@@ skipping 55 matching lines @@
               type: 'complete',
               tests: results.tests,
               status: results.status
             };
             port.postMessage(message);
           });
       }
     });
 })();
 
-// 'promise_test' is a new kind of testharness test that handles some
-// boilerplate for testing with promises.
-function promise_test(func, name, properties) {
-  properties = properties || {};
-  var test = async_test(name, properties);
-  Promise.resolve(test.step(func, test, test))
-    .then(function() { test.done(); })
-    .catch(test.step_func(function(value) {
-        throw value;
-      }));
-}
+importScripts('/resources/testharness-helpers.js');

[jsbell, 2014/10/10 17:18:07]

After some pondering, I think we should probably remove this and have tests
import this directly. When the fixes here are upstreamed we'll want workers to
import testharness.js directly. But at that point - and likely, always - there
will be additional 'helpers' that have not yet been upstreamed. So we might was
well separate these out and have tests do both imports now.

(But I don't feel strongly)

[asanka, 2014/10/10 19:39:11]

+1. I also don't feel strongly, but I'm in favor of having a common testharness
helper file. That way this file can be the "worker" friendly testharness.js
which can just be testharness.js at such time that the worker changes are
upstreamed.

If you are making that change, please also consider renaming this file to
worker-testharness.js for consistency.

[Marijn Kruisselbrink, 2014/10/10 20:32:55]

Done.
Done.

 
-// Returns a promise that fulfills after the provided |promise| is fulfilled.
-// The |test| succeeds only if |promise| rejects with an exception matching
-// |code|. Accepted values for |code| follow those accepted for assert_throws().
-// The optional |description| describes the test being performed.
-// E.g.:
-//   assert_promise_rejects(
-//       new Promise(...), // something that should throw an exception.
-//       'NotFoundError',
-//       'Should throw NotFoundError.');
-//
-//   assert_promise_rejects(
-//       new Promise(...),
-//       new TypeError(),
-//       'Should throw TypeError');
-function assert_promise_rejects(promise, code, description) {
-  return promise.then(
-    function() {
-      throw 'assert_promise_rejects: ' + description + ' Promise did not throw.';
-    },
-    function(e) {
-      if (code !== undefined) {
-        assert_throws(code, function() { throw e; }, description);
-      }
-    });
-}