Update testharness.js and friends (and duplicate copies)

third_party/WebKit/LayoutTests/http/tests/resources/testharness.js

 /*global self*/
 /*jshint latedef: nofunc*/
 /*
 Distributed under both the W3C Test Suite License [1] and the W3C
 3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
 policies and contribution forms [3].
 
 [1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
 [2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
 [3] http://www.w3.org/2004/10/27-testcases
@@ skipping 640 matching lines @@
                          name,
                          Array.isArray(properties) ? properties[i] : properties);
                 });
     }
 
     function on_event(object, event, callback)
     {
         object.addEventListener(event, callback, false);
     }
 
+    function step_timeout(f, t) {
+        var outer_this = this;
+        var args = Array.prototype.slice.call(arguments, 2);
+        return setTimeout(function() {
+            f.apply(outer_this, args);
+        }, t * tests.timeout_multiplier);
+    }
+
     expose(test, 'test');
     expose(async_test, 'async_test');
     expose(promise_test, 'promise_test');
     expose(promise_rejects, 'promise_rejects');
     expose(generate_tests, 'generate_tests');
     expose(setup, 'setup');
     expose(done, 'done');
     expose(on_event, 'on_event');
+    expose(step_timeout, 'step_timeout');
 
     /*
      * Return a string truncated to the given length, with ... added at the end
      * if it was longer.
      */
     function truncate(s, len)
     {
         if (s.length > len) {
             return s.substring(0, len - 3) + "...";
         }
@@ skipping 411 matching lines @@
     {
         assert(!object.hasOwnProperty(property_name),
                "assert_not_exists", description,
                "unexpected property ${p} found", {p:property_name});
     }
     expose(assert_not_exists, "assert_not_exists");
 
     function _assert_inherits(name) {
         return function (object, property_name, description)
         {
-            assert(typeof object === "object",
+            assert(typeof object === "object" || typeof object === "function",
                    name, description,
                    "provided value is not an object");
 
             assert("hasOwnProperty" in object,
                    name, description,
                    "provided value is an object but has no hasOwnProperty method");
 
             assert(!object.hasOwnProperty(property_name),
                    name, description,
                    "property ${p} found on object expected in prototype chain",
@@ skipping 49 matching lines @@
             }
 
             var code_name_map = {
                 INDEX_SIZE_ERR: 'IndexSizeError',
                 HIERARCHY_REQUEST_ERR: 'HierarchyRequestError',
                 WRONG_DOCUMENT_ERR: 'WrongDocumentError',
                 INVALID_CHARACTER_ERR: 'InvalidCharacterError',
                 NO_MODIFICATION_ALLOWED_ERR: 'NoModificationAllowedError',
                 NOT_FOUND_ERR: 'NotFoundError',
                 NOT_SUPPORTED_ERR: 'NotSupportedError',
+                INUSE_ATTRIBUTE_ERR: 'InUseAttributeError',
                 INVALID_STATE_ERR: 'InvalidStateError',
                 SYNTAX_ERR: 'SyntaxError',
                 INVALID_MODIFICATION_ERR: 'InvalidModificationError',
                 NAMESPACE_ERR: 'NamespaceError',
                 INVALID_ACCESS_ERR: 'InvalidAccessError',
                 TYPE_MISMATCH_ERR: 'TypeMismatchError',
                 SECURITY_ERR: 'SecurityError',
                 NETWORK_ERR: 'NetworkError',
                 ABORT_ERR: 'AbortError',
                 URL_MISMATCH_ERR: 'URLMismatchError',
                 QUOTA_EXCEEDED_ERR: 'QuotaExceededError',
                 TIMEOUT_ERR: 'TimeoutError',
                 INVALID_NODE_TYPE_ERR: 'InvalidNodeTypeError',
                 DATA_CLONE_ERR: 'DataCloneError'
             };
 
             var name = code in code_name_map ? code_name_map[code] : code;
 
             var name_code_map = {
                 IndexSizeError: 1,
                 HierarchyRequestError: 3,
                 WrongDocumentError: 4,
                 InvalidCharacterError: 5,
                 NoModificationAllowedError: 7,
                 NotFoundError: 8,
                 NotSupportedError: 9,
+                InUseAttributeError: 10,
                 InvalidStateError: 11,
                 SyntaxError: 12,
                 InvalidModificationError: 13,
                 NamespaceError: 14,
                 InvalidAccessError: 15,
                 TypeMismatchError: 17,
                 SecurityError: 18,
                 NetworkError: 19,
                 AbortError: 20,
                 URLMismatchError: 21,
@@ skipping 209 matching lines @@
         };
     };
 
     Test.prototype.unreached_func = function(description)
     {
         return this.step_func(function() {
             assert_unreached(description);
         });
     };
 
+    Test.prototype.step_timeout = function(f, timeout) {
+        var test_this = this;
+        var args = Array.prototype.slice.call(arguments, 2);
+        return setTimeout(this.step_func(function() {
+            return f.apply(test_this, args);
+        }, timeout * tests.timeout_multiplier));
+    }
+
     Test.prototype.add_cleanup = function(callback) {
         this.cleanup_callbacks.push(callback);
     };
 
     Test.prototype.force_timeout = function() {
         this.set_status(this.TIMEOUT);
         this.phase = this.phases.HAS_RESULT;
     };
 
     Test.prototype.set_timeout = function()
@@ skipping 1196 matching lines @@
             tests.status.status = tests.status.ERROR;
             tests.status.message = e.message;
             tests.status.stack = e.stack;
         }
     });
 
     test_environment.on_tests_ready();
 
 })();
 // vim: set expandtab shiftwidth=4 tabstop=4: